From 770daa330c8abb4343f37234da1cc920eacb3fce Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 12 Feb 2019 08:18:10 +0100 Subject: [PATCH 001/467] SeedDMS_Core_Document::getTimeline() returns revision only for latest content --- SeedDMS_Core/Core/inc.ClassDocument.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 0e331afca..d2ebdcd53 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2918,7 +2918,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $timeline = array(); - $queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id; + $lc=$this->getLatestContent(); + $queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id . " AND `version` = " . $lc->getVersion(); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; From b2fa733a0df4d1b98e89da4ba7cc392baa605ea3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 12 Feb 2019 08:18:16 +0100 Subject: [PATCH 002/467] new note for 6.0.7 --- SeedDMS_Core/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 68a71ded1..00b040a11 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -24,7 +24,7 @@ GPL License - ??? +SeedDMS_Core_Document::getTimeline() returns revision only for latest content From feee5600c43dea9295b977e638fd23bc3d5dfe45 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:33:11 +0100 Subject: [PATCH 003/467] =?UTF-8?q?add=20new=20list=20type=20=C2=B4DueRevi?= =?UTF-8?q?sion'=20in=20getDocumentList()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SeedDMS_Core/Core/inc.ClassDocument.php | 48 +++++++++++++++++++++---- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 102f841cc..6ec85ab4c 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -808,7 +808,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ /** - * Check if latest content of the document has a schedult + * Check if latest content of the document has a scheduled * revision workflow. * The method will update the document status log database table * if needed. @@ -825,8 +825,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if($lc) { $st=$lc->getStatus(); + /* A revision workflow will only be started if the document is released */ if($st["status"] == S_RELEASED) { - /* First check if there are any revisors left who need to revise */ + /* First check if there are any scheduled revisions currently sleeping */ $pendingRevision=false; unset($this->_revisionStatus); // force to be reloaded from DB $revisionStatus=$lc->getRevisionStatus(); @@ -841,7 +842,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if(!$pendingRevision) return false; - /* Second check if revision is already due */ + /* We have sleeping revision, next check if the revision is already due */ if($lc->getRevisionDate() && $lc->getRevisionDate() <= date('Y-m-d 00:00:00')) { if($lc->startRevision($user, 'Automatic start of revision workflow')) { if($next) { @@ -3051,23 +3052,30 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * This method will call {@see SeedDMS_Core_DocumentContent::setStatus()} * which checks if the state has actually changed. This is, why this * function can be called at any time without harm to the status log. + * The $initialstatus can be set, to define the status set when no other + * status is set. This happens if the document has no * * @param boolean $ignorecurrentstatus ignore the current status and * recalculate a new status in any case * @param object $user the user initiating this method * @param string $msg message stored in status log when status is set + * @param integer $initialstatus status to be set if no other status is set */ - function verifyStatus($ignorecurrentstatus=false, $user=null, $msg='') { /* {{{ */ + function verifyStatus($ignorecurrentstatus=false, $user=null, $msg='', $initialstatus=S_RELEASED) { /* {{{ */ unset($this->_status); $st=$this->getStatus(); + /* Documents already obsoleted, rejected or expired will not change + * its status anymore, unless explicitly requested. + */ if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return; unset($this->_workflow); // force to be reloaded from DB $hasworkflow = $this->getWorkflow() ? true : false; $pendingReview=false; + $hasReview=false; unset($this->_reviewStatus); // force to be reloaded from DB $reviewStatus=$this->getReviewStatus(); if (is_array($reviewStatus) && count($reviewStatus)>0) { @@ -3075,10 +3083,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if ($r["status"]==0){ $pendingReview=true; break; + } elseif($r["status"]==1){ + $hasReview=true; } } } $pendingApproval=false; + $hasApproval=false; unset($this->_approvalStatus); // force to be reloaded from DB $approvalStatus=$this->getApprovalStatus(); if (is_array($approvalStatus) && count($approvalStatus)>0) { @@ -3086,10 +3097,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if ($a["status"]==0){ $pendingApproval=true; break; + } elseif($a["status"]==1){ + $hasApproval=true; } } } $pendingRevision=false; + $hasRevision=false; unset($this->_revisionStatus); // force to be reloaded from DB $revsisionStatus=$this->getRevisionStatus(); if (is_array($revsisionStatus) && count($revsisionStatus)>0) { @@ -3097,16 +3111,29 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if ($a["status"]==0){ $pendingRevision=true; break; + } elseif($a["status"]==1){ + $hasRevision=true; } } } + /* First check for an open review, approval, revision. */ if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user); elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user); - /* A document in status S_DRAFT will never go into S_RELEASED */ - elseif ($st["status"]!=S_DRAFT) $this->setStatus(S_RELEASED,$msg,$user); + /* Finally decide what to do if either no review, approval, revision was + * ever done or if one of them has been done. In the first case it will + * go to the initial status, in the second case, it will be released. + * A document in status S_DRAFT will never go into S_RELEASED and document + * already released will never go back at this point into the given + * initial status, which can only by S_DRAFT or S_RELEASED + */ + elseif ($st["status"]!=S_DRAFT && $st["status"]!=S_RELEASED ) { + if($hasReview || $hasApproval || $hasRevision) $this->setStatus(S_RELEASED,$msg,$user); + else $this->setStatus($initialstatus,$msg,$user); + } + } /* }}} */ function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='', $revisionDate=null) { /* {{{ */ @@ -3398,6 +3425,15 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (is_bool($res) && !$res) return false; + /* Check if 'onSetStatus' callback is set */ + if(isset($this->_dms->callbacks['onSetStatus'])) { + foreach($this->_dms->callbacks['onSetStatus'] as $callback) { + $ret = call_user_func($callback[0], $callback[1], $this, $this->_status["status"], $status); + if(is_bool($ret)) + return $ret; + } + } + unset($this->_status); return true; } /* }}} */ From 08fac559c9ade23fa22acdb149e963b8927d9acd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:33:50 +0100 Subject: [PATCH 004/467] add new list type 'DueRevision' in getDocumentList --- SeedDMS_Core/Core/inc.ClassDMS.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index ca6469110..904baa010 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1331,7 +1331,7 @@ class SeedDMS_Core_DMS { } } break; // }}} - case 'ReviseByMe': // Documents I have to receipt {{{ + case 'ReviseByMe': // Documents I have to revise {{{ if (!$this->db->createTemporaryTable("ttrevisionid")) { return false; } @@ -1403,6 +1403,27 @@ class SeedDMS_Core_DMS { } } break; // }}} + case 'DueRevision': // Documents with a due revision, which is not started {{{ + if (!$this->db->createTemporaryTable("ttrevisionid")) { + return false; + } + $user = $param1; + $orderby = $param3; + if($param4 == 'desc') + $orderdir = 'DESC'; + else + $orderdir = 'ASC'; + + $selectStr .= ", `tblDocumentContent`.`revisiondate` "; + $queryStr .= "WHERE `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime()." "; + $queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." "; + if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; + else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`"; + else if ($orderby=='s') $queryStr .= "ORDER BY `status`"; + else $queryStr .= "ORDER BY `name`"; + $queryStr .= " ".$orderdir; + $queryStr .= ", `tblDocumentContent`.`revisiondate` ASC"; + break; // }}} case 'WorkflowByMe': // Documents I to trigger in Worklflow {{{ $queryStr .= "WHERE 1=1 "; From ee8802005464180041139d8ac7c1fcb33457027f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:35:18 +0100 Subject: [PATCH 005/467] check frequency --- op/op.SchedulerTaskMgr.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php index 6904da2c7..ca0ce4ea2 100644 --- a/op/op.SchedulerTaskMgr.php +++ b/op/op.SchedulerTaskMgr.php @@ -95,11 +95,12 @@ else if ($action == "edittask") { /* {{{ */ $editedtask->setName($name); if ($editedtask->getDescription() != $description) $editedtask->setDescription($description); - $editedtask->setFrequency($frequency); $editedtask->setDisabled($disabled); $editedtask->setParameter($params); - - $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_task'))); + if($editedtask->setFrequency($frequency)) + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_task'))); + else + $session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_edit_task'))); add_log_line(".php&action=edittask&taskid=".$taskid); } /* }}} */ From 4b7e9d9c755f740b3868e3d0242e7a2471096215 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:35:57 +0100 Subject: [PATCH 006/467] log run of execution --- utils/schedulercli.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/schedulercli.php b/utils/schedulercli.php index bf2ddeda4..1a548d172 100644 --- a/utils/schedulercli.php +++ b/utils/schedulercli.php @@ -57,7 +57,9 @@ if(isset($options['mode'])) { } include($myincpath."/inc/inc.Settings.php"); +include($myincpath."/inc/inc.LogInit.php"); include($myincpath."/inc/inc.Init.php"); +include($myincpath."/inc/inc.Language.php"); include($myincpath."/inc/inc.Extension.php"); include($myincpath."/inc/inc.DBInit.php"); include($myincpath."/inc/inc.Scheduler.php"); @@ -72,9 +74,10 @@ foreach($tasks as $task) { if(method_exists($taskobj, 'execute')) { if(!$task->getDisabled()) { if($taskobj->execute($task, $dms)) { + add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful."); $task->updateLastNextRun(); } else { - echo "Execution of task failed, task has been disabled\n"; + add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR); $task->setDisabled(1); } } From 6d5ce06c9f83498fa32db41f202763b1d0cb3fac Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:45:39 +0100 Subject: [PATCH 007/467] add_log_line() be used from command line scripts without errors --- inc/inc.Utils.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index e4404c056..28459a7d3 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -343,14 +343,19 @@ function add_log_line($msg="", $priority=null) { /* {{{ */ if(!$logger) return; + $ip = "-"; if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; - else + elseif(!empty($_SERVER['REMOTE_ADDR'])) $ip = $_SERVER['REMOTE_ADDR']; - if($user) - $logger->log($user->getLogin()." (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? ' '.$msg : ''), $priority); + if(!empty($_SERVER["REQUEST_URI"])) + $scriptname = basename($_SERVER["REQUEST_URI"], ".php"); else - $logger->log("-- (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? ' '.$msg : ''), $priority); + $scriptname = basename($_SERVER["SCRIPT_NAME"], ".php"); + if($user) + $logger->log($user->getLogin()." (".$ip.") ".$scriptname.($msg ? ' '.$msg : ''), $priority); + else + $logger->log("-- (".$ip.") ".$scriptname.($msg ? ' '.$msg : ''), $priority); } /* }}} */ function _add_log_line($msg="") { /* {{{ */ From 3ccc9f51764ecfcb637be0d91494f3c0184cd981 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:46:11 +0100 Subject: [PATCH 008/467] add more notes for 6.0.7 --- SeedDMS_Core/package.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 00b040a11..1b521517e 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -25,6 +25,8 @@ GPL License SeedDMS_Core_Document::getTimeline() returns revision only for latest content +add callback onSetStatus in SeedDMS_Core_DocumentContent::setStatus() +add new list type 'DueRevision' in SeedDMS_Core_DMS::getDocumentList() From 695c7c7c44b2a371a7a51dcf28c5e158a9d586d2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:47:03 +0100 Subject: [PATCH 009/467] pass initial document status to verifyStatus() --- op/op.SetReviewersApprovers.php | 2 +- op/op.SetRevisors.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index f895945dd..f5a4f119a 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -586,7 +586,7 @@ if (count($approvalIndex["g"]) > 0) { -$content->verifyStatus(false,$user); +$content->verifyStatus(false, $user, '', $settings->_initialDocumentStatus); add_log_line("?documentid=".$documentid); header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version); diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php index e146ea215..0135c4c45 100644 --- a/op/op.SetRevisors.php +++ b/op/op.SetRevisors.php @@ -324,7 +324,7 @@ if (count($revisionIndex["g"]) > 0) { } /* Recheck status, because all revisors could have been removed */ -$content->verifyStatus(false, $user, getMLText('automatic_status_update')); +$content->verifyStatus(false, $user, getMLText('automatic_status_update'), $settings->_initialDocumentStatus); add_log_line("?documentid=".$documentid); header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version); From add79b47d1aaf5ee244265a75955bd5acc33b693 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 27 Feb 2019 11:56:33 +0100 Subject: [PATCH 010/467] fix syntax error, run update of index even if update hook was called before --- controllers/class.UpdateDocument.php | 31 +++++++++------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php index 09d93987a..602d5eea1 100644 --- a/controllers/class.UpdateDocument.php +++ b/controllers/class.UpdateDocument.php @@ -69,32 +69,21 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common { } } - if($recipients['i']) { - foreach($recipients['i'] as $uid) { - if($u = $dms->getUser($uid)) { - $res = $contentResult->getContent()->addIndRecipient($u, $user); + if($recipients['i']) { + foreach($recipients['i'] as $uid) { + if($u = $dms->getUser($uid)) { + $res = $contentResult->getContent()->addIndRecipient($u, $user); + } } } - } - if($recipients['g']) { - foreach($recipients['g'] as $gid) { - if($g = $dms->getGroup($gid)) { - $res = $contentResult->getContent()->addGrpRecipient($g, $user); + if($recipients['g']) { + foreach($recipients['g'] as $gid) { + if($g = $dms->getGroup($gid)) { + $res = $contentResult->getContent()->addGrpRecipient($g, $user); + } } } - } - if($index) { - $lucenesearch = new $indexconf['Search']($index); - if($hit = $lucenesearch->getDocument((int) $document->getId())) { - $index->delete($hit->id); - } - $idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText)); - if(!$this->callHook('preIndexDocument', $document, $idoc)) { - } - - if(!$this->callHook('postUpdateDocument', $document, $contentResult->getContent())) { - } $content = $contentResult->getContent(); } else { $this->errormsg = 'error_update_document'; From ce3bb7d8ca14aa0cba935de59731f1435ebd5120 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 27 Feb 2019 15:40:21 +0100 Subject: [PATCH 011/467] fix typo in variable name --- op/op.ReviseDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php index cc4f1830f..773da2979 100644 --- a/op/op.ReviseDocument.php +++ b/op/op.ReviseDocument.php @@ -92,7 +92,7 @@ if ($_POST["revisionType"] == "grp") { } $controller->setParam('group', $group); $controller->setParam('comment', $_POST["comment"]); -$controller->setParam('onevotereject', $settins->_enableRevisionOnVoteReject); +$controller->setParam('onevotereject', $settings->_enableRevisionOnVoteReject); if(!$controller->run()) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg())); } From 83e8f900e5e0179fb8261217c3f77104e77ce7ba Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Mar 2019 18:27:20 +0100 Subject: [PATCH 012/467] fix setting role --- SeedDMS_Core/Core/inc.ClassUser.php | 1 - 1 file changed, 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index f6db633c2..63714308a 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -713,7 +713,6 @@ class SeedDMS_Core_User { /* {{{ */ */ function setRole($newrole) { /* {{{ */ $db = $this->_dms->getDB(); - $newrole = intval($newrole); if(is_object($newrole)) $queryStr = "UPDATE `tblUsers` SET `role` = " . $newrole->getID() . " WHERE `id` = " . $this->_id; From fd5bfe246f01eec3af0e60342e6f0ae25a6854b3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Mar 2019 09:37:21 +0100 Subject: [PATCH 013/467] various minor corrections of sql statements improves compatibility with postgres --- SeedDMS_Core/Core/inc.ClassDocument.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 6ec85ab4c..082dc67d7 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2920,7 +2920,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $timeline = array(); $lc=$this->getLatestContent(); - $queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id . " AND `version` = " . $lc->getVersion(); + $queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id . " AND `version` = " . $lc->getVersion(); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -3325,9 +3325,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * * @return array latest record from tblDocumentStatusLog */ - function getStatus() { /* {{{ */ + function getStatus($limit=1) { /* {{{ */ $db = $this->_document->_dms->getDB(); + if (!is_numeric($limit)) return false; + // Retrieve the current overall status of the content represented by // this object. if (!isset($this->_status)) { @@ -3339,7 +3341,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ "LEFT JOIN `tblDocumentStatusLog` USING (`statusID`) ". "WHERE `tblDocumentStatus`.`documentID` = '". $this->_document->getID() ."' ". "AND `tblDocumentStatus`.`version` = '". $this->_version ."' ". - "ORDER BY `tblDocumentStatusLog`.`statusLogID` DESC LIMIT 1"; + "ORDER BY `tblDocumentStatusLog`.`statusLogID` DESC LIMIT ".(int) $limit; $res = $db->getResultArray($queryStr); if (is_bool($res) && !$res) @@ -5418,7 +5420,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (!$this->_workflowState) { $queryStr= - "SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.`id` WHERE `a`.`id`=". $this->_workflow->getID(); + "SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.id WHERE `a`.`id`=". $this->_workflow['id']; $recs = $db->getResultArray($queryStr); if (is_bool($recs) && !$recs) return false; @@ -5482,7 +5484,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (!isset($this->_workflow)) { $queryStr= - "SELECT a.`id` as `wdcid`, a.`parent`, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.id WHERE a.`version`='".$this->_version + "SELECT a.`id` as `wdcid`, a.`parent`, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.`id` WHERE a.`version`='".$this->_version ."' AND a.`document` = '". $this->_document->getID() ."' " ." AND a.`state` IS NOT NULL" ." ORDER BY `date` DESC LIMIT 1"; @@ -5974,8 +5976,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * the next state will be reached if one of the transitions * leading to the given state can be processed. */ - if($nextstate->getPreCondFunc() == '') { - $workflow = $this->_workflow['workflow']; + if($nextstate->getPreCondFunc() == '') { + $workflow = $this->_workflow['workflow']; $transitions = $workflow->getPreviousTransitions($nextstate); foreach($transitions as $transition) { // echo "transition ".$transition->getID()." led to state ".$nextstate->getName()."
"; From c3b13c21b240206fec50df0a5f8f79e0ae8f1359 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Mar 2019 06:42:22 +0100 Subject: [PATCH 014/467] =?UTF-8?q?fix=20various=20error=D1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/README.Dist-Layout | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout index 5dd8a2d57..7c18113f5 100644 --- a/doc/README.Dist-Layout +++ b/doc/README.Dist-Layout @@ -21,7 +21,7 @@ SeedDMS_Lucene, SeedDMS_Preview, SeedDMS_SQLiteFTS. 'seeddms-5.1.x' are the sources of seeddms and 'www' being a link on it. This layout has disadvantages when updating the source of seeddms, because -the directories 'conf' and 'ext' has to be moved from 'seeddms-5.1.x' to +the directories 'conf' and 'ext' had to be moved from 'seeddms-5.1.x' to 'seeddms-5.1.(x+1)'. 'conf' was also visible over the web unless it was protected by an .htaccess file. The .htaccess file has been shipped, but it is far better to keep senѕitive data out of the document root in the first @@ -31,11 +31,14 @@ The new layout mostly retains that structure but uses more soft links to place the local data outside of 'seeddms-5.1.x' which makes updating a lot easier and moves the configuration out of the document root. As MS Windows does not support soft links, this change will only apply to Linux/Unix -systems. The new layout is the following: +systems. MS Windows users just skip all the soft links and set seeddms-5.1.x +as the document root. The new layout is the following: seeddms51x ---+--- data --+-- log | | - | +-- ext + | +-- cache + | | + | +-- 1048576 | | | +-- ... | @@ -69,17 +72,15 @@ seeddms51x ---+--- data --+-- log | +-- index.php -> ../seeddms/index.php | - +-- ext -> ../data/ext + +-- ext In order to convert to this layout you need to do the following in the seeddms51x directory: ln -s seeddms-5.1.x seeddms mv www/conf . -mv www/ext data -rm www -mdkir www cd www +rm inc op out views controllers styles languages webdav restapi pdfviewer index.php ln -s ../seeddms/inc ln -s ../seeddms/op ln -s ../seeddms/out @@ -91,4 +92,3 @@ ln -s ../seeddms/webdav ln -s ../seeddms/restapi ln -s ../seeddms/pdfviewer ln -s ../seeddms/index.php -ln -s ../data/ext From b953ead7963ebd1bae13c87047672bb466a46768 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Mar 2019 06:55:02 +0100 Subject: [PATCH 015/467] fix merge errors --- doc/README.Dist-Layout | 7 ------- 1 file changed, 7 deletions(-) diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout index ecdc5e214..0b58c09e2 100644 --- a/doc/README.Dist-Layout +++ b/doc/README.Dist-Layout @@ -78,14 +78,7 @@ In order to convert to this layout you need to do the following in the seeddms51 directory (replace seeddms-5.1.x with you installed version of seeddms): ln -s seeddms-5.1.x seeddms -<<<<<<< HEAD -mv seeddms-5.1.x/conf . -rm www -mkdir www -mv seeddms-5.1.x/ext www -======= mv www/conf . ->>>>>>> seeddms-5.1.x cd www rm inc op out views controllers styles languages webdav restapi pdfviewer index.php ln -s ../seeddms/inc From 539b5d3223b84295dc866b311e35350ed065bd70 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Mar 2019 07:35:11 +0100 Subject: [PATCH 016/467] fix commands for converting from old to new layout --- doc/README.Dist-Layout | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout index 7c18113f5..6822c63b5 100644 --- a/doc/README.Dist-Layout +++ b/doc/README.Dist-Layout @@ -75,10 +75,11 @@ seeddms51x ---+--- data --+-- log +-- ext In order to convert to this layout you need to do the following in the seeddms51x -directory: +directory (replace the 'x' in '5.1.x' with the correct number): ln -s seeddms-5.1.x seeddms mv www/conf . +mv seeddms-5.1.x/ext www cd www rm inc op out views controllers styles languages webdav restapi pdfviewer index.php ln -s ../seeddms/inc From cd4eb3d11567a4d8c8c422e562be6866ae4863f8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 27 Mar 2019 15:30:11 +0100 Subject: [PATCH 017/467] move code for getting version into method version() --- controllers/class.Download.php | 40 ++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/controllers/class.Download.php b/controllers/class.Download.php index a7e19abe2..ad0f2be18 100644 --- a/controllers/class.Download.php +++ b/controllers/class.Download.php @@ -24,8 +24,25 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common { public function version() { /* {{{ */ $dms = $this->params['dms']; - $content = $this->params['content']; - + $version = $this->params['version']; + $document = $this->params['document']; + if($version < 1) { + $content = $this->callHook('documentLatestContent', $document); + if($content === null) + $content = $document->getLatestContent(); + } else { + $content = $this->callHook('documentContent', $document, $version); + if($content === null) + $content = $document->getContentByVersion($version); + } + if (!is_object($content)) { + $this->errormsg = 'invalid_version'; + return false; + } + /* set params['content'] for compatiblity with older extensions which + * expect the content in the controller + */ + $this->params['content'] = $content; if(null === $this->callHook('version')) { if(file_exists($dms->contentDir . $content->getPath())) { header("Content-Transfer-Encoding: binary"); @@ -174,25 +191,6 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common { $dms = $this->params['dms']; $type = $this->params['type']; - $version = $this->params['version']; - $document = $this->params['document']; - if($version < 1) { - $content = $this->callHook('documentLatestContent', $document); - if($content === null) - $content = $document->getLatestContent(); - } else { - $content = $this->callHook('documentContent', $document, $version); - if($content === null) - $content = $document->getContentByVersion($version); - } - if (!is_object($content)) { - $this->errormsg = 'invalid_version'; - return false; - } - /* set params['content'] for compatiblity with older extensions which - * expect the content in the controller - */ - $this->params['content'] = $content; switch($type) { case "version": return $this->version(); From d2c55cd685add9d1d505d630058c6d40b01805bc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Apr 2019 10:13:19 +0200 Subject: [PATCH 018/467] fix translation string --- op/op.SetRevisors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php index 0135c4c45..60f963da2 100644 --- a/op/op.SetRevisors.php +++ b/op/op.SetRevisors.php @@ -150,7 +150,7 @@ foreach ($pIndRev as $p) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); break; case -3: - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_assigned")); + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("revisor_already_assigned")); break; case -4: // email error From 9a5d6c31ab0ed1a7a90f34a83f7c1c2f41d9ad20 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Apr 2019 10:54:04 +0200 Subject: [PATCH 019/467] do not list users/groups in select menu which already has an access right --- views/bootstrap/class.DocumentAccess.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php index 8753f4cac..f45241a4a 100644 --- a/views/bootstrap/class.DocumentAccess.php +++ b/views/bootstrap/class.DocumentAccess.php @@ -189,11 +189,16 @@ $(document).ready( function() { getUser(); + $memusers[] = $userObj->getID(); + } $options = array(); $options[] = array(-1, getMLText('select_one')); foreach ($allUsers as $currUser) { - if (!$currUser->isGuest()) - $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), ($currUser->getID()==$user->getID()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); + if (!$currUser->isGuest() && !in_array($currUser->getID(), $memusers)) + $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), false, array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); } $this->formField( getMLText("user"), @@ -204,10 +209,16 @@ $(document).ready( function() { 'options'=>$options ) ); + $memgroups = array(); + foreach ($accessList["groups"] as $groupAccess) { + $groupObj = $groupAccess->getGroup(); + $memgroups[] = $groupObj->getID(); + } $options = array(); $options[] = array(-1, getMLText('select_one')); foreach ($allGroups as $groupObj) { - $options[] = array($groupObj->getID(), htmlspecialchars($groupObj->getName())); + if(!in_array($groupObj->getID(), $memgroups)) + $options[] = array($groupObj->getID(), htmlspecialchars($groupObj->getName())); } $this->formField( getMLText("group"), From 029ac6d2d0663775f7fdd292a441d37a16a9dee2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Apr 2019 10:55:17 +0200 Subject: [PATCH 020/467] add item for 5.1.9 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c40bc3d3a..974e3099f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -32,6 +32,8 @@ via restapi - add an input field on the substitute user and extension list page for filtering table rows by string +- do not list users/groups in select menu on DocumentAccess page which already + has an access right -------------------------------------------------------------------------------- Changes in version 5.1.9 From d0cf90032ff6367fa273818ffd43683308e59f65 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 4 Apr 2019 14:02:46 +0200 Subject: [PATCH 021/467] a revision call also be started if some of the revisors have already reviewed the document --- SeedDMS_Core/Core/inc.ClassDocument.php | 17 +++++++++++++---- SeedDMS_Core/package.xml | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 082dc67d7..a921f0f1e 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -5289,10 +5289,15 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ /* A new revision may only be started if we are not in the middle of * revision or the user/group has been removed from the workflow */ + /* Taken out, because it happened that a revision wasn't started for each revisor + * but just for some. + * Checking for each revisor not being sleeping prevented a second start of the + * revision for the remaining revisors still sleeping. foreach($revisionStatus as $status) { if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED) return false; } + */ /* Make sure all Logs will be set to the right status, in order to * prevent inconsistent states. Actually it could be a feature to @@ -5300,6 +5305,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * this may not be possible. */ $db->startTransaction(); + $startedrev = false; foreach($revisionStatus as $status) { if($status['status'] == S_LOG_SLEEPING) { $queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, @@ -5312,12 +5318,15 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $db->rollbackTransaction(); return false; } + $startedrev = true; } } - if(!$this->setStatus(S_IN_REVISION, "Started revision", $requestUser)) { - $db->rollbackTransaction(); - return false; - } + /* Set status only if at least one revision was started */ + if($startedrev) + if(!$this->setStatus(S_IN_REVISION, "Started revision", $requestUser)) { + $db->rollbackTransaction(); + return false; + } $db->commitTransaction(); return true; diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 1b521517e..3348352ea 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,7 +12,7 @@ uwe@steinmann.cx yes - 2018-11-23 + 2019-04-04 6.0.7 @@ -27,6 +27,7 @@ SeedDMS_Core_Document::getTimeline() returns revision only for latest content add callback onSetStatus in SeedDMS_Core_DocumentContent::setStatus() add new list type 'DueRevision' in SeedDMS_Core_DMS::getDocumentList() +a revision can also be started if some revisors have already reviewed the document From e2c3cbe3cfee1f99f67c2ca3f9461dcb3ac1fea5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Apr 2019 13:23:38 +0200 Subject: [PATCH 022/467] do not show update user for revisions in status 0 --- CHANGELOG | 3 +++ views/bootstrap/class.ViewDocument.php | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b94525268..c20d3ac0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,9 @@ - fix editing of document attachments - make receipt summary look like approval/review summary - merge changes up to 5.1.10 +- do not show the updating user in a revision workflow if the status is 0 + this is misleading because the user starting the revision workflow is the one + first accessing the document -------------------------------------------------------------------------------- Changes in version 6.0.6 diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 95474a084..ddbce2d4c 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -1430,8 +1430,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "".$reqName."\n"; print "
  • ".$r["date"]."
    • "; /* $updateUser is the user who has done the revision */ - $updateUser = $dms->getUser($r["userID"]); - print "
  • ".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."
"; + if($r['status'] != 0) { + $updateUser = $dms->getUser($r["userID"]); + print "
  • ".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."
    • "; + } + print ""; print "".htmlspecialchars($r["comment"])."\n"; print "".getRevisionStatusText($r["status"])."\n"; print "
      "; From f5505e85b203866e431a4b4c6ce39299d078f546 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Apr 2019 10:51:31 +0200 Subject: [PATCH 023/467] order documents in tree by name --- views/bootstrap/class.DocumentChooser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.DocumentChooser.php b/views/bootstrap/class.DocumentChooser.php index d4359890b..d3d5da5f0 100644 --- a/views/bootstrap/class.DocumentChooser.php +++ b/views/bootstrap/class.DocumentChooser.php @@ -37,7 +37,7 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style { $partialtree = $this->params['partialtree']; header('Content-Type: application/javascript'); - $this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form, 0, '', $partialtree); + $this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form, 0, 'n', $partialtree); } /* }}} */ function show() { /* {{{ */ From 469370cb428d25cb66eedf5e75427e2163450174 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Apr 2019 10:51:51 +0200 Subject: [PATCH 024/467] new config option enableReceiptReject enables rejection of receipts --- inc/inc.ClassSettings.php | 10 +++++++--- op/op.Settings.php | 1 + out/out.ReceiptDocument.php | 1 + views/bootstrap/class.ReceiptDocument.php | 5 +++++ views/bootstrap/class.Settings.php | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 99aeb2a69..b6c1a9ba3 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -186,6 +186,8 @@ class Settings { /* {{{ */ var $_workflowMode = "traditional"; // enable/disable acknowledge workflow var $_enableReceiptWorkflow = true; + // enable/disable reject of reception + var $_enableReceiptReject = false; // enable/disable revision workflow var $_enableRevisionWorkflow = true; // enable/disable revision on vote reject @@ -701,9 +703,10 @@ class Settings { /* {{{ */ $this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]); $this->_versioningFileName = strval($tab["versioningFileName"]); $this->_workflowMode = strval($tab["workflowMode"]); - $this->_enableReceiptWorkflow = strval($tab["enableReceiptWorkflow"]); - $this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]); - $this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]); + $this->_enableReceiptWorkflow = Settings::boolval($tab["enableReceiptWorkflow"]); + $this->_enableReceiptReject = Settings::boolval($tab["enableReceiptReject"]); + $this->_enableRevisionWorkflow = Settings::boolval($tab["enableRevisionWorkflow"]); + $this->_enableRevisionOnVoteReject = Settings::boolval($tab["enableRevisionOnVoteReject"]); $this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]); $this->_allowChangeRevAppInProcess = Settings::boolval($tab["allowChangeRevAppInProcess"]); $this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]); @@ -1032,6 +1035,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName); $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode); $this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow); + $this->setXMLAttributValue($node, "enableReceiptReject", $this->_enableReceiptReject); $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow); $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject); $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly); diff --git a/op/op.Settings.php b/op/op.Settings.php index ce1c9e803..34cf27561 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -185,6 +185,7 @@ if ($action == "saveSettings") $settings->_initialDocumentStatus = $_POST["initialDocumentStatus"]; $settings->_workflowMode = $_POST["workflowMode"]; $settings->_enableReceiptWorkflow = getBoolValue("enableReceiptWorkflow"); + $settings->_enableReceiptReject = getBoolValue("enableReceiptReject"); $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow"); $settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject"); $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly"); diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php index cf6f3f955..be568e690 100644 --- a/out/out.ReceiptDocument.php +++ b/out/out.ReceiptDocument.php @@ -78,6 +78,7 @@ if($view) { $view->setParam('document', $document); $view->setParam('version', $content); $view->setParam('accessobject', $accessop); + $view->setParam('receiptreject', $settings->_enableReceiptReject); $view($_GET); exit; } diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php index 46ccdc353..534de2dcb 100644 --- a/views/bootstrap/class.ReceiptDocument.php +++ b/views/bootstrap/class.ReceiptDocument.php @@ -93,6 +93,7 @@ $(document).ready(function() { $folder = $this->params['folder']; $document = $this->params['document']; $content = $this->params['version']; + $receiptreject = $this->params['receiptreject']; $receipts = $content->getReceiptStatus(); foreach($receipts as $receipt) { @@ -135,6 +136,7 @@ $(document).ready(function() { +
      @@ -148,6 +150,9 @@ $(document).ready(function() {
      + + +
      diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index be70fd429..981a21338 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -431,6 +431,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigHeadline('settings_Edition'); ?> showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced'), false, true); ?> showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?> +showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?> showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?> showConfigCheckbox('settings_enableRevisionOnVoteReject', 'enableRevisionOnVoteReject'); ?> showConfigText('settings_versioningFileName', 'versioningFileName'); ?> From be725b8893df5bc545deef157d364b9ca11ea30c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Apr 2019 10:54:01 +0200 Subject: [PATCH 025/467] some new phrases --- languages/ar_EG/lang.inc | 3 +++ languages/bg_BG/lang.inc | 3 +++ languages/ca_ES/lang.inc | 3 +++ languages/cs_CZ/lang.inc | 9 ++++++--- languages/de_DE/lang.inc | 5 ++++- languages/el_GR/lang.inc | 3 +++ languages/en_GB/lang.inc | 7 +++++-- languages/es_ES/lang.inc | 3 +++ languages/fr_FR/lang.inc | 33 ++++++++++++++++++--------------- languages/hr_HR/lang.inc | 3 +++ languages/hu_HU/lang.inc | 3 +++ languages/it_IT/lang.inc | 9 ++++++--- languages/ko_KR/lang.inc | 3 +++ languages/lo_LA/lang.inc | 3 +++ languages/nl_NL/lang.inc | 3 +++ languages/pl_PL/lang.inc | 3 +++ languages/pt_BR/lang.inc | 3 +++ languages/ro_RO/lang.inc | 11 +++++++---- languages/ru_RU/lang.inc | 3 +++ languages/sk_SK/lang.inc | 3 +++ languages/sv_SE/lang.inc | 3 +++ languages/tr_TR/lang.inc | 3 +++ languages/uk_UA/lang.inc | 3 +++ languages/zh_CN/lang.inc | 9 ++++++--- languages/zh_TW/lang.inc | 3 +++ 25 files changed, 106 insertions(+), 31 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 2578d6f78..bb1cc71d2 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -927,6 +927,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'اعادة تحميل', 'rejected' => 'مرفوض', @@ -1264,6 +1265,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => '', 'settings_enablePasswordForgotten' => '', 'settings_enablePasswordForgotten_desc' => '', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 9d4d80eab..9af2c5d59 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -826,6 +826,7 @@ $text = array( 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Обнови', 'rejected' => 'Отказан', @@ -1127,6 +1128,8 @@ $text = array( 'settings_enableOwnerRevApp_desc' => '', 'settings_enablePasswordForgotten' => 'Включи възстанавяване на парола', 'settings_enablePasswordForgotten_desc' => 'Ако е включено, разрешава на потребителите да си възстанавяват паролата на email.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index f09c7f3b1..0790a6acd 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -831,6 +831,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Refresh', 'rejected' => 'Rebutjat', @@ -1132,6 +1133,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => '', 'settings_enablePasswordForgotten' => '', 'settings_enablePasswordForgotten_desc' => '', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index a045cd91c..9d0fda2eb 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1521), kreml (579) +// Translators: Admin (1523), kreml (579) $text = array( '2_factor_auth' => 'dvoufaktorové ověření', @@ -980,6 +980,7 @@ URL: [url]', 'reception_noaction' => 'Žádná akce', 'reception_rejected' => 'Přijetí odmítnuto', 'recipients' => 'Příjemci', +'recipient_already_removed' => '', 'redraw' => 'Překreslit', 'refresh' => 'Obnovit', 'rejected' => 'Odmítnuto', @@ -1343,6 +1344,8 @@ Jméno: [username] 'settings_enableOwnerRevApp_desc' => 'Povolte, pokud chcete, aby byl vlastník dokumentu uveden jako posuzovatel/schvalovatel a pro přechody workflow.', 'settings_enablePasswordForgotten' => 'Povolit zaslání zapomenutého hesla', 'settings_enablePasswordForgotten_desc' => 'Chcete-li povolit uživateli nastavit nové heslo a poslat ho e-mailem, zaškrtněte tuto možnost.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Povolit potvrzení příjmu dokumentů', 'settings_enableReceiptWorkflow_desc' => 'Povolte, pro spuštění workflow při potvrzení příjmu dokumentu.', 'settings_enableRecursiveCount' => 'Povolit rekurzivní počítání dokumentů / složek', @@ -1373,8 +1376,8 @@ Jméno: [username] 'settings_enableVersionModification_desc' => 'Povolit / zakázat úpravu verze dokumentu běžnému uživateli po té, co byla verze nahrána. Administrátor může vždy změnit verzi po nahrání.', 'settings_enableWebdavReplaceDoc' => 'Nahradit dokument při ukládání', 'settings_enableWebdavReplaceDoc_desc' => 'Je-li tato možnost povolena, uložení nové verze dokumentu nahrazuje starý dokument namísto vytvoření nové verze. Platí to pouze tehdy, pokud se uživatel, typ mozku a název souboru rovnají poslední verzi. To může být užitečné, když aplikace automaticky ukládají dokument v pevných intervalech.', -'settings_enableXsendfile' => '', -'settings_enableXsendfile_desc' => '', +'settings_enableXsendfile' => 'Použij modul apache xsendfile', +'settings_enableXsendfile_desc' => 'Pokud je tato volba aktivní a modul apache xsendfile je nainstalován, tento bude použit pro doručování obrázků.', 'settings_encryptionKey' => 'Šifrovací klíč', 'settings_encryptionKey_desc' => 'Tento řetězec se používá k vytvoření jedinečného identifikátoru, který je přidán jako skryté pole formuláře, aby se zabránilo útokům CSRF.', 'settings_error' => 'Chyba', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index b5783ca27..e2bb30b96 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2652), dgrutsch (22) +// Translators: Admin (2654), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -982,6 +982,7 @@ URL: [url]', 'reception_noaction' => 'Keine Aktion', 'reception_rejected' => 'Empfang abgelehnt', 'recipients' => 'Empfänger', +'recipient_already_removed' => '', 'redraw' => 'Neu zeichnen', 'refresh' => 'Aktualisieren', 'rejected' => 'abgelehnt', @@ -1353,6 +1354,8 @@ Name: [username] 'settings_enableOwnerRevApp_desc' => 'Anwählen, um den Besitzer eines Dokuments in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.', 'settings_enablePasswordForgotten' => 'Passwort-Vergessen Funktion einschalten', 'settings_enablePasswordForgotten_desc' => 'Setzen Sie diese Option, wenn Benutzer ein neues Password per E-Mail anfordern dürfen.', +'settings_enableReceiptReject' => 'Erlaube Ablehnung einer Empfangsbestätgung', +'settings_enableReceiptReject_desc' => 'Amwählen, um Empfangsbestätigungen abzulehnen.', 'settings_enableReceiptWorkflow' => 'Ermögliche Bestätigung des Dokumentenempfang', 'settings_enableReceiptWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten', 'settings_enableRecursiveCount' => 'Rekursive Dokumenten-/Ordner-Zählung', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 593082dcf..b457a1a71 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -837,6 +837,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => '', 'rejected' => '', @@ -1138,6 +1139,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => '', 'settings_enablePasswordForgotten' => '', 'settings_enablePasswordForgotten_desc' => '', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index b86b1a918..76dc7f871 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1769), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1773), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -984,6 +984,7 @@ URL: [url]', 'reception_noaction' => 'No action', 'reception_rejected' => 'Reception rejected', 'recipients' => 'Recipients', +'recipient_already_removed' => 'Recipient has already been removed or aknowledged recepiton.', 'redraw' => 'Redraw', 'refresh' => 'Refresh', 'rejected' => 'Rejected', @@ -1348,12 +1349,14 @@ Name: [username] 'settings_enableOwnerRevApp_desc' => 'Enable this if you want the owner of a document to be listed as reviewers/approvers and for workflow transitions.', 'settings_enablePasswordForgotten' => 'Enable Password forgotten', 'settings_enablePasswordForgotten_desc' => 'If you want to allow user to set a new password and send it by mail, check this option.', +'settings_enableReceiptReject' => 'Enable rejection of receptions', +'settings_enableReceiptReject_desc' => 'Enable, to turn on the rejection of receptions.', 'settings_enableReceiptWorkflow' => 'Enable acknowledge of document reception', 'settings_enableReceiptWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableRecursiveCount' => 'Enable recursive document/folder count', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', 'settings_enableRevisionOnVoteReject' => 'Reject by one revisor', -'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be reject if one revisor rejects the document.', +'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be rejected if one revisor rejects the document.', 'settings_enableRevisionWorkflow' => 'Enable revision of documents', 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.', 'settings_enableSelfReceipt' => 'Allow reception of documents for logged in user', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index fbad627fb..8a1e1b8f5 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -942,6 +942,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Actualizar', 'rejected' => 'Rechazado', @@ -1279,6 +1280,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Habilitar esto si quiere que el propietario de un documento sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.', 'settings_enablePasswordForgotten' => 'Habilitar recordatorio de contraseña', 'settings_enablePasswordForgotten_desc' => 'Si quiere permitir a los usuarios fijar una nueva contraseña recibiendo un correo electrónico, active esta opción.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Habilitar cuenta de documento/carpeta recursivo', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index d6cfc2799..85d33eb92 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (725) +// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (739) $text = array( '2_factor_auth' => 'Authentification forte', @@ -982,6 +982,7 @@ URL : [url]', 'reception_noaction' => 'Aucune action', 'reception_rejected' => 'Réception rejetée', 'recipients' => 'Destinataires', +'recipient_already_removed' => '', 'redraw' => 'Redessiner', 'refresh' => 'Actualiser', 'rejected' => 'Rejeté', @@ -1332,6 +1333,8 @@ Nom : [username] 'settings_enableOwnerRevApp_desc' => 'Activer cette option pour ajouter le propriétaire du document à la liste des examinateurs/approbateurs et pour les transitions de workflow.', 'settings_enablePasswordForgotten' => 'Activer Mot de passe oublié', 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Activer la réception de document', 'settings_enableReceiptWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.', 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers', @@ -1521,14 +1524,14 @@ Nom : [username] 'settings_strictFormCheck_desc' => 'Contrôle strict des formulaires. Si cette option est activée, tous les champs du formulaire doivent être saisis. Sinon, la plupart des champs (commentaires et mots-clés) sont facultatifs. Les commentaires sont toujours obligatoires lors de la soumission d\'une vérification ou du changement de statut ​​d’un document.', 'settings_suggestionvalue' => 'Valeur suggérée', 'settings_System' => 'Système', -'settings_tasksInMenu' => '', -'settings_tasksInMenu_approval' => '', -'settings_tasksInMenu_desc' => '', -'settings_tasksInMenu_needscorrection' => '', -'settings_tasksInMenu_receipt' => '', -'settings_tasksInMenu_review' => '', -'settings_tasksInMenu_revision' => '', -'settings_tasksInMenu_workflow' => '', +'settings_tasksInMenu' => 'Tâches sélectionnées', +'settings_tasksInMenu_approval' => 'Approbations', +'settings_tasksInMenu_desc' => 'Sélectionnez les tâches à comptabiliser. Si aucune n’est sélectionnée, toutes les tâches seront comptabilisées.', +'settings_tasksInMenu_needscorrection' => 'Nécessitant une correction', +'settings_tasksInMenu_receipt' => 'Réceptions', +'settings_tasksInMenu_review' => 'Vérifications', +'settings_tasksInMenu_revision' => 'Révisions', +'settings_tasksInMenu_workflow' => 'Workflow', 'settings_theme' => 'Thème par défaut', 'settings_theme_desc' => 'Thème par défaut(nom d\'un sous-répertoire du répertoire "styles")', 'settings_titleDisplayHack' => 'Title Display Hack', @@ -1587,15 +1590,15 @@ Nom : [username] 'splash_edit_event' => 'Événement modifié', 'splash_edit_group' => 'Groupe modifié', 'splash_edit_role' => 'Rôle modifié', -'splash_edit_task' => '', +'splash_edit_task' => 'Tâche modifiée', 'splash_edit_user' => 'Utilisateur modifié', 'splash_error_add_to_transmittal' => 'Erreur lors de l’ajout du document à la transmission', 'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement', 'splash_error_send_download_link' => 'Erreur lors de l’envoi du lien de téléchargement', -'splash_extension_getlist' => '', +'splash_extension_getlist' => 'Liste des extensions mises à jour depuis le dépôt', 'splash_extension_import' => 'Extension installée', 'splash_extension_refresh' => 'Liste des extensions actualisée', -'splash_extension_upload' => '', +'splash_extension_upload' => 'Extension installée', 'splash_folder_edited' => 'Dossier modifié', 'splash_importfs' => '[docs] documents et [folders] dossiers importés', 'splash_inherit_access' => 'Droits d’accès hérités', @@ -1702,10 +1705,10 @@ Nom : [username] 'timeline_full_add_version' => '[document]
      Nouvelle version ([version])', 'timeline_full_scheduled_revision' => '[document]
      Révision de la version [version]', 'timeline_full_status_change' => '[document]
      Version [version] : [status]', -'timeline_scheduled_revision' => '', +'timeline_scheduled_revision' => 'Révision de la version [version]', 'timeline_selected_item' => 'Document sélectionné', 'timeline_skip_add_file' => 'avec fichiers attachés', -'timeline_skip_scheduled_revision' => '', +'timeline_skip_scheduled_revision' => 'Révision planifiée', 'timeline_skip_status_change_-1' => 'rejetés', 'timeline_skip_status_change_-3' => 'expirés', 'timeline_skip_status_change_0' => 'en attente de revue', @@ -1775,7 +1778,7 @@ URL : [url]', 'update_locked_msg' => 'Ce document est verrouillé.', 'update_recipients' => 'Mettre à jour la liste des destinataires', 'update_reviewers' => 'Mettre à jour la liste des examinateurs', -'update_revisors' => '', +'update_revisors' => 'Mettre à jour la liste des réviseurs', 'update_transmittalitem' => 'Mettre à jour l’élément', 'uploaded_by' => 'Déposé par', 'uploading_failed' => 'Dépôt d\'un des documents échoué. Veuillez vérifier la taille d\'envoi maximale autorisée.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 1b379a1dc..b0ea9ac8a 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -946,6 +946,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => 'Primatelji', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Osvježi', 'rejected' => 'Odbijeno', @@ -1300,6 +1301,8 @@ Internet poveznica: [url]', 'settings_enableOwnerRevApp_desc' => 'Omogućite ovo ako želite da vlasnik dokumenta bude naveden kao recezent/validator i za promjene tokova rada.', 'settings_enablePasswordForgotten' => 'Omogući zaboravljanje lozinke', 'settings_enablePasswordForgotten_desc' => 'Ako želite omogućiti korisniku da postavi novu lozinku i pošalje ju e-mailom, označite ovu opciju.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Omogućavanje potvrđivanja prijema dokumenta', 'settings_enableReceiptWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.', 'settings_enableRecursiveCount' => 'Omogući rekurzivno brojanje dokumenta/mape', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 71e88d17b..3436115c7 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -942,6 +942,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => 'újrarajzol', 'refresh' => 'Frissítés', 'rejected' => 'Elutasított', @@ -1278,6 +1279,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Engedélyezze, ha szeretné, hogy a dokumentum tulajdonosa listázásra kerüljön a felülvizsgálóknál/jóváhagyóknál és a munkamenet átmeneteknél.', 'settings_enablePasswordForgotten' => 'Jelszó emlékeztető engedélyezése', 'settings_enablePasswordForgotten_desc' => 'Ha azt szeretné, hogy a felhasználó megadhasson új jelszót és elküldhesse azt emailben, engedélyezze ezt a lehetőséget.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Engedélyezi a rekurzív dokumentum/mappa számot', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 2b939c5d3..946fa82cc 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1622), rickr (144), s.pnt (26) +// Translators: Admin (1624), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', @@ -953,6 +953,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => 'Cartelle', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Ricarica', 'rejected' => 'Rifiutato', @@ -1179,8 +1180,8 @@ URL: [url]', 'seq_keep' => 'Mantieni la posizione', 'seq_start' => 'Prima posizione', 'sessions' => '', -'setDateFromFile' => '', -'setDateFromFolder' => '', +'setDateFromFile' => 'Prende la data dal file importato', +'setDateFromFolder' => 'Prende la data dalla cartella importata', 'settings' => 'Impostazioni', 'settings_activate_module' => 'Attivazione modulo', 'settings_activate_php_extension' => 'Attivazione estensione PHP', @@ -1312,6 +1313,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Spuntare per aggiungere il proprietario del documento alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enablePasswordForgotten' => 'Abilita recupero password', 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Abilitare per notifiche', 'settings_enableReceiptWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.', 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index c5733f683..904644b82 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -940,6 +940,7 @@ URL : [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '받는 사람', +'recipient_already_removed' => '', 'redraw' => '다시 그리기', 'refresh' => '새로 고침', 'rejected' => '거부', @@ -1294,6 +1295,8 @@ URL : [url]', 'settings_enableOwnerRevApp_desc' => '이 문서의 소유자가 검토 / 승인으로 워크 플로우 전환에 대한 나열하고자 할 경우에 사용합니다.', 'settings_enablePasswordForgotten' => '비밀번호 분실 활성화', 'settings_enablePasswordForgotten_desc' => '옵션을 사용자가 새 비밀번호를 설정하도록 메일로 보내 확인 할 수 있습니다.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '문서 수신의 응답 활성화', 'settings_enableReceiptWorkflow_desc' => '문서의 수신 확인을 위해 워크플로어를 선택하고 활성화 합니다.', 'settings_enableRecursiveCount' => '재귀적 문서 / 폴더 수 사용', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index d2a6be267..bbd36797e 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -963,6 +963,7 @@ URL: [url]', 'reception_noaction' => 'ບໍ່ມີການຕອບສະຫນອງ', 'reception_rejected' => 'ປະຕິເສດການຕ້ອນຮັບ', 'recipients' => 'ຜູ້ຮັບ', +'recipient_already_removed' => '', 'redraw' => 'ຂຽນໄຫມ່', 'refresh' => 'ລີເຟສ', 'rejected' => 'ປະຕິເສດ', @@ -1327,6 +1328,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'ເປີດໄຊ້ງານລັກສະນະນີ້ຫາກເຈົ້າຕ້ອງການໃຫ້ເຈົ້າຂອງເກະສານລະບຸວ່າເປັນຜູ້ກວດສອບ/ຜູ້ອະນຸມັດແລະສຳລັບການປ່ຽນແປງວິທີການເຮັດວຽກ', 'settings_enablePasswordForgotten' => 'ລືມລະຫັດຜ່ານເປີດໄຊ້ງານ', 'settings_enablePasswordForgotten_desc' => 'ຖ້າເຈົ້າຕ້ອງການອະນຸຍາດໃຫ້ຜູ້ໄຊ້ຕັ້ງລະຫັດຜ່ານໄຫມ່ແລະສົ່ງດ້ວຍອີເມວ ໃຫ້ເລືອກຕົວເລືອກນີ້', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'ເປີດໄຊ້ງານການນັບເອກະສານ/ໂຟລເດີນັບຊໍ້າ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index ce443f923..3c62a28fd 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -958,6 +958,7 @@ URL: [url]', 'reception_noaction' => 'Geen actie', 'reception_rejected' => 'bestemming geweigerd', 'recipients' => 'Ontvangers', +'recipient_already_removed' => '', 'redraw' => 'Nogmaals weergeven', 'refresh' => 'Verversen', 'rejected' => 'Afgewezen', @@ -1324,6 +1325,8 @@ Name: [username] 'settings_enableOwnerRevApp_desc' => 'Activeer dit als de eigenaar van een document genoteerd staat as beoordelaar/ goedkeurder en voor workflow overdrachten.', 'settings_enablePasswordForgotten' => '\'wachtwoord vergeten\' aanzetten', 'settings_enablePasswordForgotten_desc' => 'Inschakelen om een wachtwoord via mail te versturen als de gebruiker een nieuw wachtwoord heeft ingesteld.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Aanzetten Workflow-stappen', 'settings_enableReceiptWorkflow_desc' => 'Aanzetten workflow-stappen', 'settings_enableRecursiveCount' => 'Document/ map teller herhalen toestaan', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 31cad25b9..01263d9b8 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -935,6 +935,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Odśwież', 'rejected' => 'Odrzucony', @@ -1258,6 +1259,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Włącz tę opcję jeżeli właściciel dokumentu powinien być wymieniony jako zatwierdzających/recenzentów oraz dla przepływu procesu', 'settings_enablePasswordForgotten' => 'Włącz odzyskiwanie hasła po jego zapomnieniu', 'settings_enablePasswordForgotten_desc' => 'Jeśli chcesz zezwolić użytkownikom na zmianę własnego hasła i wysyłanie go emailem, zaznacz tę opcję.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Włącz licznik rekurencji dokumentu/folderu', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 2d020901e..682745dc8 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -940,6 +940,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Atualizar', 'rejected' => 'Rejected', @@ -1276,6 +1277,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Habilite esta opção se quiser que o proprietário de um documento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.', 'settings_enablePasswordForgotten' => 'Ativar Senhas esquecidas', 'settings_enablePasswordForgotten_desc' => 'Se você quiser permitir o usuário definir uma nova senha e enviá-la por e-mail, marque esta opção.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 44c80298b..be4274008 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1082), balan (87) +// Translators: Admin (1085), balan (87) $text = array( '2_factor_auth' => '', @@ -914,7 +914,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'pl_PL' => 'Poloneză', 'possible_substitutes' => '', 'preset_expires' => 'Expirarea presetului', -'preview' => '', +'preview' => 'Previzualizare', 'preview_converters' => '', 'preview_images' => '', 'preview_markdown' => '', @@ -947,6 +947,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => 'Destinatari', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Refresh', 'rejected' => 'Respins', @@ -1301,6 +1302,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Activați această opțiune dacă doriți ca proprietarul unui document să fie listat ca revizuitor/aprobator sau in tranzițiile workflow-ului.', 'settings_enablePasswordForgotten' => 'Activați Am uitat parola', 'settings_enablePasswordForgotten_desc' => 'Dacă doriți să permiteti utilizatorilor să stabilească o nouă parolă și să le fie trimisă prin e-mail, bifați această opțiune.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Activați numararea recursiva pentru documente/foldere', @@ -1690,10 +1693,10 @@ URL: [url]', 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere', 'transfer_document' => 'Transfer document', 'transfer_no_read_access' => '', -'transfer_no_write_access' => '', +'transfer_no_write_access' => 'Utilizatorul nu are drepturi de scriere pe acest dosar', 'transfer_objects' => '', 'transfer_objects_to_user' => '', -'transfer_to_user' => '', +'transfer_to_user' => 'Trabsferare catre alt utilizator', 'transition_triggered_email' => 'Tranziție Workflow declanșată', 'transition_triggered_email_body' => 'Tranziție Workflow declanșată Document: [name] diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index fcc6bfc10..4ec0281fe 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -949,6 +949,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => 'Получатели', +'recipient_already_removed' => '', 'redraw' => 'Обновить картинку', 'refresh' => 'Обновить', 'rejected' => 'Отклонён', @@ -1308,6 +1309,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Включите для того, чтобы владелец документа был в списке рецензентов/утверждающих и в изменении процесса.', 'settings_enablePasswordForgotten' => 'Включить восстановление пароля', 'settings_enablePasswordForgotten_desc' => 'Если включено, разрешает пользователям восстанавливать пароль через e-mail.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Включить подтверждение получения документа', 'settings_enableReceiptWorkflow_desc' => 'Включить для активации функции подтверждения получения документа', 'settings_enableRecursiveCount' => 'Рекурсивно подсчитывать
      документы и каталоги', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index f2e84f61d..11bb845c7 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -984,6 +984,7 @@ URL: [url]', 'reception_noaction' => 'Žiadna akcia', 'reception_rejected' => 'Reception rejected', 'recipients' => 'Príjemcovia', +'recipient_already_removed' => '', 'redraw' => 'Prekresliť', 'refresh' => 'Obnoviť', 'rejected' => 'Odmietnuté', @@ -1348,6 +1349,8 @@ Meno: [username] 'settings_enableOwnerRevApp_desc' => 'Enable this if you want the owner of a document to be listed as reviewers/approvers and for workflow transitions.', 'settings_enablePasswordForgotten' => 'Povoliť zabudnuté heslo', 'settings_enablePasswordForgotten_desc' => 'If you want to allow user to set a new password and send it by mail, check this option.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Enable acknowledge of document reception', 'settings_enableReceiptWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableRecursiveCount' => 'Enable recursive document/folder count', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index ec4285d62..241beb444 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -957,6 +957,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.', 'reception_noaction' => 'Ingen åtgärd', 'reception_rejected' => '', 'recipients' => 'Mottagare', +'recipient_already_removed' => '', 'redraw' => 'Återkalla', 'refresh' => 'Uppdatera', 'rejected' => 'Avvisat', @@ -1321,6 +1322,8 @@ Kommentar: [comment]', 'settings_enableOwnerRevApp_desc' => 'Aktivera om du vill att en dokumentägare visas i listan för personer som granskar/godkänner dokumentet och i övergång på arbetsflöden.', 'settings_enablePasswordForgotten' => 'Aktivera glömt lösenord', 'settings_enablePasswordForgotten_desc' => 'Om du vill tillåta att användare kan få nytt lösenord genom att skicka e-post, aktivera denna option.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Aktivera notifiering vid mottagande av dokument', 'settings_enableReceiptWorkflow_desc' => 'Aktivera notifiering av meddelanden i arbetsflödet.', 'settings_enableRecursiveCount' => 'Aktivera rekursiv räkning av dokument/katalog', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 393ebd32e..8b91e8d0a 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -943,6 +943,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Yenile', 'rejected' => 'Reddedildi', @@ -1280,6 +1281,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Bir dokümanın sahibinin kontrol eden/onaylayan listesinde ve iş akışında olmasını isterseniz bunu etkinleştirin.', 'settings_enablePasswordForgotten' => 'Parola Kurtarmayı Etkinleştir', 'settings_enablePasswordForgotten_desc' => 'Kullanıcının unuttuğu parolayı kendisine gönderilecek e-posta ile sıfırlamasına izin vermek için bu seçeneği etkinleştirebilirsiniz.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Özyinelenen doküman/klasör sayımını etkinleştir', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index c69a2334b..211252c90 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -949,6 +949,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => 'Отримувачі', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => 'Оновити', 'rejected' => 'Відхилений', @@ -1301,6 +1302,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => 'Увімкніть для того, щоб власник відображався в списку рецензентів/затверджувачів і для зміни процесу.', 'settings_enablePasswordForgotten' => 'Включити відновлення паролю', 'settings_enablePasswordForgotten_desc' => 'Якщо увімкнено, дозволяє користувачам відновлювати пароль через e-mail.', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => 'Увімкнути підтвердження отримання документу', 'settings_enableReceiptWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу', 'settings_enableRecursiveCount' => 'Рекурсивно підраховувати
      документи і каталоги', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 5f13d24f7..afef9bc37 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (757), archonwang (469), fengjohn (5), yang86 (1) +// Translators: Admin (760), archonwang (469), fengjohn (5), yang86 (1) $text = array( '2_factor_auth' => '双重认证', @@ -948,6 +948,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => '刷新', 'rejected' => '拒绝', @@ -1149,8 +1150,8 @@ URL: [url]', 'seq_keep' => '当前', 'seq_start' => '首位', 'sessions' => '在线用户', -'setDateFromFile' => '', -'setDateFromFolder' => '', +'setDateFromFile' => '从文件设置日期', +'setDateFromFolder' => '从文件夹中设置日期', 'settings' => '设置', 'settings_activate_module' => '启用模块', 'settings_activate_php_extension' => '启用 PHP 扩展', @@ -1282,6 +1283,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => '', 'settings_enablePasswordForgotten' => '启用忘记密码功能', 'settings_enablePasswordForgotten_desc' => '如您想让用户可以通过邮件方式自主设置新密码，请勾选此选项', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '启用文档接收确认通知', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index ec317d2be..7cadae681 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -830,6 +830,7 @@ URL: [url]', 'reception_noaction' => '', 'reception_rejected' => '', 'recipients' => '', +'recipient_already_removed' => '', 'redraw' => '', 'refresh' => '重新整理', 'rejected' => '拒絕', @@ -1131,6 +1132,8 @@ URL: [url]', 'settings_enableOwnerRevApp_desc' => '', 'settings_enablePasswordForgotten' => '', 'settings_enablePasswordForgotten_desc' => '', +'settings_enableReceiptReject' => '', +'settings_enableReceiptReject_desc' => '', 'settings_enableReceiptWorkflow' => '', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', From 570dc9ca7146fe22c15ae0f4163aa40a77e6b4cf Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Apr 2019 11:20:00 +0200 Subject: [PATCH 026/467] new items for 6.0.7 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c20d3ac0b..e3a6ba785 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,9 @@ - do not show the updating user in a revision workflow if the status is 0 this is misleading because the user starting the revision workflow is the one first accessing the document +- rejection of document receipts are turned off by default, but can be turned + on in the settings +- documents in DocumentChooser are sorted by name -------------------------------------------------------------------------------- Changes in version 6.0.6 From 423bf1dd7c8a861bc0f80fc54fd382330757947c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Apr 2019 06:19:56 +0200 Subject: [PATCH 027/467] do not show attributes in extra column in search result put into a popup opened by a button --- styles/bootstrap/application.js | 3 ++ views/bootstrap/class.Bootstrap.php | 10 ++++- views/bootstrap/class.Search.php | 57 ++++++++++++++++++++++++++++- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 47599c115..70a86eaa2 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -985,6 +985,9 @@ $(document).ready(function() { /* {{{ */ $("body").on("click", "span.openpopupbox i", function(e) { $(e.target).parent().click(); }); + $("body").on("click", "span.openpopupbox span", function(e) { + $(e.target).parent().click(); + }); $("body").on("click", "span.closepopupbox", function(e) { $(this).parent().hide(); }); diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 1eb4bb615..47319c248 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2171,7 +2171,7 @@ $(document).ready( function() { * @param object $previewer * @param boolean $skipcont set to true if embrasing tr shall be skipped */ - function documentListRow($document, $previewer, $skipcont=false, $version=0) { /* {{{ */ + function documentListRow($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; $showtree = $this->params['showtree']; @@ -2238,10 +2238,14 @@ $(document).ready( function() { $content .= ""; $content .= "" . htmlspecialchars($document->getName()) . ""; + if(isset($extracontent['below_title'])) + $content .= $extracontent['below_title']; $content .= "
      ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $document->getDate()).", ".getMLText('version')." ".$version." - ".date('Y-m-d', $latestContent->getDate())."".($document->expires() ? ", ".getMLText('expires').": ".getReadableDate($document->getExpires())."" : "").""; if($comment) { $content .= "
      ".htmlspecialchars($comment).""; } + if(!empty($extracontent['bottom_title'])) + $content .= $extracontent['bottom_title']; $content .= "\n"; $content .= ""; @@ -2293,7 +2297,7 @@ $(document).ready( function() { return $content; } /* }}} */ - function folderListRow($subFolder) { /* {{{ */ + function folderListRow($subFolder, $extracontent=array()) { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; // $folder = $this->params['folder']; @@ -2314,6 +2318,8 @@ $(document).ready( function() { if($comment) { $content .= "
      ".htmlspecialchars($comment).""; } + if(isset($extracontent['bottom_title'])) + $content .= $extracontent['bottom_title']; $content .= "\n"; // $content .= "".htmlspecialchars($owner->getFullName()).""; $content .= ""; diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 77d5b898d..f844dd070 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -463,7 +463,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("attributes")."\n"; + //print "".getMLText("attributes")."\n"; print "".getMLText("status")."\n"; print "".getMLText("action")."\n"; print "\n\n\n"; @@ -487,6 +487,42 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { else $comment = htmlspecialchars($document->getComment()); if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; + + $belowtitle = "
      ".getMLText('in_folder').": /"; + $folder = $document->getFolder(); + $path = $folder->getPath(); + for ($i = 1; $i < count($path); $i++) { + $belowtitle .= htmlspecialchars($path[$i]->getName())."/"; + } + $belowtitle .= ""; + $lcattributes = $lc->getAttributes(); + $attrstr = ''; + if($lcattributes) { + $attrstr .= "\n"; + $attrstr .= ""; + foreach($lcattributes as $lcattribute) { + $attrdef = $lcattribute->getAttributeDefinition(); + $attrstr .= "\n"; + } + $attrstr .= "
      ".getMLText('name')."".getMLText('attribute_value')."
      ".htmlspecialchars($attrdef->getName())."".htmlspecialchars(implode(', ', $lcattribute->getValueAsArray()))."
      \n"; + } + $docttributes = $document->getAttributes(); + if($docttributes) { + $attrstr .= "\n"; + $attrstr .= ""; + foreach($docttributes as $docttribute) { + $attrdef = $docttribute->getAttributeDefinition(); + $attrstr .= "\n"; + } + $attrstr .= "
      ".getMLText('name')."".getMLText('attribute_value')."
      ".htmlspecialchars($attrdef->getName())."".htmlspecialchars(implode(', ', $docttribute->getValueAsArray()))."
      \n"; + } + $extracontent = array(); + $extracontent['below_title'] = $belowtitle; + if($attrstr) + $extracontent['bottom_title'] = '
      '.$this->printPopupBox(''.getMLText('attributes').'', $attrstr, true); + print $this->documentListRow($document, $previewer, false, 0, $extracontent); + + if(0) { print "getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">"; if (in_array(2, $searchin)) { $docName = $this->markQuery(htmlspecialchars($document->getName()), "i"); @@ -565,6 +601,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { print "
      "; print ""; print "\n"; + } } } elseif(get_class($entry) == $dms->getClassname('folder')) { $folder = $entry; @@ -574,6 +611,23 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { } else { $folderName = htmlspecialchars($folder->getName()); } + + $attrstr = ''; + $folderattributes = $folder->getAttributes(); + if($folderattributes) { + $attrstr .= "\n"; + $attrstr .= ""; + foreach($folderattributes as $folderattribute) { + $attrdef = $folderattribute->getAttributeDefinition(); + $attrstr .= "\n"; + } + $attrstr .= "
      ".getMLText('name')."".getMLText('attribute_value')."
      ".htmlspecialchars($attrdef->getName())."".htmlspecialchars(implode(', ', $folderattribute->getValueAsArray()))."
      "; + } + $extracontent = array(); + if($attrstr) + $extracontent['bottom_title'] = '
      '.$this->printPopupBox(''.getMLText('attributes').'', $attrstr, true); + print $this->folderListRow($folder, $extracontent); + if(0) { print "getID()."\" draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; print "getID()."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>"; print "getID()."\">"; @@ -630,6 +684,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { print "
      "; print ""; print "\n"; + } } } print "\n"; From 7ceb0e9718dd14a3dd095e5a24862ab3be0d1806 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Apr 2019 08:54:25 +0200 Subject: [PATCH 028/467] may not edit reception if rejecting a reception is turned off --- out/out.ViewDocument.php | 1 + views/bootstrap/class.ViewDocument.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php index 5adefe425..8d9387628 100644 --- a/out/out.ViewDocument.php +++ b/out/out.ViewDocument.php @@ -81,6 +81,7 @@ if($view) { $view->setParam('enablerevisionworkflow', $settings->_enableRevisionWorkflow); $view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); $view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt); + $view->setParam('enablereceiptreject', $settings->_enableReceiptReject); $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('previewWidthList', $settings->_previewWidthList); diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index ddbce2d4c..db2967332 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -443,6 +443,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $enableownerrevapp = $this->params['enableownerrevapp']; $enableownerreceipt = $this->params['enableownerreceipt']; $enablereceiptworkflow = $this->params['enablereceiptworkflow']; + $enablereceiptreject = $this->params['enablereceiptreject']; $enablerevisionworkflow = $this->params['enablerevisionworkflow']; $workflowmode = $this->params['workflowmode']; $cachedir = $this->params['cachedir']; @@ -1318,7 +1319,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if ($is_recipient) { if($r["status"]==0) { print "
    • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."
      • "; - } elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))) { + } elseif ($accessop->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'), getMLText("edit"), false, true)."
      • "; } } From e1bd6605aacd2e11f33da7f91305476a6b89f31e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Apr 2019 08:55:45 +0200 Subject: [PATCH 029/467] add entry from 5.1.11 --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 974e3099f..def1728bc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.11 +-------------------------------------------------------------------------------- +- do not show attributes in search results in extra column anymore + -------------------------------------------------------------------------------- Changes in version 5.1.10 -------------------------------------------------------------------------------- From 43c15ff39953764959595eec47c0ea697186a8b5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 17 Apr 2019 08:28:46 +0200 Subject: [PATCH 030/467] index document even if hook preIndexDocument is not set --- op/op.Ajax.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 3e987b459..44778b452 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -803,15 +803,16 @@ switch($command) { $idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout); $error = $idoc->getErrorMsg(); if(!$error) { + $ires = null; if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) { if (method_exists($hookObj, 'preIndexDocument')) { - if(false !== ($ires = $hookObj->preIndexDocument(null, $document, $idoc))) { - $ires = $index->addDocument($idoc); - } + $ires = $hookObj->preIndexDocument(null, $document, $idoc); } } } + if(false !== $ires) + $ires = $index->addDocument($idoc); header('Content-Type: application/json'); if(false === $ires) { echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$document->getID())); From 0f38a3dff6e8c1f0e8049433cd26b52cdf13fbaa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 17 Apr 2019 08:29:19 +0200 Subject: [PATCH 031/467] propperly evaluate lang from REQUEST --- controllers/class.Login.php | 6 ++---- op/op.Login.php | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/controllers/class.Login.php b/controllers/class.Login.php index bf5abc190..01cd4f21a 100644 --- a/controllers/class.Login.php +++ b/controllers/class.Login.php @@ -151,11 +151,9 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common { $user->clearLoginFailures(); // Capture the user's language and theme settings. - if (isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],getLanguages())) ) { - $lang = $_REQUEST["lang"]; + if ($lang) { $user->setLanguage($lang); - } - else { + } else { $lang = $user->getLanguage(); if (strlen($lang)==0) { $lang = $settings->_language; diff --git a/op/op.Login.php b/op/op.Login.php index 7f98452f9..ca4a8b714 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -65,6 +65,11 @@ if(isset($_POST['pwd'])) { } } +$lang = ''; +if(isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],getLanguages())) ) { + $lang = (string) $_REQUEST["lang"]; +} + $session = new SeedDMS_Session($db); // TODO: by the PHP manual: The superglobals $_GET and $_REQUEST are already decoded. From ad1480eb3e87373c566b447cf05d781d7d8ed0d1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 17 Apr 2019 08:29:52 +0200 Subject: [PATCH 032/467] add item for 5.1.11 (fixing #437) --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index def1728bc..09eb2d890 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes in version 5.1.11 -------------------------------------------------------------------------------- - do not show attributes in search results in extra column anymore +- fix setting language during login (Closes #437) +- fix indexing documents even if no preIndexDocument hook is set (Closes #437) -------------------------------------------------------------------------------- Changes in version 5.1.10 From 1dfd36e79ab10fef33739d287a530cf2eb304c2f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 1 May 2019 12:43:36 +0200 Subject: [PATCH 033/467] fix moving documents on clipboard into the current folder --- out/out.Clipboard.php | 11 +++++++++++ views/bootstrap/class.Bootstrap.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/out/out.Clipboard.php b/out/out.Clipboard.php index bef7d4108..d81476bd0 100644 --- a/out/out.Clipboard.php +++ b/out/out.Clipboard.php @@ -33,7 +33,18 @@ require_once("inc/inc.ClassUI.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$folder = null; +if (isset($_GET["folderid"]) && is_numeric($_GET["folderid"])) { + $folderid = intval($_GET["folderid"]); + $folder = $dms->getFolder($folderid); + if (!is_object($folder)) { + UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))), getMLText("invalid_folder_id")); + } +} + + if($view) { + $view->setParam('folder', $folder); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 47319c248..6949641aa 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -350,7 +350,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } if($this->params['enableclipboard']) { echo "
      "; - echo "
      "; + echo "
      "; echo "
      "; } From 2fca4a8f50a9b7f77aa7b1cba809defead44a19a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 1 May 2019 12:48:36 +0200 Subject: [PATCH 034/467] add item for 5.1.11 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 09eb2d890..e45afe7e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - do not show attributes in search results in extra column anymore - fix setting language during login (Closes #437) - fix indexing documents even if no preIndexDocument hook is set (Closes #437) +- fix moving documents on the clipboard into the current folder -------------------------------------------------------------------------------- Changes in version 5.1.10 From f8841e670eb1bf591219204be24989c087d5a853 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 2 May 2019 16:56:00 +0200 Subject: [PATCH 035/467] start new version 5.1.11 --- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 26 +++++++++++++++++++++----- inc/inc.Version.php | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index d42bfe9b6..d83a2fc33 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -376,7 +376,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '5.1.10'; + $this->version = '5.1.11'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 50aa5d16b..173016bf2 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2018-11-23 + 2019-05-03 - 5.1.10 - 5.1.10 + 5.1.11 + 5.1.11 stable @@ -24,8 +24,7 @@ GPL License -fix php warning if workflow state doesn' have next transition -add method SeedDMS_Core_DatabaseAccess::setLogFp() +???       @@ -1635,5 +1634,22 @@ new optional parameter $listguest for SeedDMS_Core_Document::getReadAccessList() remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Document::wasConverted(), SeedDMS_Core_Document::viewOnline(), SeedDMS_Core_Document::getUrl() + + 2019-04-04 + + + 5.1.10 + 5.1.10 + + + stable + stable + + GPL License + +fix php warning if workflow state doesn' have next transition +add method SeedDMS_Core_DatabaseAccess::setLogFp() + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index f9240bab5..78c5944ba 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.1.10"; + public $_number = "5.1.11"; private $_string = "SeedDMS"; function __construct() { From ddddb4fb74ccb02b6fa85c5e501d1ea74b7f38c3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 1 Aug 2017 09:35:05 +0200 Subject: [PATCH 036/467] add splashscreen for paypal --- styles/bootstrap/application.css | 15 ++++++++++++++ views/bootstrap/class.Bootstrap.php | 22 +++++++++++++++++++-- views/bootstrap/class.ViewFolder.php | 29 ++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index eb117fcd6..6a94e401e 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -228,6 +228,21 @@ ul.qq-upload-list li span { display: none; } +#splashScreen img{ + margin:0 auto; + } + +#splashScreen{ + position:absolute; + top:0px; + left:0; + height:100%; + width:100%; + background: url(../img/kachel.png); + background-repeat:no-repeat; + text-align:center; +} + @media (min-width: 1200px) { .modal-wide { width: 800px; diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 6949641aa..b516c5a75 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -219,8 +219,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; function footNote() { /* {{{ */ echo "
      \n"; - echo '
      '."\n"; - echo '
      '."\n"; + echo '
      '."\n"; + echo '
      '."\n"; echo '
      '."\n"; if ($this->params['printdisclaimer']){ echo "
      ".getMLText("disclaimer")."
      "; @@ -229,6 +229,24 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if (isset($this->params['footnote']) && strlen((string)$this->params['footnote'])>0) { echo "
      ".(string)$this->params['footnote']."
      "; } + echo "
      \n"; + echo "
      \n"; + echo '
      '."\n"; + echo '
      '."\n"; +?> +Please help to improve SeedDMS! All donations are spend on developing SeedDMS. +
      + + + + + + + + + +
      +\n"; echo "
      \n"; echo "
      \n"; diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 88b80a07c..5d6087498 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -246,6 +246,8 @@ $('#loadmore').click(function(e) { $this->htmlAddHeader(''."\n", 'js'); + $this->htmlAddHeader(''."\n", 'js'); + $this->htmlAddHeader(''."\n", 'js'); echo $this->callHook('startPage'); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); @@ -263,6 +265,33 @@ $('#loadmore').click(function(e) { echo $this->callHook('preContent'); +?> +       +\n"; // dynamic columns - left column removed if no content and right column then fills span12. From c459175babc6c59fb5989ff53f1914828c8698fa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 22 Aug 2017 18:09:15 +0200 Subject: [PATCH 037/467] add offer to receive a copy of the user's manual --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index b516c5a75..371d4a3b2 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -234,7 +234,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo '
      '."\n"; echo '
      '."\n"; ?> -Please help to improve SeedDMS! All donations are spend on developing SeedDMS. +Please help to improve SeedDMS! All donations are spend on developing SeedDMS. Donate at least 20 USD and get a pdf copy of the user's manual including updates for 1 year.
      From b1dc6847386fe9d53c1e5786d22152d2e632c859 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 16 Feb 2018 09:45:06 +0100 Subject: [PATCH 038/467] add donate button to global nav, use simpler button --- views/bootstrap/class.Bootstrap.php | 21 ++++++++++++++++----- views/bootstrap/class.ViewFolder.php | 6 +++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 371d4a3b2..c4d5b33d8 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -235,15 +235,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo '
      '."\n"; ?> Please help to improve SeedDMS! All donations are spend on developing SeedDMS. Donate at least 20 USD and get a pdf copy of the user's manual including updates for 1 year. - + - - + + - - +
      "; echo "
      "; } + echo '
      • +
        + + + + + + + + +
        +
      '; echo "
        \n"; // echo "
      • params['rootfolderid']."\">".getMLText("content")."
        • \n"; diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 5d6087498..4ae64fe77 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -282,11 +282,11 @@ $('#loadmore').click(function(e) { - + + - - +
      From 367d1b52a737e52ce2b5110f869caf5c2cc7f945 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Dec 2018 09:13:52 +0100 Subject: [PATCH 039/467] do not allow download of extensions --- op/op.ExtensionMgr.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php index 55dcd0177..181bcb7ce 100644 --- a/op/op.ExtensionMgr.php +++ b/op/op.ExtensionMgr.php @@ -45,6 +45,8 @@ else $currenttab=NULL; // add new attribute definition --------------------------------------------- if ($action == "download") { + UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); + if (!isset($_POST["extname"])) { UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); } From da75a7f4b90a57c1d04ebecec875a099c5b21c18 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 9 Jan 2019 16:49:53 +0100 Subject: [PATCH 040/467] add .htaccess file to distribution --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3d8dc4be3..4b8cf9a42 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(); echo $$v->version();') -SRC=CHANGELOG inc conf utils index.php .htaccess languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer +SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer .htaccess # webapp NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean views/pca From 5734d9808e36e3ecc6ce826e7d2a80744ba2cb6b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 2 May 2019 18:17:49 +0200 Subject: [PATCH 041/467] do not echo error if no folder is set --- out/out.Clipboard.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/out/out.Clipboard.php b/out/out.Clipboard.php index d81476bd0..3d05a787b 100644 --- a/out/out.Clipboard.php +++ b/out/out.Clipboard.php @@ -37,9 +37,6 @@ $folder = null; if (isset($_GET["folderid"]) && is_numeric($_GET["folderid"])) { $folderid = intval($_GET["folderid"]); $folder = $dms->getFolder($folderid); - if (!is_object($folder)) { - UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))), getMLText("invalid_folder_id")); - } } From f8ac8aa74fb17de0c404ba19b7ca2e111d2948a7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 7 May 2019 08:05:19 +0200 Subject: [PATCH 042/467] take out patches accidentially taken over from demo --- Makefile | 2 +- op/op.ExtensionMgr.php | 2 -- styles/bootstrap/application.css | 15 ------------- views/bootstrap/class.Bootstrap.php | 33 ++-------------------------- views/bootstrap/class.ViewFolder.php | 29 ------------------------ 5 files changed, 3 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 4b8cf9a42..3d8dc4be3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(); echo $$v->version();') -SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer .htaccess +SRC=CHANGELOG inc conf utils index.php .htaccess languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer # webapp NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean views/pca diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php index 181bcb7ce..55dcd0177 100644 --- a/op/op.ExtensionMgr.php +++ b/op/op.ExtensionMgr.php @@ -45,8 +45,6 @@ else $currenttab=NULL; // add new attribute definition --------------------------------------------- if ($action == "download") { - UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); - if (!isset($_POST["extname"])) { UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); } diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index 6a94e401e..eb117fcd6 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -228,21 +228,6 @@ ul.qq-upload-list li span { display: none; } -#splashScreen img{ - margin:0 auto; - } - -#splashScreen{ - position:absolute; - top:0px; - left:0; - height:100%; - width:100%; - background: url(../img/kachel.png); - background-repeat:no-repeat; - text-align:center; -} - @media (min-width: 1200px) { .modal-wide { width: 800px; diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index c4d5b33d8..6949641aa 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -219,8 +219,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; function footNote() { /* {{{ */ echo "
      \n"; - echo '
      '."\n"; - echo '
      '."\n"; + echo '
      '."\n"; + echo '
      '."\n"; echo '
      '."\n"; if ($this->params['printdisclaimer']){ echo "
      ".getMLText("disclaimer")."
      "; @@ -229,23 +229,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if (isset($this->params['footnote']) && strlen((string)$this->params['footnote'])>0) { echo "
      ".(string)$this->params['footnote']."
      "; } - echo "
      \n"; - echo "
      \n"; - echo '
      '."\n"; - echo '
      '."\n"; -?> -Please help to improve SeedDMS! All donations are spend on developing SeedDMS. Donate at least 20 USD and get a pdf copy of the user's manual including updates for 1 year. -
      - - - - - - - - -
      -\n"; echo "
      \n"; echo "
      \n"; @@ -370,18 +353,6 @@ Please help to improve SeedDMS! All donations are spend on developing SeedDMS. D echo "
      "; echo "
      "; } - echo '
      • -
        - - - - - - - - -
        -
      '; echo "
        \n"; // echo "
      • params['rootfolderid']."\">".getMLText("content")."
        • \n"; diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 4ae64fe77..88b80a07c 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -246,8 +246,6 @@ $('#loadmore').click(function(e) { $this->htmlAddHeader(''."\n", 'js'); - $this->htmlAddHeader(''."\n", 'js'); - $this->htmlAddHeader(''."\n", 'js'); echo $this->callHook('startPage'); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); @@ -265,33 +263,6 @@ $('#loadmore').click(function(e) { echo $this->callHook('preContent'); -?> - -\n"; // dynamic columns - left column removed if no content and right column then fills span12. From e0c5013e29172ebda4610535cf003926b84e2625 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 7 May 2019 08:33:02 +0200 Subject: [PATCH 043/467] set minimum requirement to php 7.0 --- doc/README.Install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/README.Install.md b/doc/README.Install.md index b203fa9e5..cc480541f 100644 --- a/doc/README.Install.md +++ b/doc/README.Install.md @@ -8,13 +8,13 @@ SeedDMS is a web-based application written in PHP. It uses MySQL, sqlite3 or postgresql to manage the documents that were uploaded into the application. Be aware that postgresql is not very well tested. -Make sure you have PHP 5.4 and MySQL 5 or higher installed. SeedDMS +Make sure you have PHP 7.x and MySQL 5 or higher installed. SeedDMS will work with PHP running in CGI-mode as well as running as a module under apache. Here is a detailed list of requirements: -1. A web server with at least php 5.4 +1. A web server with at least php 7.0 2. A mysql database, unless you use sqlite 3. The php installation must have support for `pdo_mysql` or `pdo_sqlite`, `php_gd2`, `php_mbstring` From a511904a8156670e8a528a952c55879cf930bf90 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 May 2019 08:13:30 +0200 Subject: [PATCH 044/467] call new hook 'footNote', footNote() returns the html instead of echoing it --- views/bootstrap/class.Bootstrap.php | 31 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 6949641aa..75572532e 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -141,7 +141,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);; function htmlEndPage($nofooter=false) { /* {{{ */ if(!$nofooter) { - $this->footNote(); + $hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap'); + $html = $this->footNote(); + foreach($hookObjs as $hookObj) { + if (method_exists($hookObj, 'footNote')) { + $html = $hookObj->footNote($this, $html); + } + } + echo $html; if($this->params['showmissingtranslations']) { $this->missingLanguageKeys(); } @@ -218,23 +225,23 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } /* }}} */ function footNote() { /* {{{ */ - echo "
        \n"; - echo '
        '."\n"; - echo '
        '."\n"; - echo '
        '."\n"; + $html = "
        \n"; + $html .= '
        '."\n"; + $html .= '
        '."\n"; + $html .= '
        '."\n"; if ($this->params['printdisclaimer']){ - echo "
        ".getMLText("disclaimer")."
        "; + $html .= "
        ".getMLText("disclaimer")."
        "; } if (isset($this->params['footnote']) && strlen((string)$this->params['footnote'])>0) { - echo "
        ".(string)$this->params['footnote']."
        "; + $html .= "
        ".(string)$this->params['footnote']."
        "; } - echo "
        \n"; - echo "
        \n"; - echo "
        \n"; - echo "
        \n"; + $html .= "
        \n"; + $html .= "
        \n"; + $html .= "
        \n"; + $html .= "
        \n"; - return; + return $html; } /* }}} */ function contentStart() { /* {{{ */ From d239fbb331a2f364e9682b3201ca013f75574ff2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 May 2019 08:14:40 +0200 Subject: [PATCH 045/467] add entry for 5.1.11 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index e45afe7e2..630a18d72 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ - fix setting language during login (Closes #437) - fix indexing documents even if no preIndexDocument hook is set (Closes #437) - fix moving documents on the clipboard into the current folder +- new hook 'footNote' in class Bootstrap -------------------------------------------------------------------------------- Changes in version 5.1.10 From b6893da7067a8105211eb2f3a8a225a040b7b7bd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 7 Jun 2019 21:38:20 +0200 Subject: [PATCH 046/467] another note on setting document root propperly --- doc/README.Install.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/README.Install.md b/doc/README.Install.md index cc480541f..5aec87904 100644 --- a/doc/README.Install.md +++ b/doc/README.Install.md @@ -40,7 +40,7 @@ The fastes way to get SeedDMS running is by unpacking the archive It will create a new directory `seeddms51x` containing everything you need to run SeedDMS with sqlite3. Make sure that the subdіrectory `seeddms51x/data` -and the configuration file `seeddms51/www/conf/settings.xml` is writeable +and the configuration file `seeddms51/conf/settings.xml` is writeable by your web server. All other directories must just be readable by your web server. In the next step you need to adjust the configuration file in `seeddms51/www/conf/settings.xml`. If you @@ -50,7 +50,11 @@ with your document root. Alternatively, you can open the installer with a browser at http://your-domain/seeddms51x/install/ It will first ask to unlock the installer by creating a file `ENABLE_INSTALL_TOOL` in the diretory `seeddms51/www/conf/`. Change all -paths by replacing `/home/wwww-data` with your document root. Once done, +paths by replacing `/home/wwww-data` with your document root. Do not change +the httpRoot. Leave it at '/' and set your DocumentRoot in your web server +to the `www` directory in `seeddms51x`. Do not set the DocumentRoot to +the `seeddms51x` directory, because this will allow anybody to access +your `data` and `conf` directory. This is a major security risk. Once done, save it, remove the file `ENABLE_INSTALL_TOOL` and point your browser to http://your-domain/seeddms51x/. From b0e3c816ffab0a26ef7b0123bc6173719772c7e5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2019 08:50:13 +0200 Subject: [PATCH 047/467] fix typo in comment --- op/op.EditUserData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.EditUserData.php b/op/op.EditUserData.php index e4f37e4c5..749bbda20 100644 --- a/op/op.EditUserData.php +++ b/op/op.EditUserData.php @@ -41,7 +41,7 @@ $fullname = $_POST["fullname"]; $email = $_POST["email"]; $comment = $_POST["comment"]; $language = $_POST["language"]; -/* 'theme' won't be set, if themeselector is turn off */ +/* 'theme' won't be set, if themeselector is turned off */ if(isset($_POST["theme"])) $mytheme = $_POST["theme"]; $current_pwd = $_POST["currentpwd"]; From aed0c3cdf356ac0f22bb57402c87593d48f28a7d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2019 09:03:00 +0200 Subject: [PATCH 048/467] prevent xss attack in Select2 select menu --- styles/bootstrap/application.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 70a86eaa2..0f1508b0f 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -1,10 +1,15 @@ -/* Template function which outputs an option in a chzn-select */ +/* Template function which outputs an option in a chzn-select + * The replace() call is required to prevent xss attacks (see CVE-2019-12745) + * Using htmlspecialchars() in php isn't sufficient because, chzn_template_func + * will receive an unescaped string + * (see https://forums.select2.org/t/propperly-escape-option-value-to-prevent-xss/788) + */ chzn_template_func = function (state) { var subtitle = $(state.element).data('subtitle'); var warning = $(state.element).data('warning'); - var html = ''+state.text+''; + var html = ''+state.text.replace(/'; + html += '
        '+subtitle.replace(/'; if(warning) html += '
        '+warning+''; html += '        '; @@ -38,7 +43,8 @@ $(document).ready( function() { $(".chzn-select").select2({ width: '100%', - templateResult: chzn_template_func + templateResult: chzn_template_func, + templateSelection: chzn_template_func }); /* change the color and length of the bar graph showing the password From 0fe038e512916b6933f44c693877c32c7cea36db Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2019 09:03:30 +0200 Subject: [PATCH 049/467] escape group name in list of groups --- views/bootstrap/class.UsrMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index f5aa18b01..64a3a5d62 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -320,7 +320,7 @@ $(document).ready( function() { ); $options = array(); foreach($groups as $group) { - $options[] = array($group->getID(), $group->getName(), ($currUser && $group->isMember($currUser))); + $options[] = array($group->getID(), htmlspecialchars($group->getName()), ($currUser && $group->isMember($currUser))); } $this->formField( getMLText("groups"), From 03263c0dc9553fc40bd2f34dcb545a08e8f15a6f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2019 09:03:55 +0200 Subject: [PATCH 050/467] much better installation instructions added security considerations --- doc/README.Install.md | 66 ++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/doc/README.Install.md b/doc/README.Install.md index 5aec87904..bca601437 100644 --- a/doc/README.Install.md +++ b/doc/README.Install.md @@ -36,28 +36,54 @@ QUICKSTART =========== The fastes way to get SeedDMS running is by unpacking the archive -`seeddms-quickstart-x.y.z.tar.gz` into your webservers document root. +`seeddms-quickstart-x.y.z.tar.gz` on your webserver. +Let's assume you use seeddms-quickstart-5.1.10.tar.gz. It will create a new directory `seeddms51x` containing everything you -need to run SeedDMS with sqlite3. Make sure that the subdіrectory -`seeddms51x/data` -and the configuration file `seeddms51/conf/settings.xml` is writeable -by your web server. All other directories must just be readable by your -web server. In the next step you need to adjust -the configuration file in `seeddms51/www/conf/settings.xml`. If you -are not afraid of xml files, then open it in your favorite text editor -and search for `/home/wwww-data`. Replace that part in any path found -with your document root. Alternatively, you can open the installer -with a browser at http://your-domain/seeddms51x/install/ -It will first ask to unlock the installer by creating a file -`ENABLE_INSTALL_TOOL` in the diretory `seeddms51/www/conf/`. Change all -paths by replacing `/home/wwww-data` with your document root. Do not change -the httpRoot. Leave it at '/' and set your DocumentRoot in your web server -to the `www` directory in `seeddms51x`. Do not set the DocumentRoot to -the `seeddms51x` directory, because this will allow anybody to access -your `data` and `conf` directory. This is a major security risk. Once done, -save it, remove the file `ENABLE_INSTALL_TOOL` and point your browser to -http://your-domain/seeddms51x/. +need to run SeedDMS with sqlite3. +Either let the document root of your web server point to the directory `www` +below `seeddms51x` or add an alias. For apache this could be like +Alias /seeddms51x //seeddms51x/www + +Do not set the DocumentRoot to +the `seeddms51x` directory, because this will allow anybody to access +your `data` and `conf` directory. This is a major security risk. + +Make sure that the subdіrectory `seeddms51x/data` and the configuration file +`seeddms51/conf/settings.xml` is writeable by your web server. All other +directories must just be readable by your web server. + +In the next step you need to adjust the configuration file in +`seeddms51x/conf/settings.xml`. Open the file in your favorite text editor +and search for `/home/wwww-data`. Replace that part in any path found with your +base directory where you placed seeddms51x (e.g. /var/www/html/seeddms51x). +Alternatively, you can open the installer with a browser at +http://your-domain/install (if the document root points to +`seeddms51x/www`) or http://your-domain/seeddms51x/install/ (if you have +set an alias like described above). + +It will first ask to unlock the installer by creating a file +`ENABLE_INSTALL_TOOL` in the diretory `seeddms51x/conf/`. Change all paths by +replacing `/home/wwww-data` with your base directory where you put seeddms51x. +Set httpRoot to '/' (if the document root points to`seeddms51x/www`) or +'/seeddms51x' (if you have set an alias like described above). + +Once your configuration is done, +save it, remove the file `ENABLE_INSTALL_TOOL` and point your browser to +http://your-domain/ or http://your-domain/seeddms51x. + +SECURITY CONSIDERATIONS +======================= + +A crucial point when setting up SeedDMS is the propper placement of the +data directory. Do not place it below your document root as +configured in your web server! If you do so, there is good change that +attackers can easily access your documents with a regular browser. +If you can't place the data directory outside of document root, that either +restrict access to it with an appropriate .htaccess file or/and change +the `contentOffsetDir` in `settings.xml` to something random, but ensure it +is still a valid directory name. If you change contentOffsetDir then +do not forget to move `data/1048576` to `data/`. UPDATING FROM A PREVIOUS VERSION OR SEEDDMS ============================================= From 0b6d1b4597d781bc71045e7fc4bc4f9c4a71926d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2019 09:12:55 +0200 Subject: [PATCH 051/467] add example of .htaccess file for data directory --- doc/README.Install.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/README.Install.md b/doc/README.Install.md index bca601437..f7e987dc0 100644 --- a/doc/README.Install.md +++ b/doc/README.Install.md @@ -85,6 +85,26 @@ the `contentOffsetDir` in `settings.xml` to something random, but ensure it is still a valid directory name. If you change contentOffsetDir then do not forget to move `data/1048576` to `data/`. +Example for .htaccess file in data directory +---------------------------------------------- +``` +# line below if for Apache 2.4 + +Require all denied + + +# line below if for Apache 2.2 + +deny from all +Satisfy All + + +# section for Apache 2.2 and 2.4 + +IndexIgnore * + +``` + UPDATING FROM A PREVIOUS VERSION OR SEEDDMS ============================================= From f32ac518eaeb6ef7fc8349ad835d8a1348552e84 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2019 09:13:38 +0200 Subject: [PATCH 052/467] add note for CVE-2019-12744 and CVE-2019-12745 --- CHANGELOG | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 630a18d72..5268e5fbf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ -------------------------------------------------------------------------------- Changes in version 5.1.11 -------------------------------------------------------------------------------- +- fix for CVE-2019-12744, add .htaccess file to data directory, better + documentation for installing seeddms +- fix for CVE-2019-12745, propperly escape strings used in Select2 js library - do not show attributes in search results in extra column anymore - fix setting language during login (Closes #437) - fix indexing documents even if no preIndexDocument hook is set (Closes #437) @@ -55,7 +58,7 @@ - catch error when updating a document fails (Closes #410) - use always 'Send from' address as Return-Path when set, only if not set the logged in user's email will be used (Closes #418) -- show the debug output when sendind a test mail +- show the debug output when sending a test mail - add hooks add hooks folderListPreContent and folderListPostContent in class.ViewFolder.php - do not redirect to ForcePassword page if out.Logout.php was opened. This From 556ec6de14b9cb5724833d9f6318759c00d45f84 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2019 09:29:24 +0200 Subject: [PATCH 053/467] callbacks for select2 can now handle numeric values for data attributes --- styles/bootstrap/application.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 0f1508b0f..7dfb584b5 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -5,8 +5,12 @@ * (see https://forums.select2.org/t/propperly-escape-option-value-to-prevent-xss/788) */ chzn_template_func = function (state) { - var subtitle = $(state.element).data('subtitle'); - var warning = $(state.element).data('warning'); + var subtitle = ''; + if($(state.element).data('subtitle')) + subtitle = $(state.element).data('subtitle')+''; /* make sure it is a string */ + var warning = ''; + if($(state.element).data('warning')) + warning = $(state.element).data('warning')+''; /* make sure it is a string */ var html = ''+state.text.replace(/'; From cf3d276913eacae7f867618b4f8eb9830394702f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 14 Jun 2019 08:53:04 +0200 Subject: [PATCH 054/467] add CVE --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 5268e5fbf..e898e21ac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,8 @@ -------------------------------------------------------------------------------- - fix for CVE-2019-12744, add .htaccess file to data directory, better documentation for installing seeddms -- fix for CVE-2019-12745, propperly escape strings used in Select2 js library +- fix for CVE-2019-12745 and CVE-2019-12801, propperly escape strings used + in Select2 js library used by UsrMgr and GroupMgr - do not show attributes in search results in extra column anymore - fix setting language during login (Closes #437) - fix indexing documents even if no preIndexDocument hook is set (Closes #437) From 94ec9f5962b2bafac0221729dac4fdc21ee2db2c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 20 Jun 2019 08:26:37 +0200 Subject: [PATCH 055/467] more detailed description of fixed CVE in 5.1.11 --- CHANGELOG | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e898e21ac..fe47781e0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,12 @@ -------------------------------------------------------------------------------- Changes in version 5.1.11 -------------------------------------------------------------------------------- -- fix for CVE-2019-12744, add .htaccess file to data directory, better - documentation for installing seeddms -- fix for CVE-2019-12745 and CVE-2019-12801, propperly escape strings used - in Select2 js library used by UsrMgr and GroupMgr +- fix for CVE-2019-12744 (Remote Command Execution through unvalidated + file upload), add .htaccess file to data directory, better documentation + for installing seeddms +- fix for CVE-2019-12745 (Persistent or Stored XSS in UsrMgr) and + CVE-2019-12801 (Persistent or Stored XSS in GroupMgr), propperly escape + strings used in Select2 js library used by UsrMgr and GroupMgr - do not show attributes in search results in extra column anymore - fix setting language during login (Closes #437) - fix indexing documents even if no preIndexDocument hook is set (Closes #437) From 7485dbba15a3eff8c66aa7e8c593e26cd94c7b15 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 11:46:25 +0200 Subject: [PATCH 056/467] use only first char of $orderby --- SeedDMS_Core/Core/inc.ClassFolder.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 76325f48a..5a9400197 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -539,9 +539,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (!isset($this->_subFolders)) { $queryStr = "SELECT * FROM `tblFolders` WHERE `parent` = " . $this->_id; - if ($orderby=="n") $queryStr .= " ORDER BY `name`"; - elseif ($orderby=="s") $queryStr .= " ORDER BY `sequence`"; - elseif ($orderby=="d") $queryStr .= " ORDER BY `date`"; + if ($orderby[0]=="n") $queryStr .= " ORDER BY `name`"; + elseif ($orderby[0]=="s") $queryStr .= " ORDER BY `sequence`"; + elseif ($orderby[0]=="d") $queryStr .= " ORDER BY `date`"; if($dir == 'desc') $queryStr .= " DESC"; if(is_int($limit) && $limit > 0) { @@ -743,9 +743,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (!isset($this->_documents)) { $queryStr = "SELECT * FROM `tblDocuments` WHERE `folder` = " . $this->_id; - if ($orderby=="n") $queryStr .= " ORDER BY `name`"; - elseif($orderby=="s") $queryStr .= " ORDER BY `sequence`"; - elseif($orderby=="d") $queryStr .= " ORDER BY `date`"; + if ($orderby[0]=="n") $queryStr .= " ORDER BY `name`"; + elseif($orderby[0]=="s") $queryStr .= " ORDER BY `sequence`"; + elseif($orderby[0]=="d") $queryStr .= " ORDER BY `date`"; if($dir == 'desc') $queryStr .= " DESC"; if(is_int($limit) && $limit > 0) { From 0a4d7359b29416628cd0b7530b9e7f77d7ae15ba Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 11:46:46 +0200 Subject: [PATCH 057/467] new version 5.1.12 --- SeedDMS_Core/package.xml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 173016bf2..e742bf36c 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2019-05-03 + 2019-06-24 - 5.1.11 - 5.1.11 + 5.1.12 + 5.1.12 stable @@ -24,7 +24,8 @@ GPL License -??? +parameter $orderby passed to SeedDMS_Core_Folder::getDocuments() and SeedDMS_Core_Folder::getSubFolders() can be a string, but only the first char is +evaluated @@ -1651,5 +1652,21 @@ fix php warning if workflow state doesn' have next transition add method SeedDMS_Core_DatabaseAccess::setLogFp() + + 2019-05-03 + + + 5.1.11 + 5.1.11 + + + stable + stable + + GPL License + +??? + + From 6d751b54372f012c8917c96d260f998744ccc2e4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 11:51:21 +0200 Subject: [PATCH 058/467] allow orderby to be a string not just a char --- out/out.ViewFolder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index eec5fdcba..90d07ce45 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -45,7 +45,7 @@ if (!is_object($folder)) { UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))), getMLText("invalid_folder_id")); } -if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) { +if (isset($_GET["orderby"]) && strlen($_GET["orderby"])>0 ) { $orderby=$_GET["orderby"]; } else $orderby=$settings->_sortFoldersDefault; From 66d2dcce8e139140143acc03fd9315128e39cf02 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 11:52:01 +0200 Subject: [PATCH 059/467] add style for i.selected, used in table headers --- styles/bootstrap/application.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index eb117fcd6..6a02e1153 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -161,6 +161,7 @@ i.released {color: #00b000;} i.rejected {color: #b00000;} i.in-workflow {color: #11479e;} i.workflow-action {color: #91479e;} +i.selected {border: 1px solid #d4d4d4;padding:3px;border-radius:3px;background-color:#fafafa;background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);} span.openpopupbox { cursor: pointer; From 414f00c5c9541d4ceef473e915cd8a451e974c39 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 11:53:01 +0200 Subject: [PATCH 060/467] add fix for CVE-2019-12932, escape strings output by incr. search --- styles/bootstrap/application.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 7dfb584b5..086d46a6b 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -90,11 +90,11 @@ $(document).ready( function() { }, highlighter : function (item) { if(item.charAt(0) == 'D') - return ' ' + item.substring(1); + return ' ' + item.substring(1).replace(/ ' + item.substring(1); + return ' ' + item.substring(1).replace(/ ' + item.substring(1); + return ' ' + item.substring(1).replace(/ ' + strarr[1]; + return ' ' + strarr[1].replace(/ ' + strarr[1]; + return ' ' + strarr[1].replace(/ Date: Mon, 24 Jun 2019 11:54:08 +0200 Subject: [PATCH 061/467] add icons for sort field and sort order in list of folders/docs --- views/bootstrap/class.Bootstrap.php | 10 ++++++---- views/bootstrap/class.ViewFolder.php | 27 +++++++++++++++++---------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 75572532e..8090d872c 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1584,10 +1584,11 @@ $(document).ready(function() { */ function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */ function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { + $orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc'); if($path || $expandtree>=$level) { if($path) $pathfolder = array_shift($path); - $subfolders = $folder->getSubFolders($orderby); + $subfolders = $folder->getSubFolders($orderby[0], $orderdir); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { @@ -1595,7 +1596,7 @@ $(document).ready(function() { if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { - $documents = $subfolder->getDocuments($orderby); + $documents = $subfolder->getDocuments($orderby[0], $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode); foreach($documents as $document) { $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); @@ -1607,7 +1608,7 @@ $(document).ready(function() { } return $children; } else { - $subfolders = $folder->getSubFolders($orderby); + $subfolders = $folder->getSubFolders($orderby[0], $orderdir); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { @@ -1619,6 +1620,7 @@ $(document).ready(function() { return array(); } + $orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc'); if($folderid) { $folder = $this->params['dms']->getFolder($folderid); $path = $folder->getPath(); @@ -1631,7 +1633,7 @@ $(document).ready(function() { } else { $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0); if($showdocs) { - $documents = $folder->getDocuments($orderby); + $documents = $folder->getDocuments($orderby[0], $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode); foreach($documents as $document) { $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 88b80a07c..8962abeeb 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -87,6 +87,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $folder = $this->params['folder']; $orderby = $this->params['orderby']; + $orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc'); $expandFolderTree = $this->params['expandFolderTree']; $enableDropUpload = $this->params['enableDropUpload']; $maxItemsPerPage = $this->params['maxItemsPerPage']; @@ -155,6 +156,7 @@ $('#loadmore').click(function(e) { $user = $this->params['user']; $folder = $this->params['folder']; $orderby = $this->params['orderby']; + $orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc'); $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewConverters']; @@ -168,13 +170,13 @@ $('#loadmore').click(function(e) { $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); $previewer->setConverters($previewconverters); - $subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby); + $subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby[0]); if($subFolders === null) - $subFolders = $folder->getSubFolders($orderby); + $subFolders = $folder->getSubFolders($orderby[0], $orderdir); $subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ); - $documents = $this->callHook('folderGetDocuments', $folder, $orderby); + $documents = $this->callHook('folderGetDocuments', $folder, $orderby[0]); if($documents === null) - $documents = $folder->getDocuments($orderby); + $documents = $folder->getDocuments($orderby[0], $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); $content = ''; @@ -226,6 +228,7 @@ $('#loadmore').click(function(e) { $user = $this->params['user']; $folder = $this->params['folder']; $orderby = $this->params['orderby']; + $orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc'); $enableFolderTree = $this->params['enableFolderTree']; $enableClipboard = $this->params['enableclipboard']; $enableDropUpload = $this->params['enableDropUpload']; @@ -399,13 +402,13 @@ $('#loadmore').click(function(e) { else $this->contentHeading(getMLText("folder_contents")); - $subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby); + $subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby[0], $orderdir); if($subFolders === null) - $subFolders = $folder->getSubFolders($orderby); + $subFolders = $folder->getSubFolders($orderby[0], $orderdir); $subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ); - $documents = $this->callHook('folderGetDocuments', $folder, $orderby); + $documents = $this->callHook('folderGetDocuments', $folder, $orderby[0], $orderdir); if($documents === null) - $documents = $folder->getDocuments($orderby); + $documents = $folder->getDocuments($orderby[0], $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); $txt = $this->callHook('folderListPreContent', $folder, $subFolders, $documents); @@ -413,14 +416,18 @@ $('#loadmore').click(function(e) { echo $txt; $i = 0; if ((count($subFolders) > 0)||(count($documents) > 0)){ - $txt = $this->callHook('folderListHeader', $folder, $orderby); + $txt = $this->callHook('folderListHeader', $folder, $orderby, $orderdir); if(is_string($txt)) echo $txt; else { print ""; print "\n\n"; print "\n"; - print "\n"; + print "\n"; // print "\n"; print "\n"; // print "\n"; From c9ff52537221c581d8aaf9a8d30691980926d2a4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 11:54:45 +0200 Subject: [PATCH 062/467] start changelog for 5.1.12 --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index fe47781e0..ee4228191 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.12 +-------------------------------------------------------------------------------- +- fix for CVE-2019-12932 (Persistent or Stored XSS), excaping the search + result in the autocompletion search form placed in the header +- folder/document list can be sorted ascending or descending + -------------------------------------------------------------------------------- Changes in version 5.1.11 -------------------------------------------------------------------------------- From eccbc5ebd604fc9577c1058a1a3dc4447eab1612 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 11:55:24 +0200 Subject: [PATCH 063/467] start new version 5.1.12 --- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- inc/inc.Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index d83a2fc33..83bedf665 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -376,7 +376,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '5.1.11'; + $this->version = '5.1.12'; } /* }}} */ /** diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 78c5944ba..9e1caf3d3 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.1.11"; + public $_number = "5.1.12"; private $_string = "SeedDMS"; function __construct() { From ee57a4b25bd428baa913384aab9ecad2e9fd50a8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 12:36:55 +0200 Subject: [PATCH 064/467] require at least 5.6.38, do not check for Log.php anymore --- inc/inc.ClassSettings.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index f2ad438db..bb86e9bd5 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -1413,7 +1413,7 @@ class Settings { /* {{{ */ } // Check PHP version - if (version_compare(PHP_VERSION, '5.2.0') < 0) { + if (version_compare(PHP_VERSION, '5.6.38') < 0) { $result["php_version"] = array( "status" => "versiontolow", "type" => "error", @@ -1452,6 +1452,8 @@ class Settings { /* {{{ */ } // Check for Log.php + // Do not check for Log anymore, because it is in the vendor directory + /* if (!Settings::findInIncPath('Log.php')) { $result["pear_log"] = array( "status" => "notfound", @@ -1459,6 +1461,7 @@ class Settings { /* {{{ */ "suggestion" => "install_pear_package_log" ); } + */ // Check for HTTP/WebDAV/Server.php if (!Settings::findInIncPath('HTTP/WebDAV/Server.php')) { From 8af9d0fc285c0705ea586f3a11a70740a178c249 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 12:37:25 +0200 Subject: [PATCH 065/467] getNotificationList() returns an empty array if there are no notifications --- views/bootstrap/class.ManageNotify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php index da096a740..a93f0a7ea 100644 --- a/views/bootstrap/class.ManageNotify.php +++ b/views/bootstrap/class.ManageNotify.php @@ -43,7 +43,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { $notifications = array(); if ($as_group){ if(!($groups = $this->user->getGroups())) - return NULL; + return array(); foreach ($groups as $group) { $tmp = $group->getNotifications($folders ? T_FOLDER : T_DOCUMENT); From 92116cfbc8f2ab0bd24ad8359bcb4bf2b8ed1759 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 12:38:16 +0200 Subject: [PATCH 066/467] add changes in installation process --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ee4228191..e3a3fa88e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,8 @@ - fix for CVE-2019-12932 (Persistent or Stored XSS), excaping the search result in the autocompletion search form placed in the header - folder/document list can be sorted ascending or descending +- do not check for Log.php during installation anymore, it's part of the + vendor directory anyway -------------------------------------------------------------------------------- Changes in version 5.1.11 From d16bca778928e271ab37926a407395f2e2a41cc8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Jun 2019 13:12:22 +0200 Subject: [PATCH 067/467] lots of updates for portugese, some new keys --- languages/ar_EG/lang.inc | 3 + languages/bg_BG/lang.inc | 3 + languages/ca_ES/lang.inc | 3 + languages/cs_CZ/lang.inc | 3 + languages/de_DE/lang.inc | 5 +- languages/el_GR/lang.inc | 7 +- languages/en_GB/lang.inc | 5 +- languages/es_ES/lang.inc | 9 +- languages/fr_FR/lang.inc | 15 +- languages/hr_HR/lang.inc | 3 + languages/hu_HU/lang.inc | 7 +- languages/it_IT/lang.inc | 3 + languages/ko_KR/lang.inc | 3 + languages/lo_LA/lang.inc | 3 + languages/nl_NL/lang.inc | 3 + languages/pl_PL/lang.inc | 3 + languages/pt_BR/lang.inc | 1559 ++++++++++++++++++++------------------ languages/ro_RO/lang.inc | 3 + languages/ru_RU/lang.inc | 7 +- languages/sk_SK/lang.inc | 3 + languages/sv_SE/lang.inc | 3 + languages/tr_TR/lang.inc | 3 + languages/uk_UA/lang.inc | 11 +- languages/zh_CN/lang.inc | 7 +- languages/zh_TW/lang.inc | 3 + 25 files changed, 911 insertions(+), 766 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index bb1cc71d2..3bc07dbf9 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1498,6 +1498,9 @@ URL: [url]', 'sign_out' => 'تسجيل الخروج', 'sign_out_user' => 'تسجيل خروج مستخدم', 'sk_SK' => 'السلوفاكية', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'المساحة المستخدمة لمجلد البيانات', 'splash_added_to_clipboard' => 'ﺖﻣ ﺎﻠﻨﺴﺧ ﻒﻳ ﺎﻠﺣﺎﻔﻇﺓ', 'splash_add_access' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 9af2c5d59..5b85e6cd1 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -1361,6 +1361,9 @@ $text = array( 'sign_out' => 'изход', 'sign_out_user' => '', 'sk_SK' => 'Словашки', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Размер на каталога с данните', 'splash_added_to_clipboard' => 'Добавено към клипборда', 'splash_add_access' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 0790a6acd..309829143 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -1366,6 +1366,9 @@ URL: [url]', 'sign_out' => 'desconnectar', 'sign_out_user' => '', 'sk_SK' => 'Eslovac', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Espai utilitzat a la carpeta de dades', 'splash_added_to_clipboard' => 'Emmagatzemat al portapapers', 'splash_add_access' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 9d0fda2eb..91524456f 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1577,6 +1577,9 @@ Jméno: [username] 'sign_out' => 'Odhlásit', 'sign_out_user' => 'Odhlášení uživatele', 'sk_SK' => 'Slovenština', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Použité místo pro data složky', 'splash_added_to_clipboard' => 'Přidáno do schránky', 'splash_add_access' => 'Přidáno Přístupové právo', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index e2bb30b96..838f72826 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2654), dgrutsch (22) +// Translators: Admin (2657), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -1587,6 +1587,9 @@ Name: [username] 'sign_out' => 'Abmelden', 'sign_out_user' => 'Benutzer abmelden', 'sk_SK' => 'Slovakisch', +'sort_by_date' => 'Nach Datum sortieren', +'sort_by_name' => 'Nach Name sortieren', +'sort_by_sequence' => 'Nach Reihenfolge sortieren', 'space_used_on_data_folder' => 'Benutzter Plattenplatz', 'splash_added_to_clipboard' => 'Der Zwischenablage hinzugefügt', 'splash_add_access' => 'Zugriffsrecht hinzugefügt', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index b457a1a71..06ffbc37f 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (280) +// Translators: Admin (281) $text = array( '2_factor_auth' => '', @@ -1372,8 +1372,11 @@ URL: [url]', 'sign_out' => 'Αποσύνδεση', 'sign_out_user' => 'Αποσύνδεση χρήστη', 'sk_SK' => 'Σλοβάκικα', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => '', -'splash_added_to_clipboard' => '', +'splash_added_to_clipboard' => 'Προστέθηκε στο clipboard', 'splash_add_access' => '', 'splash_add_attribute' => '', 'splash_add_group' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 76dc7f871..97afa0ed0 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1773), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1776), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1582,6 +1582,9 @@ Name: [username] 'sign_out' => 'Sign out', 'sign_out_user' => 'Sign out user', 'sk_SK' => 'Slovak', +'sort_by_date' => 'Sort by date', +'sort_by_name' => 'Sort by name', +'sort_by_sequence' => 'Sort by sequence', 'space_used_on_data_folder' => 'Space used on data folder', 'splash_added_to_clipboard' => 'Added to clipboard', 'splash_add_access' => 'Access right added', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 8a1e1b8f5..1da58b4d7 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (1111), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (1114), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', @@ -1312,8 +1312,8 @@ URL: [url]', 'settings_enableVersionModification_desc' => 'Habilitar/Deshabilitar la modificación de versiones de documentos por parte de usuarios después de añadir una nueva versión. El administrador siempre podrá modificar la versión después de añadida.', 'settings_enableWebdavReplaceDoc' => 'Reemplaza documento al guardar', 'settings_enableWebdavReplaceDoc_desc' => 'Si se habilita, al guardar una nueva versión de un documento reemplaza al viejo documento en lugar de crear un nueva versión. Esto solo aplica si el usuario mimetype Yelp nombre del archivo son iguales a la última versión. Esto es útil cuando la aplicación guarda automáticamente un documento a intervalos fijos.', -'settings_enableXsendfile' => '', -'settings_enableXsendfile_desc' => '', +'settings_enableXsendfile' => 'Usar el módulo xsendfile de apache', +'settings_enableXsendfile_desc' => 'Si está opción esta activa y el módulo de apache xsendfile está instalado, se usará para la entrega de imagenes', 'settings_encryptionKey' => 'Clave de cifrado', 'settings_encryptionKey_desc' => 'Esta cadena se utiliza para crear un identificador único añadido como campo oculto a formularios para prevenir ataques CSRF.', 'settings_error' => 'Error', @@ -1513,6 +1513,9 @@ URL: [url]', 'sign_out' => 'Salir', 'sign_out_user' => 'Desconectar usuario', 'sk_SK' => 'Slovaco', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Espacio usado en la carpeta de datos', 'splash_added_to_clipboard' => 'Agregado al portapapeles', 'splash_add_access' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 85d33eb92..71393d95c 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (739) +// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (744) $text = array( '2_factor_auth' => 'Authentification forte', @@ -501,7 +501,7 @@ Le lien est valide jusqu’au [valid]. 'error_add_aro' => '', 'error_add_permission' => 'Erreur lors de l’ajout de permission', 'error_cleared_cache' => 'Erreur lors du vidage du cache', -'error_edit_task' => '', +'error_edit_task' => 'Erreur lors de la modification de la tâche', 'error_extension_getlist' => 'Erreur lors de l’obtention de la liste des extensions depuis le dépôt', 'error_importfs' => 'Erreur lors de l’import depuis le système de fichiers', 'error_no_document_selected' => 'Aucun document sélectionné', @@ -761,7 +761,7 @@ URL: [url]', 'logout' => 'Déconnexion', 'log_management' => 'Gestion des fichiers journaux', 'lo_LA' => 'Laotien', -'malformed_expiration_date' => '', +'malformed_expiration_date' => 'Format de date d’expiration invalide', 'manager' => 'Responsable', 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe', 'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs', @@ -982,7 +982,7 @@ URL : [url]', 'reception_noaction' => 'Aucune action', 'reception_rejected' => 'Réception rejetée', 'recipients' => 'Destinataires', -'recipient_already_removed' => '', +'recipient_already_removed' => 'Le destinataire a déjà été supprimé ou a accusé réception.', 'redraw' => 'Redessiner', 'refresh' => 'Actualiser', 'rejected' => 'Rejeté', @@ -1333,8 +1333,8 @@ Nom : [username] 'settings_enableOwnerRevApp_desc' => 'Activer cette option pour ajouter le propriétaire du document à la liste des examinateurs/approbateurs et pour les transitions de workflow.', 'settings_enablePasswordForgotten' => 'Activer Mot de passe oublié', 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.', -'settings_enableReceiptReject' => '', -'settings_enableReceiptReject_desc' => '', +'settings_enableReceiptReject' => 'Activer le rejet de réceptions', +'settings_enableReceiptReject_desc' => 'Activer cette option pour permettre de rejeter des réceptions.', 'settings_enableReceiptWorkflow' => 'Activer la réception de document', 'settings_enableReceiptWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.', 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers', @@ -1566,6 +1566,9 @@ Nom : [username] 'sign_out' => 'Déconnexion', 'sign_out_user' => 'Déconnecter l\'utilisateur', 'sk_SK' => 'Slovaque', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Espace utilisé dans le répertoire de données', 'splash_added_to_clipboard' => 'Ajouté au presse-papier', 'splash_add_access' => 'Droits d’accès ajoutés', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index b0ea9ac8a..4190c14e5 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1534,6 +1534,9 @@ Internet poveznica: [url]', 'sign_out' => 'Odjava', 'sign_out_user' => 'Odjavi korisnika', 'sk_SK' => 'Slovački', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Prostor iskorišten na podatkovnoj mapi', 'splash_added_to_clipboard' => 'Dodano u međuspremnik', 'splash_add_access' => '', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 3436115c7..5b69cc8cb 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (631), ribaz (1036) +// Translators: Admin (632), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -1512,6 +1512,9 @@ URL: [url]', 'sign_out' => 'Kijelentkezés', 'sign_out_user' => 'Kijelentkezés', 'sk_SK' => 'Szlovák', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Használt terület az adat mappában', 'splash_added_to_clipboard' => 'Vágólaphoz hozzáadva', 'splash_add_access' => '', @@ -1668,7 +1671,7 @@ URL: [url]', 'toggle_manager' => 'Kulcs kezelő', 'toggle_qrcode' => '', 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot', -'transfer_document' => '', +'transfer_document' => 'Tulajdonos váltás', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', 'transfer_objects' => 'Adatok átadása', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 946fa82cc..4501bfd90 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1546,6 +1546,9 @@ URL: [url]', 'sign_out' => 'Disconnettiti', 'sign_out_user' => 'Disconnetti l\'utente', 'sk_SK' => 'Slovacco', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Spazio utilizzato dai dati', 'splash_added_to_clipboard' => 'Aggiunto agli appunti', 'splash_add_access' => '', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 904644b82..e6ef93bd8 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1528,6 +1528,9 @@ URL : [url]', 'sign_out' => '로그 아웃', 'sign_out_user' => '사용자가 로그 아웃', 'sk_SK' => '슬로바키아어', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => '데이터 폴더에 사용되는 공간', 'splash_added_to_clipboard' => '클립 보드에 추가', 'splash_add_access' => '', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index bbd36797e..0f05286c1 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -1561,6 +1561,9 @@ URL: [url]', 'sign_out' => 'ອອກຈາກລະບົບ', 'sign_out_user' => 'ອອກຈາກລະບົບຜູ້ໄຊ້', 'sk_SK' => 'ສະໂລວາເກຍ', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'ຟື້ນທີທີ່ໄຊ້ໃນໂຟລເດີຂໍ້ມູນ', 'splash_added_to_clipboard' => 'ເພີ່ມລົງໃນຄິບບອດ', 'splash_add_access' => '', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 3c62a28fd..fc6328145 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1558,6 +1558,9 @@ Name: [username] 'sign_out' => 'Log uit', 'sign_out_user' => 'Log gebruiker uit', 'sk_SK' => 'Slowaaks', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Gebruikte diskomvang in data map', 'splash_added_to_clipboard' => 'Toegevoegd aan klembord', 'splash_add_access' => '', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 01263d9b8..3db61e362 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1492,6 +1492,9 @@ URL: [url]', 'sign_out' => 'Wyloguj', 'sign_out_user' => 'Wyloguj użytkownika', 'sk_SK' => 'słowacki', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Przestrzeń zajęta przez folder danych', 'splash_added_to_clipboard' => 'Dodano do schowka', 'splash_add_access' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 682745dc8..4161bfc18 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -19,15 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1006), flaviove (627), lfcristofoli (352) +// Translators: Admin (1718), flaviove (627), lfcristofoli (352) $text = array( -'2_factor_auth' => '', -'2_factor_auth_info' => '', -'2_fact_auth_secret' => '', +'2_factor_auth' => 'Autenticação de dois fatores', +'2_factor_auth_info' => 'Este sistema impõe a autenticação de 2 fatores. Você precisará do Google Authenticator no seu celular. Abaixo você vê dois códigos QR. O caminho certo é o seu atual segredo. À esquerda, você pode definir um novo segredo. Se você definir um novo segredo, verifique novamente com o Google Authenticator.', +'2_fact_auth_secret' => 'Segredo', 'accept' => 'Aceitar', -'access_control' => '', -'access_control_is_off' => '', +'access_control' => 'Controle de acesso', +'access_control_is_off' => 'O controle de acesso avançado está desativado.', 'access_denied' => 'Acesso Negado.', 'access_inheritance' => 'access Inheritance', 'access_mode' => 'Modo de acesso', @@ -44,36 +44,36 @@ URL: [url]', 'access_permission_changed_email_subject' => '[sitename]: [name] - Permissões modificadas', 'according_settings' => 'configurações de acordo', 'action' => 'Ação', -'actions' => 'Actions', +'actions' => 'Ações', 'action_approve' => 'Aprovar', 'action_complete' => 'Completo', 'action_is_complete' => 'Está completo', 'action_is_not_complete' => 'Não está completo', 'action_reject' => 'Rejeitar', -'action_review' => 'Revisar', +'action_review' => 'Avaliar', 'action_revise' => 'Revisão', -'add' => 'Add', -'add_approval' => '', -'add_attrdefgroup' => '', +'add' => 'Adicionar', +'add_approval' => 'Adicionar aprovação', +'add_attrdefgroup' => 'Adicionar novo grupo de atributos', 'add_document' => 'Novo documento', 'add_document_link' => 'Adicionar link', 'add_document_notify' => 'Definir Notificações', 'add_doc_reviewer_approver_warning' => 'N.B. Documents are automatically marked as released if no reviewer or approver is assigned.', 'add_doc_workflow_warning' => 'N.B. Os documentos são automaticamente marcados como liberados se nenhum fluxo de trabalho é atribuído.', -'add_event' => 'Add event', +'add_event' => 'Adicionar evento', 'add_group' => 'Novo grupo', 'add_member' => 'Novo membro', 'add_multiple_documents' => 'Adicionar vários documentos', -'add_multiple_files' => 'Add multiple files (will use filename as document name)', -'add_receipt' => '', -'add_review' => '', -'add_revision' => '', -'add_role' => '', +'add_multiple_files' => 'Adicione vários arquivos (usará o nome do arquivo como nome do documento)', +'add_receipt' => 'Confirmar recebimento', +'add_review' => 'Adicionar avaliação', +'add_revision' => 'Adicionar revisão', +'add_role' => 'Adicionar novo papel', 'add_subfolder' => 'Criar sub-pasta', -'add_task' => '', +'add_task' => 'Adicionar nova tarefa para esta classe', 'add_to_clipboard' => 'Adicionar ao clipboard', -'add_to_transmittal' => '', -'add_transmittal' => '', +'add_to_transmittal' => 'Adicionar à transmissão', +'add_transmittal' => 'Adicionar transmissão', 'add_user' => 'Novo usuário', 'add_user_to_group' => 'Adicionar usuário ao grupo', 'add_workflow' => 'Adicionar novo fluxo de trabalho', @@ -89,29 +89,34 @@ URL: [url]', 'already_subscribed' => 'Já subscrito', 'and' => 'e', 'apply' => 'Aplicar', -'approvals_accepted' => '', -'approvals_and_reviews_accepted' => '', -'approvals_and_reviews_not_touched' => '', -'approvals_and_reviews_rejected' => '', -'approvals_not_touched' => '', -'approvals_rejected' => '', -'approvals_without_group' => '', -'approvals_without_user' => '', +'approvals_accepted' => '[no_approvals] aprovações já aceitas', +'approvals_and_reviews_accepted' => '[no_approvals] aprovações e [no_reviews] comentários já aceitos', +'approvals_and_reviews_not_touched' => '[no_approvals] aprovações e [no_reviews] comentários não tocados', +'approvals_and_reviews_rejected' => '[no_approvals] aprovações e [no_reviews] avaliações já rejeitadas', +'approvals_not_touched' => '[no_approvals] aprovações não sendo tocadas', +'approvals_rejected' => '[no_approvals] aprovações já rejeitadas', +'approvals_without_group' => 'Aprovações sem grupo', +'approvals_without_user' => 'Aprovações sem usuário', 'approval_deletion_email' => 'Solicitação de Aprovação eliminada', -'approval_deletion_email_body' => '', -'approval_deletion_email_subject' => '', -'approval_file' => '', +'approval_deletion_email_body' => 'Pedido de aprovação eliminado +Document: [name] +Versão: [version] +Pasta pai: [folder_path] +Usuário: [username] +URL: [url]', +'approval_deletion_email_subject' => '[sitename]: [name] - Pedido de aprovação eliminado', +'approval_file' => 'Arquivo', 'approval_group' => 'Approval Group', 'approval_log' => 'Log de Aprovação', 'approval_request_email' => 'Solicitação de aprovação', 'approval_request_email_body' => 'Pedido de aprovação Documento: [name] Versão: [version] -Pasta pai: [folder_path] +Pasta mãe: [folder_path] Usuário: [username] URL: [url]', 'approval_request_email_subject' => '[sitename]: [name] - Solicitação de aprovação', -'approval_status' => 'Approval Status', +'approval_status' => 'Estado da aprovação', 'approval_submit_email' => '', 'approval_submit_email_body' => 'Aprovação do documento Documento: [name] @@ -122,35 +127,35 @@ Comentário: [comment] Usuário: [username] URL: [url]', 'approval_submit_email_subject' => '[sitename]: [name] - Aprovação submetida', -'approval_summary' => 'Approval Summary', -'approval_update_failed' => 'Error updating approval status. Update failed.', -'approvers' => 'Approvers', -'approver_already_assigned' => '', -'approver_already_removed' => '', -'april' => 'April', -'archive' => '', -'archive_creation' => 'Archive creation', -'archive_creation_warning' => 'With this operation you can create achive containing the files of entire DMS folders. After the creation the archive will be saved in the data folder of your server.
        WARNING: an archive created as human readable will be unusable as server backup.', +'approval_summary' => 'Resumo de aprovação', +'approval_update_failed' => 'Erro ao atualizar o estado de aprovação. Atualização falhou.', +'approvers' => 'Aprovadores', +'approver_already_assigned' => 'O usuário já está atribuído como um aprovador.', +'approver_already_removed' => 'O aprovador já foi removido do processo de aprovação ou já enviou uma aprovação.', +'april' => 'Abril', +'archive' => 'Arquivo', +'archive_creation' => 'Criação de arquivo', +'archive_creation_warning' => 'Com esta operação, você pode criar um arquivo contendo os arquivos de pastas inteiras do DMS. Após a criação, o arquivo será salvo na pasta de dados do seu servidor.
        AVISO: um arquivo criado como legível por humanos será inutilizável como backup do servidor.', 'ar_EG' => 'Árabe', -'assign_approvers' => 'Assign Approvers', -'assign_recipients' => '', -'assign_reviewers' => 'Assign Reviewers', -'assign_user_property_to' => 'Assign user\'s properties to', -'assumed_released' => 'Assumed released', -'attrdefgroup_management' => '', -'attrdefgrp_show_detail' => '', -'attrdefgrp_show_list' => '', -'attrdefgrp_show_search' => '', -'attrdefgrp_show_searchlist' => '', +'assign_approvers' => 'Atribuir Aprovadores', +'assign_recipients' => 'Atribuir Destinatários', +'assign_reviewers' => 'Atribuir Avaliadores', +'assign_user_property_to' => 'Atribuir propriedades do usuário para', +'assumed_released' => 'Assumido liberado', +'attrdefgroup_management' => 'Gerenciamento de grupos de atributos', +'attrdefgrp_show_detail' => 'Detalhes', +'attrdefgrp_show_list' => 'Lista', +'attrdefgrp_show_search' => 'Procurar', +'attrdefgrp_show_searchlist' => 'Resultado da pesquisa', 'attrdef_exists' => 'Definição de atributo já existe', -'attrdef_info' => '', +'attrdef_info' => 'Informação', 'attrdef_in_use' => 'Definição de atributo ainda em uso', 'attrdef_management' => 'Gerência de definição de atributo', 'attrdef_maxvalues' => 'Max. número de valores', 'attrdef_minvalues' => 'Min. número de valores', 'attrdef_min_greater_max' => 'Número mínimo de valores é maior do que o número máximo de valores', 'attrdef_multiple' => 'Permitir múltiplos valores', -'attrdef_multiple_needs_valueset' => '', +'attrdef_multiple_needs_valueset' => 'A definição de atributo com vários valores precisa de um conjunto de valores.', 'attrdef_must_be_multiple' => 'Atributo deve ter mais de um valor, mas não está definido valor múltiplo', 'attrdef_name' => 'Nome', 'attrdef_noname' => 'Está faltando o nome de definição de atributo', @@ -159,41 +164,41 @@ URL: [url]', 'attrdef_type' => 'Tipo', 'attrdef_type_boolean' => 'Binário', 'attrdef_type_date' => 'Data', -'attrdef_type_email' => '', -'attrdef_type_float' => '', +'attrdef_type_email' => 'E-mail', +'attrdef_type_float' => 'Flutuante', 'attrdef_type_int' => 'Inteiro', 'attrdef_type_string' => 'Texto', -'attrdef_type_url' => '', +'attrdef_type_url' => 'URL', 'attrdef_valueset' => 'Conjunto de valores', 'attributes' => 'Atributos', -'attribute_changed_email_body' => 'Atributo alterado -Documento: [name] -Versão: [version] -Atributo: [attribute_name] -Old value: [attribute_old_value] -New value: [attribute_new_value] -Pasta mãe: [folder_path] -Usuário: [username] +'attribute_changed_email_body' => 'Atributo alterado +Documento: [name] +Versão: [version] +Atributo: [attribute_name] +Valor anterior: [attribute_old_value] +Novo valor: [attribute_new_value] +Pasta mãe: [folder_path] +Usuário: [username] URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atributo modificado', 'attribute_count' => 'Número de utilizações', 'attribute_value' => 'Valor do atributo', -'attribute_value_not_in_valueset' => '', -'attr_malformed_boolean' => '', -'attr_malformed_date' => '', -'attr_malformed_email' => '', -'attr_malformed_float' => '', -'attr_malformed_int' => '', -'attr_malformed_url' => '', -'attr_max_values' => '', +'attribute_value_not_in_valueset' => 'Valor não definido na tabela de valores', +'attr_malformed_boolean' => 'O valor do atributo \'[value]\' do atributo \'[attrname]\' não é um booleano válido.', +'attr_malformed_date' => 'O valor do atributo \'[value]\' do atributo \'[attrname]\' não é uma data válida.', +'attr_malformed_email' => 'O valor do atributo \'[value]\' do atributo \'[attrname]\' não é um URL válido.', +'attr_malformed_float' => 'O valor do atributo \'[value]\' do atributo \'[attrname]\' não é um flutuante válido.', +'attr_malformed_int' => 'O valor do atributo \'[value]\' do atributo \'[attrname]\' não é um inteiro válido.', +'attr_malformed_url' => 'O valor do atributo \'[value]\' do atributo \'[attrname]\' não é um URL válido.', +'attr_max_values' => 'O número máximo de valores requeridos para o atributo [attrname] foi excedido.', 'attr_min_values' => 'O valor mínimo para o atributo [attrname] não foi alcançado.', -'attr_not_in_valueset' => '', +'attr_not_in_valueset' => 'O valor do atributo \'[value]\' para o atributo \'[attrname]\' não está contido no conjunto de valores.', 'attr_no_regex_match' => 'O valor do atributo não corresponde à expressão regular', -'attr_validation_error' => '', +'attr_validation_error' => 'O valor \'[value]\' do atributo \'[attrname]\' é inválido.', 'at_least_n_users_of_group' => 'Pelo menos [nuber_of_users] usuários de [group]', -'august' => 'August', +'august' => 'Agosto', 'authentication' => 'Autenticação', -'authentication_failed' => '', +'authentication_failed' => 'Autenticação falhou', 'author' => 'Autor', 'automatic_status_update' => 'Mudança de status automático', 'back' => 'Voltar', @@ -207,28 +212,28 @@ URL: [url]', 'calendar' => 'Calendario', 'calendar_week' => 'Calendário semanal', 'cancel' => 'Cancelar', -'cannot_assign_invalid_state' => 'Cannot assign new reviewers to a document that is not pending review or pending approval.', -'cannot_change_final_states' => '', +'cannot_assign_invalid_state' => 'Não é possível atribuir novos revisores a um documento que não está pendente de revisão ou aprovação pendente.', +'cannot_change_final_states' => 'Aviso: Você não pode alterar o estado do documento rejeitado, expirado ou com revisão ou aprovação.', 'cannot_delete_user' => 'Não é possível excluir usuário', 'cannot_delete_yourself' => 'Não é possível autoexcluir-se', 'cannot_move_root' => 'Erro: Não pode remover a pasta raiz.', -'cannot_retrieve_approval_snapshot' => '', -'cannot_retrieve_review_snapshot' => '', -'cannot_rm_root' => 'Error: Cannot delete root folder.', +'cannot_retrieve_approval_snapshot' => 'Não é possível recuperar o instantâneo do estado de aprovação desta versão do documento.', +'cannot_retrieve_review_snapshot' => 'Não é possível recuperar o instantâneo do estado de revisão para esta versão do documento.', +'cannot_rm_root' => 'Erro: Não é possível excluir a pasta raiz.', 'categories' => 'Categorias', -'categories_loading' => '', +'categories_loading' => 'Por favor, aguarde até que a lista de categorias seja carregada...', 'category' => 'Categoria', 'category_exists' => 'Categoria já existe.', 'category_filter' => 'Somente categorias', -'category_info' => '', +'category_info' => 'Informação', 'category_in_use' => 'Esta categoria é usada atualmente por documentos.', 'category_noname' => 'Nenhum nome de categoria foi fornecido.', 'ca_ES' => 'Catalão', -'change_assignments' => 'Change Assignments', +'change_assignments' => 'Definir revisor / aprovador', 'change_password' => 'Modificar senha', 'change_password_message' => 'Sua senha foi modificada.', -'change_recipients' => '', -'change_revisors' => '', +'change_recipients' => 'Definir destinatários', +'change_revisors' => 'Definir revisores', 'change_status' => 'Mudar status', 'charts' => 'Gráficos', 'chart_docsaccumulated_title' => 'Número de documentos', @@ -239,18 +244,18 @@ URL: [url]', 'chart_docsperuser_title' => 'Documentos por usuário', 'chart_selection' => 'Selecione gráfico', 'chart_sizeperuser_title' => 'Espaço em disco por usuário', -'checkedout_file_has_different_version' => '', -'checkedout_file_has_disappeared' => '', -'checkedout_file_is_unchanged' => '', -'checkin_document' => '', -'checkoutpath_does_not_exist' => '', -'checkout_document' => '', -'checkout_is_disabled' => '', +'checkedout_file_has_different_version' => 'A versão retirada não é idêntica à versão atual. A entrada não atualizará o documento.', +'checkedout_file_has_disappeared' => 'O arquivo do documento retirado desapareceu. A entrada não será possível.', +'checkedout_file_is_unchanged' => 'O arquivo do documento retirado ainda está inalterado. A entrada não será possível. Se não planejar nenhuma modificação, você poderá redefinir o estado de retirada.', +'checkin_document' => 'Entrada', +'checkoutpath_does_not_exist' => 'O caminho de retirada não existe', +'checkout_document' => 'Retirada', +'checkout_is_disabled' => 'A retirada de documentos está desativada na configuração.', 'choose_attrdef' => 'Por favor escolha a definição de atributo', -'choose_attrdefgroup' => '', +'choose_attrdefgroup' => 'Escolher o grupo de atributos', 'choose_category' => 'Por favor escolha', 'choose_group' => 'Escolher grupo', -'choose_role' => '', +'choose_role' => 'Escolher o papel', 'choose_target_category' => 'Escolha a categoria', 'choose_target_document' => 'Escolha documento', 'choose_target_file' => 'Escolha o arquivo', @@ -259,45 +264,45 @@ URL: [url]', 'choose_workflow' => 'Escolha de fluxo de trabalho', 'choose_workflow_action' => 'Escolha a ação de fluxo de trabalho', 'choose_workflow_state' => 'Escolha um estado de fluxo de trabalho', -'class_name' => '', +'class_name' => 'Nome da classe', 'clear_cache' => 'Limpar o Cache', 'clear_clipboard' => 'Limpar área de transferência', -'clear_password' => '', +'clear_password' => 'Limpar senha', 'clipboard' => 'Área de transferência', 'close' => 'Fechar', -'command' => '', +'command' => 'Comando', 'comment' => 'Comentário', 'comment_changed_email' => '', 'comment_for_current_version' => 'Comentário para versão atual', 'configure_extension' => 'Configurar extensão', 'confirm_clear_cache' => 'Você realmente gostaria de limpar o cache? Isso removerá todas as imagens de pré-visualização.', 'confirm_create_fulltext_index' => 'Sim, eu gostaria de recriar o índice de texto completo!', -'confirm_move_document' => '', -'confirm_move_folder' => '', +'confirm_move_document' => 'Por favor, confirme a movimentação do documento.', +'confirm_move_folder' => 'Por favor, confirme o movimento da pasta.', 'confirm_pwd' => 'Confirme Senha', -'confirm_rm_attr_value' => '', -'confirm_rm_backup' => 'Do you really want to remove the file "[arkname]"?
        Be careful: This action cannot be undone.', -'confirm_rm_document' => 'Deseja realmente remover o documento \'[documentname]\'?
        Por favor, tenha cuidado porque esta ação não poderá ser desfeita.', -'confirm_rm_dump' => 'Do you really want to remove the file "[dumpname]"?
        Be careful: This action cannot be undone.', -'confirm_rm_event' => 'Do you really want to remove event "[name]"?
        Be careful: This action cannot be undone.', -'confirm_rm_file' => 'Do you really want to remove file "[name]" of document "[documentname]"?
        Be careful: This action cannot be undone.', +'confirm_rm_attr_value' => 'Você realmente deseja excluir o valor do atributo?', +'confirm_rm_backup' => 'Você realmente quer remover o arquivo "[arkname]"?
        Tenha cuidado: Esta ação não pode ser desfeita.', +'confirm_rm_document' => 'Você realmente quer remover o documento \'[documentname]\'?
        Por favor, tenha cuidado porque esta ação não poderá ser desfeita.', +'confirm_rm_dump' => 'Você realmente quer remover o arquivo "[dumpname]"?
        Tenha cuidado: Esta ação não pode ser desfeita.', +'confirm_rm_event' => 'Você realmente deseja remover o evento "[name]"?
        Tenha cuidado: essa ação não pode ser desfeita.', +'confirm_rm_file' => 'Você realmente deseja remover o arquivo "[name]" do documento "[documentname]"?
        Cuidado: esta ação não pode ser desfeita.', 'confirm_rm_folder' => 'Deseja realmente remover a \'[foldername]\' e seu conteúdo ?
        Por favor, tenha cuidado porque esta ação não poderá ser desfeita.', 'confirm_rm_folder_files' => 'Você realmente deseja remover todos os arquivos da pasta "[foldername]" e de suas subpastas
        Cuidado: Eáa ação não pode ser desfeita.', -'confirm_rm_group' => 'Do you really want to remove the group "[groupname]"?
        Be careful: This action cannot be undone.', -'confirm_rm_log' => 'Do you really want to remove log file "[logname]"?
        Be careful: This action cannot be undone.', -'confirm_rm_transmittal' => '', -'confirm_rm_transmittalitem' => '', -'confirm_rm_user' => 'Do you really want to remove the user "[username]"?
        Be careful: This action cannot be undone.', -'confirm_rm_user_from_processes' => '', +'confirm_rm_group' => 'Você realmente quer remover o grupo "[groupname]"?
        Tenha cuidado: Esta ação não pode ser desfeita.', +'confirm_rm_log' => 'Você realmente deseja remover o arquivo de log "[logname]"?
        Cuidado: esta ação não pode ser desfeita.', +'confirm_rm_transmittal' => 'Por favor, confirme a exclusão da transmissão.', +'confirm_rm_transmittalitem' => 'Confirme a remoção', +'confirm_rm_user' => 'Você realmente deseja remover o usuário "[username]"?
        Tenha cuidado: esta ação não pode ser desfeita.', +'confirm_rm_user_from_processes' => 'Você realmente deseja remover o usuário "[username]" de todos os processos?
        Tenha cuidado: essa ação pode levar à liberação de documentos se o usuário for o único ou o último aprovador.', 'confirm_rm_version' => 'Deseja realmente remover versão [version] do documento "[documentname]"?
        Por favor, tenha cuidado porque esta ação não poderá ser desfeita.', -'confirm_transfer_objects' => '', -'confirm_update_transmittalitem' => '', +'confirm_transfer_objects' => 'Você realmente quer transferir os documentos, pastas etc. do usuário "[username]"?
        Tenha cuidado: Esta ação não pode ser desfeita.', +'confirm_update_transmittalitem' => 'Confirme a atualização', 'content' => 'Conteúdo', 'continue' => 'Continue', 'converter_new_cmd' => 'Comando', 'converter_new_mimetype' => 'Novo mimetype', -'copied_to_checkout_as' => '', -'create_download_link' => '', +'copied_to_checkout_as' => 'Arquivo copiado para o espaço de retirada como \'[nome do arquivo]\' em [date]', +'create_download_link' => 'Criar link de download', 'create_fulltext_index' => 'Criar índice de texto completo', 'create_fulltext_index_warning' => 'Você está para recriar o índice de texto completo. Isso pode levar uma quantidade considerável de tempo e reduzir o desempenho geral do sistema. Se você realmente deseja recriar o índice, por favor confirme a operação.', 'creation_date' => 'Criado', @@ -310,48 +315,55 @@ URL: [url]', 'databasesearch' => 'Pesquisar Base de dados', 'date' => 'Data', 'days' => 'dias', -'debug' => '', +'debug' => 'Debug', 'december' => 'December', 'default_access' => 'Padrão de acesso', 'default_keywords' => 'Palavras-chave disponíveis', 'definitions' => 'Definições', 'delete' => 'Apagar', -'details' => 'Details', -'details_version' => 'Details for version: [version]', +'details' => 'Detalhes', +'details_version' => 'Detalhes para a versão: [version]', 'de_DE' => 'Alemão', 'disclaimer' => 'Esta é uma área restrita, o acesso é permitido apenas ao pessoal autorizado. Qualquer violação será tratado de acordo com as normas internas e leis vigentes.', 'discspace' => 'Espaço em Disco', -'docs_in_reception_no_access' => '', -'docs_in_revision_no_access' => '', +'docs_in_reception_no_access' => 'Documentos com recepção sem acesso pelo destinatário', +'docs_in_revision_no_access' => 'Documentos em revisão sem acesso por revisor', 'document' => 'Documento', 'documentcontent' => 'Conteúdo do Documento', 'documents' => 'Documentos', -'documents_checked_out_by_you' => '', +'documents_checked_out_by_you' => 'Documentos retirados por você', 'documents_expired' => 'Documentos Expirados', 'documents_in_process' => 'Documentos em Processo', -'documents_locked' => '', +'documents_locked' => 'Documentos bloqueados', 'documents_locked_by_you' => 'Documentos bloqueados por você', 'documents_only' => 'Somente documentos', -'documents_to_approve' => 'Documents Awaiting User\'s Approval', -'documents_to_correct' => '', -'documents_to_process' => '', -'documents_to_receipt' => '', -'documents_to_review' => 'Documents Awaiting User\'s Review', -'documents_to_revise' => '', -'documents_to_trigger_workflow' => '', -'documents_user_draft' => '', -'documents_user_expiration' => '', -'documents_user_needs_correction' => '', -'documents_user_no_reception' => '', -'documents_user_obsolete' => '', -'documents_user_reception' => '', +'documents_to_approve' => 'Documentos aguardando sua aprovação', +'documents_to_correct' => 'Documentos que precisam de correção', +'documents_to_process' => 'Documentos que precisam de processamento', +'documents_to_receipt' => 'Documents awaiting to confirm the receipt', +'documents_to_review' => 'Documentos aguardando sua avaliação', +'documents_to_revise' => 'Documentos aguardando sua revisão', +'documents_to_trigger_workflow' => 'Documentos no fluxo de trabalho', +'documents_user_draft' => 'Rascunhos', +'documents_user_expiration' => 'Documentos expirados', +'documents_user_needs_correction' => 'Documentos que precisam ser corrigidos', +'documents_user_no_reception' => 'Documentos sem recebimento', +'documents_user_obsolete' => 'Documentos obsoletos', +'documents_user_reception' => 'Documentos aguardando recebimento', 'documents_user_rejected' => 'Documentos rejeitados', -'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention', -'documents_with_notification' => '', -'document_already_checkedout' => '', +'documents_user_requiring_attention' => 'Documentos de propriedade do usuário que exigem atenção', +'documents_with_notification' => 'Documentos com notificação', +'document_already_checkedout' => 'Este documento já foi retirado.', 'document_already_locked' => 'Este documento já está travado', -'document_attribute_changed_email_body' => '', -'document_attribute_changed_email_subject' => '', +'document_attribute_changed_email_body' => 'Atributo alterado +Documento: [name] +Atributo: [attribute_name] +Valor anterior: [attribute_old_value] +Novo valor: [attribute_new_value] +Pasta mãe: [folder_path] +Usuário: [username] +URL: [url]', +'document_attribute_changed_email_subject' => '[sitename]: [name] - Atributo alterado', 'document_comment_changed_email' => 'Comentário modificado', 'document_comment_changed_email_body' => 'Comentário modificado Documento: [name] @@ -361,7 +373,7 @@ Pasta mãe: [folder_path] Usuário: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentário modificado', -'document_count' => '', +'document_count' => 'Número de documentos', 'document_deleted' => 'Documento deletado', 'document_deleted_email' => 'Documento eliminado', 'document_deleted_email_body' => 'Documento eliminado @@ -372,7 +384,7 @@ Usuário: [username]', 'document_duplicate_name' => 'Duplicar nome do documento', 'document_has_no_workflow' => 'Documento não tem fluxo de trabalho', 'document_infos' => 'Informações', -'document_is_checked_out' => '', +'document_is_checked_out' => 'O documento está atualmente com estado de retirado. Se você fizer o envio de uma nova versão, a versão retirada não poderá mais ser registrada.', 'document_is_not_locked' => 'Este documento não está travado', 'document_link_by' => 'Ligado por', 'document_link_public' => 'Público', @@ -384,7 +396,7 @@ Nova pasta: [new_folder_path] Usuário: [username] URL: [url]', 'document_moved_email_subject' => '[sitename]: [name] - Documento movido', -'document_not_checkedout' => '', +'document_not_checkedout' => 'O documento não foi retirado', 'document_renamed_email' => 'Documento renomeado', 'document_renamed_email_body' => 'Documento renomeado Documento: [name] @@ -393,51 +405,64 @@ Nome antigo: [old_name] Usuário: [username] URL: [url]', 'document_renamed_email_subject' => '[sitename]: [name] - Documento renomeado', -'document_status_changed_email' => 'Status do documento alterado', -'document_status_changed_email_body' => 'Status do documento alterado +'document_status_changed_email' => 'Estado do documento alterado', +'document_status_changed_email_body' => 'Estado do documento alterado Documento: [name] -Status: [status] +Estado: [status] Pasta mãe: [folder_path] -Usuário: [username] rnURL: [url]', -'document_status_changed_email_subject' => '[sitename]: [name] - Status do documento modificado', +Usuário: [username] +URL: [url]', +'document_status_changed_email_subject' => '[sitename]: [name] - Estado do documento modificado', 'document_title' => 'Documento [documentname]', -'document_transfered_email_body' => '', -'document_transfered_email_subject' => '', +'document_transfered_email_body' => 'Transferência de documentos para outro usuário +Documento: [name] +Novo proprietário: [newuser] +Pasta mãe: [folder_path] +Usuário: [username] +URL: [url]', +'document_transfered_email_subject' => '[sitename]: [name] - Transferir documento', 'document_updated_email' => 'Documento atualizado', -'document_updated_email_body' => 'Documento atualizado -Documento: [name] -Pasta mãe: [folder_path] -Usuário: [username] -Comentário: [comment] -Versão comentário: [version_comment] +'document_updated_email_body' => 'Documento atualizado +Documento: [name] +Pasta mãe: [folder_path] +Usuário: [username] +Comentário: [comment] +Versão comentário: [version_comment] URL: [url]', 'document_updated_email_subject' => '[sitename]: [name] - Documento atualizado', 'does_not_expire' => 'não Expira', -'does_not_inherit_access_msg' => 'Inherit access', +'does_not_inherit_access_msg' => 'Herdar acesso', 'download' => 'Download', 'download_extension' => 'Baixar extensão como arquivo zip', -'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', +'download_links' => 'Links para download', +'download_link_email_body' => 'Clique no link abaixo para baixar a versão [version] do documento +\'[docname]\'. + +[url] + +O link é válido até [valid]. + +[comment]', +'download_link_email_subject' => 'Link de download', 'do_object_repair' => 'Reparar todas as pastas e documentos.', 'do_object_setchecksum' => 'Defina soma de verificação', 'do_object_setfilesize' => 'Defina o tamanho do arquivo', 'do_object_unlink' => 'Excluir versão do documento', -'draft' => '', +'draft' => 'Rascunho', 'draft_pending_approval' => 'Rascunho - Aprovação pendente', -'draft_pending_review' => 'Draft - pending review', +'draft_pending_review' => 'Rascunho - revisão pendente', 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!', -'dropfolderdir_missing' => '', +'dropfolderdir_missing' => 'Sua pasta suspensa pessoal não existe no servidor! Por favor, peça ao seu administrador para criá-lo.', 'dropfolder_file' => 'Arquivo de pasta suspensa', 'dropfolder_folder' => 'Pasta da pasta-alvo', -'dropupload' => 'Upload rápido', +'dropupload' => 'Envio rápido', 'drop_files_here' => 'Solte os arquivos aqui!', -'dump_creation' => 'DB dump creation', -'dump_creation_warning' => 'With this operation you can create a dump file of your database content. After the creation the dump file will be saved in the data folder of your server.', -'dump_list' => 'Existings dump files', -'dump_remove' => 'Remove dump file', +'dump_creation' => 'Criação de despejo de banco de dados', +'dump_creation_warning' => 'Com esta operação, você pode criar um arquivo de despejo do conteúdo do seu banco de dados. Após a criação, o arquivo de despejo será salvo na pasta de dados do seu servidor.', +'dump_list' => 'Arquivos de despejo existentes', +'dump_remove' => 'Remover arquivo de despejo', 'duplicates' => 'Duplicados', -'duplicate_content' => 'Conteúdo Duplicado', +'duplicate_content' => 'Conteúdo duplicado', 'edit' => 'editar', 'edit_attributes' => 'Editar atributos', 'edit_comment' => 'Editar comentário', @@ -445,71 +470,71 @@ URL: [url]', 'edit_document_access' => 'Editar acesso', 'edit_document_notify' => 'Lista de notificação', 'edit_document_props' => 'Editar documento', -'edit_event' => 'Edit event', +'edit_event' => 'Editar evento', 'edit_existing_access' => 'Editar lista de acesso.', -'edit_existing_attribute_groups' => '', +'edit_existing_attribute_groups' => 'Editar grupos de atributos', 'edit_existing_notify' => 'Editar lista de notificação', 'edit_folder_access' => 'Editar permissões da pasta', -'edit_folder_attrdefgrp' => '', +'edit_folder_attrdefgrp' => 'Editar grupos de atributos', 'edit_folder_notify' => 'Lista de notificação', 'edit_folder_props' => 'Editar pasta', 'edit_group' => 'Editar grupo', -'edit_online' => '', -'edit_task' => '', -'edit_transmittal_props' => '', +'edit_online' => 'Editar on-line', +'edit_task' => 'Editar tarefa', +'edit_transmittal_props' => 'Editar propriedades de transmissão', 'edit_user' => 'Editar usuário', 'edit_user_details' => 'Editar Perfil', -'edit_version' => '', +'edit_version' => 'Editar versão', 'el_GR' => 'Grego', 'email' => 'Email', 'email_error_title' => 'Nenhum email informado', -'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions', -'email_header' => 'This is an automatic menager from the DMS server.', +'email_footer' => 'Você sempre pode alterar suas configurações de e-mail usando as funções \'Minha conta\'', +'email_header' => 'Este é um gerenciador automático do servidor DMS.', 'email_not_given' => 'Por favor insira um endereço de e-mail válido.', -'empty_attribute_group_list' => '', +'empty_attribute_group_list' => 'Nenhum grupo de atributos', 'empty_folder_list' => 'Nenhum documento ou pasta', -'empty_list' => '', +'empty_list' => 'Nenhuma entrada', 'empty_notify_list' => 'Sem entradas', 'en_GB' => 'Inglês (GB)', 'equal_transition_states' => 'Estado de início e fim são iguais', 'error' => 'Erro', -'error_add_aro' => '', -'error_add_permission' => '', -'error_cleared_cache' => '', -'error_edit_task' => '', -'error_extension_getlist' => '', -'error_importfs' => '', +'error_add_aro' => 'erro ao adicionar o objeto de solicitação de acesso', +'error_add_permission' => 'Erro ao adicionar permissão', +'error_cleared_cache' => 'Erro ao limpar o cache', +'error_edit_task' => 'Erro ao salvar tarefa', +'error_extension_getlist' => 'Erro ao obter lista de extensões do repositório', +'error_importfs' => 'Erro ao importar do sistema de arquivos', 'error_no_document_selected' => 'Nenhum documento selecionado', 'error_no_folder_selected' => 'Nenhuma pasta selecionada', 'error_occured' => 'Ocorreu um erro', -'error_remove_document' => '', +'error_remove_document' => 'Erro ao excluir o documento', 'error_remove_folder' => 'Erro na exclusão da pasta', -'error_remove_permission' => '', -'error_rm_workflow' => '', -'error_rm_workflow_action' => '', -'error_rm_workflow_state' => '', -'error_toogle_permission' => '', -'error_transfer_document' => '', -'error_trigger_workflow' => '', -'error_update_document' => '', +'error_remove_permission' => 'Erro ao remover permissão', +'error_rm_workflow' => 'Erro ao remover o fluxo de trabalho', +'error_rm_workflow_action' => 'Erro ao remover a ação do fluxo de trabalho', +'error_rm_workflow_state' => 'Erro ao remover o estado do fluxo de trabalho', +'error_toogle_permission' => 'Erro ao alterar a permissão', +'error_transfer_document' => 'Erro ao transferir documento', +'error_trigger_workflow' => 'Erro ao acionar a transição do fluxo de trabalho', +'error_update_document' => 'Erro ao atualizar o documento', 'error_uploading_reviewer_only' => 'Erro ao criar o documento. O documento tem um revisor, mas não tem um aprovador', 'es_ES' => 'Espanhol', -'event_details' => 'Event details', +'event_details' => 'Detalhes do evento', 'exclude_items' => 'Excluir ítens', 'expired' => 'Expirado', -'expired_at_date' => '', +'expired_at_date' => 'Expirado em [datetime]', 'expired_documents' => 'Documentos expirados', 'expires' => 'Expira', 'expire_by_date' => 'Data de vencimento', -'expire_in_1d' => '', -'expire_in_1h' => '', +'expire_in_1d' => 'Expira em 1 dia', +'expire_in_1h' => 'Expira em 1 hora', 'expire_in_1m' => 'Expira em 1 mês', -'expire_in_1w' => 'Expira em uma (01) semana', +'expire_in_1w' => 'Expira em 1 semana', 'expire_in_1y' => 'Expira em 1 ano', -'expire_in_2h' => '', +'expire_in_2h' => 'Expira em 2 horas', 'expire_in_2y' => 'Expira em 2 anos', -'expire_today' => '', -'expire_tomorrow' => '', +'expire_today' => 'Expira hoje', +'expire_tomorrow' => 'Expira amanhã', 'expiry_changed_email' => 'Data de validade mudou', 'expiry_changed_email_body' => 'Data de validade mudou Documento: [name] @@ -517,20 +542,20 @@ Pasta mãe: [folder_path] Usuário: [username] URL: [url]', 'expiry_changed_email_subject' => '[sitename]: [name] - Data de validade mudou', -'export' => '', -'extension_archive' => '', +'export' => 'Exportar', +'extension_archive' => 'Extensão', 'extension_changelog' => 'Alterações no Log', 'extension_loading' => 'Carregando Extensões', 'extension_manager' => 'Gerenciar extensões', 'extension_mgr_installed' => 'Instalado', -'extension_mgr_no_upload' => 'Uploading de novas extensões não esta disponível pois o diretório Extensões recebeu a atribuição de Somente Leitura.', +'extension_mgr_no_upload' => 'O envio de novas extensões não esta disponível pois o diretório Extensões recebeu a atribuição de Somente Leitura.', 'extension_mgr_repository' => 'Disponível', 'extension_version_list' => 'Versões', -'february' => 'February', +'february' => 'Fevereiro', 'file' => 'Arquivo', 'files' => 'Arquivos', 'files_deletion' => 'Arquivos deletados', -'files_deletion_warning' => 'With this option you can delete all files of entire DMS folders. The versioning information will remain visible.', +'files_deletion_warning' => 'Com essa opção, você pode excluir todos os arquivos de pastas inteiras do DMS. As informações de versão permanecerão visíveis.', 'files_loading' => 'Pro favor aguarde ate a lista de ficheiros é carregado...', 'file_size' => 'Tamanho', 'filter_for_documents' => 'Filtro adicional para documentos', @@ -538,9 +563,16 @@ URL: [url]', 'folder' => 'Pasta', 'folders' => 'Pastas', 'folders_and_documents_statistic' => 'Relatórios de pastas e documentos', -'folders_with_notification' => '', -'folder_attribute_changed_email_body' => '', -'folder_attribute_changed_email_subject' => '', +'folders_with_notification' => 'Pastas com notificação', +'folder_attribute_changed_email_body' => 'Atributo alterado +Pasta: [name] +Atributo: [attribute_name] +Valor anterior: [attribute_old_value] +Novo valor: [attribute_new_value] +Pasta pai: [folder_path] +Usuário: [username] +URL: [url]', +'folder_attribute_changed_email_subject' => '[sitename]: [name] - Atributo alterado', 'folder_comment_changed_email' => 'Comentário mudou', 'folder_comment_changed_email_body' => 'Comentário mudou Pasta: [name] @@ -562,7 +594,7 @@ URL: [url]', 'folder_moved_email' => 'Pasta movida', 'folder_moved_email_body' => 'Mover pasta Pasta: [name] -Pasta antiga: [old_folder_path] +Pasta anterior: [old_folder_path] Nova pasta: [new_folder_path] Usuário: [username] URL: [url]', @@ -577,16 +609,16 @@ URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Pasta renomeada', 'folder_title' => 'Pasta [foldername]', 'force_update' => 'Atualizar', -'friday' => 'Friday', -'friday_abbr' => 'Fr', -'from' => 'From', +'friday' => 'Sexta-feira', +'friday_abbr' => 'Se', +'from' => 'De', 'fr_FR' => 'Francês', 'fullsearch' => 'Pesquisa de texto completo', 'fullsearch_hint' => 'Use índice de texto completo', -'fulltextsearch_disabled' => '', +'fulltextsearch_disabled' => 'O índice de texto completo está desativado', 'fulltext_converters' => 'Índice de conversão de documentos', 'fulltext_info' => 'Informações índice Texto completo', -'global_attributedefinitiongroups' => '', +'global_attributedefinitiongroups' => 'Grupos de atributos', 'global_attributedefinitions' => 'Atributos', 'global_default_keywords' => 'palavras-chave globais', 'global_document_categories' => 'Categorias', @@ -595,182 +627,182 @@ URL: [url]', 'global_workflow_states' => 'Estado de fluxos de trabalho', 'group' => 'Grupo', 'groups' => 'Grupos', -'group_approval_summary' => 'Resumo aprovação de grupo', -'group_exists' => 'Group already exists.', -'group_info' => '', +'group_approval_summary' => 'Resumo de aprovação de grupo', +'group_exists' => 'Grupo já existe.', +'group_info' => 'Informações do grupo', 'group_management' => 'Grupos', -'group_members' => 'Grupo membros', -'group_receipt_summary' => '', +'group_members' => 'Membros do Grupo', +'group_receipt_summary' => 'Resumo de recebimento de grupo', 'group_review_summary' => 'Resumo da avaliação do grupo', 'guest_login' => 'Entre como convidado', -'guest_login_disabled' => 'Guest login is disabled.', -'hash' => '', +'guest_login_disabled' => 'O login de convidado está desativado.', +'hash' => 'Hash', 'help' => 'Ajuda', -'home_folder' => '', -'hook_name' => '', +'home_folder' => 'Pasta pessoal', +'hook_name' => 'Nome do gancho', 'hourly' => 'De hora em hora', 'hours' => 'horas', 'hr_HR' => 'Croata', -'human_readable' => 'Human readable archive', +'human_readable' => 'Arquivo legível por humanos', 'hu_HU' => 'Húngaro', 'id' => 'ID', 'identical_version' => 'Nova versão é idêntica à versão atual.', 'import' => 'Importar', -'importfs' => '', -'import_extension' => '', +'importfs' => 'Importar do sistema de arquivos', +'import_extension' => 'Importar extensão', 'import_fs' => 'Importar do sistema de arquivos', 'import_fs_warning' => 'Isso só funcionará para pastas na pasta-alvo. A operação importa recursivamente todas as pastas e arquivos. Os arquivos serão liberados imediatamente.', -'include_content' => '', +'include_content' => 'Incluir conteúdo', 'include_documents' => 'Include documents', 'include_subdirectories' => 'Include subdirectories', 'indexing_tasks_in_queue' => 'Tarefas de indexação em fila', 'index_converters' => '', -'index_done' => '', -'index_error' => '', +'index_done' => 'Finalizado', +'index_error' => 'Erro', 'index_folder' => 'Pasta Raiz', -'index_no_content' => '', -'index_pending' => '', +'index_no_content' => 'Não indexou o conteúdo', +'index_pending' => 'Pendente', 'index_waiting' => 'Aguarde...', -'individuals' => 'Individuals', -'individuals_in_groups' => '', -'info_recipients_tab_not_released' => '', +'individuals' => 'Indivíduos', +'individuals_in_groups' => 'Members of a group', +'info_recipients_tab_not_released' => 'Confirmação de recebimento para esta versão do documento não é possível, porque a versão não é liberada.', 'inherited' => 'herdado', -'inherits_access_copy_msg' => 'Copy inherited access list', +'inherits_access_copy_msg' => 'Copiar lista de acesso herdada', 'inherits_access_empty_msg' => 'Inicie com a lista de acesso vazia', 'inherits_access_msg' => 'acesso está endo herdado.', -'internal_error' => 'Internal error', -'internal_error_exit' => '', -'invalid_access_mode' => 'Invalid access Mode', -'invalid_action' => 'Invalid Action', -'invalid_approval_status' => '', -'invalid_create_date_end' => 'Invalid end date for creation date range.', -'invalid_create_date_start' => 'Invalid start date for creation date range.', +'internal_error' => 'Erro interno', +'internal_error_exit' => 'Erro interno. Não é possível concluir o pedido.', +'invalid_access_mode' => 'Modo de acesso inválido', +'invalid_action' => 'Ação Inválida', +'invalid_approval_status' => 'Estado de aprovação inválido', +'invalid_create_date_end' => 'Data de término inválida para o período de criação.', +'invalid_create_date_start' => 'Data de início inválida para o intervalo de datas de criação.', 'invalid_doc_id' => 'ID de documento inválida', -'invalid_dropfolder_folder' => '', -'invalid_expiration_date_end' => '', -'invalid_expiration_date_start' => '', -'invalid_file_id' => 'Invalid file ID', -'invalid_folder_id' => 'Invalid Folder ID', -'invalid_group_id' => 'Invalid Group ID', -'invalid_link_id' => 'Invalid link identifier', -'invalid_request_token' => 'Invalid Request Token', -'invalid_review_status' => 'Invalid Review Status', -'invalid_sequence' => 'Invalid sequence value', -'invalid_status' => 'Invalid Document Status', -'invalid_target_doc_id' => 'Invalid Target Document ID', -'invalid_target_folder' => 'Invalid Target Folder ID', -'invalid_user_id' => 'Invalid User ID', -'invalid_version' => 'Invalid Document Version', -'in_folder' => 'Na Pasta', -'in_revision' => '', +'invalid_dropfolder_folder' => 'Pasta inválida na pasta suspensa', +'invalid_expiration_date_end' => 'Data de término inválida para o intervalo de datas de expiração.', +'invalid_expiration_date_start' => 'Data de início inválida para o intervalo de datas de expiração.', +'invalid_file_id' => 'ID de arquivo inválido', +'invalid_folder_id' => 'ID de pasta inválida', +'invalid_group_id' => 'ID do grupo inválido', +'invalid_link_id' => 'Identificador de link inválido', +'invalid_request_token' => 'Token de solicitação inválido', +'invalid_review_status' => 'Estado de avaliação inválido', +'invalid_sequence' => 'Valor de sequência inválido', +'invalid_status' => 'Estado do documento inválido', +'invalid_target_doc_id' => 'ID do documento de destino inválida', +'invalid_target_folder' => 'ID da pasta de destino inválida', +'invalid_user_id' => 'ID do usuário inválida', +'invalid_version' => 'Versão inválida do documento', +'in_folder' => 'Na pasta', +'in_revision' => 'Em revisão', 'in_workflow' => 'No fluxo de trabalho', 'is_disabled' => 'Desativar conta', 'is_hidden' => 'Ocultar perfil da lista de usuários', 'it_IT' => 'Italiano', -'january' => 'January', -'js_form_error' => '', -'js_form_errors' => '', -'js_invalid_email' => '', -'js_no_approval_group' => '', -'js_no_approval_status' => '', +'january' => 'Janeiro', +'js_form_error' => 'O formulário ainda contém # erro.', +'js_form_errors' => 'O formulário ainda contém # erros.', +'js_invalid_email' => 'O endereço de email é inválido', +'js_no_approval_group' => 'Por favor, selecione um grupo de aprovação', +'js_no_approval_status' => 'Por favor, selecione o estado de aprovação', 'js_no_comment' => 'não há comentário', -'js_no_currentpwd' => '', +'js_no_currentpwd' => 'Por favor digite sua senha atual', 'js_no_email' => 'Digite seu endereço de e-mail', 'js_no_file' => 'Por favor selecione um arquivo', 'js_no_keywords' => 'Especifique algumas palavras-chave', 'js_no_login' => 'Por favor digite um usuário', 'js_no_name' => 'Por favor digite um nome', -'js_no_override_status' => 'Por favor, selecione o novo status [override]', +'js_no_override_status' => 'Por favor, selecione o novo estado [override]', 'js_no_pwd' => 'É necessário digitar sua senha', 'js_no_query' => 'Digite uma solicitação', -'js_no_review_group' => 'Please select a review group', -'js_no_review_status' => 'Please select the review status', +'js_no_review_group' => 'Por favor selecione um grupo de avaliação', +'js_no_review_status' => 'Por favor, selecione o estado da revisão', 'js_pwd_not_conf' => 'Senha e confirmação de senha não são iguais', 'js_select_user' => 'Por favor selecione um usuário', 'js_select_user_or_group' => 'Selecione, no mínimo, um usuário ou grupo', -'js_unequal_passwords' => '', -'july' => 'July', -'june' => 'June', +'js_unequal_passwords' => 'As senhas não são iguais', +'july' => 'Julho', +'june' => 'Junho', 'keep' => 'Não altere', -'keep_doc_status' => 'Mantenha status do documento', +'keep_doc_status' => 'Mantenha o estado do documento', 'keywords' => 'Palavras-chave', -'keywords_loading' => 'Pro favor aguarde ate a lista de Keyword é carregada...', -'keyword_exists' => 'Keyword already exists', +'keywords_loading' => 'Por favor aguarde, até que a lista de palavras-chave seja carregada...', +'keyword_exists' => 'Palavra-chave já existe', 'ko_KR' => 'Coreano', 'language' => 'Idioma', 'lastaccess' => 'Último acesso', -'last_update' => 'última versão', +'last_update' => 'Última versão', 'legend' => 'Legenda', -'librarydoc' => '', +'librarydoc' => 'Documento da biblioteca', 'linked_documents' => 'Documentos relacionados', 'linked_files' => 'Arquivos anexados', -'linked_to_current_version' => '', -'linked_to_document' => 'Ligado ao documento', -'linked_to_this_version' => '', +'linked_to_current_version' => 'Vinculado à versão atual', +'linked_to_document' => 'Vinculado ao documento', +'linked_to_this_version' => 'Vinculado a esta versão', 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de envio.', -'link_to_version' => '', +'link_to_version' => 'Anexar à versão', 'list_access_rights' => 'Listar todos os direitos de acesso...', -'list_contains_no_access_docs' => '', -'list_hooks' => '', -'list_tasks' => '', +'list_contains_no_access_docs' => 'A lista contém mais documentos aos quais você não tem acesso e não são exibidos.', +'list_hooks' => 'Listar ganchos', +'list_tasks' => 'Listar tarefas', 'local_file' => 'Arquivo local', 'locked_by' => 'Bloqueado por', 'lock_document' => 'Travar', 'lock_message' => 'Este documento foi travado por [username]. Somente usuários autorizados podem remover a trava deste documento (veja no final da página).', -'lock_status' => 'Status', +'lock_status' => 'Estado', 'login' => 'Login', 'login_disabled_text' => 'Sua conta está desativada, provavelmente por causa de muitos logins falhos.', 'login_disabled_title' => 'Conta desativada', 'login_error_text' => 'Erro no login. Usuário ou senha incorreto.', 'login_error_title' => 'Erro de Login', -'login_not_given' => 'No username has been supplied', +'login_not_given' => 'Nenhum nome de usuário foi fornecido', 'login_ok' => 'Logado com sucesso', -'login_restrictions_apply' => '', +'login_restrictions_apply' => 'Falha no login devido a restrições', 'logout' => 'Sair', 'log_management' => 'Gerenciamento de Logs', 'lo_LA' => 'Laoiano', -'malformed_expiration_date' => '', -'manager' => 'Manager', +'malformed_expiration_date' => 'Data de validade mal formada', +'manager' => 'Gerente', 'manager_of_group' => 'Você é o gerente deste grupo', 'mandatory_approvergroups' => 'Grupos obrigatórios de aprovadores', -'mandatory_approvergroup_no_access' => 'Grupo obrigatória de aprovadores \'[group]\' tem direitos de acesso insuficientes.', +'mandatory_approvergroup_no_access' => 'Grupo obrigatório de aprovadores \'[group]\' tem direitos de acesso insuficientes.', 'mandatory_approvers' => 'Aprovadores obrigatórios', -'mandatory_approver_no_access' => 'Obrigatória \'[usuário]\' aprovador tem direitos de acesso insuficientes.', -'mandatory_reviewergroups' => 'Grupos obrigatórios de revisores', -'mandatory_reviewergroup_no_access' => 'Grupo obrigatória de revisores \'[group]\' tem direitos de acesso insuficientes.', -'mandatory_reviewers' => 'Revisores obrigatórios', -'mandatory_reviewer_no_access' => 'Obrigatória revisor \'[usuário]\' tem direitos de acesso insuficientes.', -'march' => 'March', +'mandatory_approver_no_access' => 'Aprovação obrigatória \'[usuário]\' aprovador tem direitos de acesso insuficientes.', +'mandatory_reviewergroups' => 'Grupos obrigatórios de avaliadores', +'mandatory_reviewergroup_no_access' => 'Grupo obrigatória de avaliadores \'[group]\' tem direitos de acesso insuficientes.', +'mandatory_reviewers' => 'Avaliadores obrigatórios', +'mandatory_reviewer_no_access' => 'Avaliação obrigatória \'[usuário]\' tem direitos de acesso insuficientes.', +'march' => 'Março', 'max_upload_size' => 'Tamanho máximo de arquivo para upload', -'may' => 'May', -'menu_dropfolder' => '', -'menu_upload_from_dropfolder' => '', +'may' => 'Maio', +'menu_dropfolder' => 'Pasta suspensa', +'menu_upload_from_dropfolder' => 'Importar este arquivo', 'mimetype' => 'Tipo mime', 'minutes' => 'minutos', 'misc' => 'Miscelânia', -'missing_checksum' => 'Falta de verificação', -'missing_file' => '', +'missing_checksum' => 'Falta verificação de checksum', +'missing_file' => 'Falta o arquivo', 'missing_filesize' => 'Falta tamanho do arquivo', -'missing_reception' => '', -'missing_request_object' => '', +'missing_reception' => 'Falta o recebimento', +'missing_request_object' => 'Objeto de solicitação ausente', 'missing_transition_user_group' => 'Falta usuário/grupo para transição', -'monday' => 'Monday', -'monday_abbr' => 'Mo', +'monday' => 'Segunda-feira', +'monday_abbr' => 'Se', 'monthly' => 'Mensal', -'month_view' => 'Month view', -'more_objects_loading' => '', -'move' => 'Move', +'month_view' => 'Visualização do Mês', +'more_objects_loading' => 'Mais objetos carregando...', +'move' => 'Mover', 'move_clipboard' => 'Mover para memória auxiliar', 'move_document' => 'Mover documento', 'move_folder' => 'Mover Pasta', 'my_account' => 'Minha Conta', 'my_documents' => 'Meus Documentos', -'my_transmittals' => '', +'my_transmittals' => 'Minhas Transmissões', 'name' => 'Nome', -'needs_correction' => '', +'needs_correction' => 'Precisa de correção', 'needs_workflow_action' => 'Este documento requer sua atenção. Por favor, verifique a guia de fluxo de trabalho.', -'network_drive' => '', -'never' => '', +'network_drive' => 'Unidade de rede', +'never' => 'nunca', 'new' => 'Novo', 'new_attrdef' => 'Adicionar definição de atributo', 'new_default_keywords' => 'Adicionar palavras-chave', @@ -805,7 +837,7 @@ URL: [url]', 'new_user_image' => 'Nova imagem', 'next_state' => 'Novo estado', 'nl_NL' => 'Holandês', -'no' => 'No', +'no' => 'Não', 'notify_added_email' => 'Você foi adicionado a lista de notificação', 'notify_added_email_body' => 'Adicionado a lista de notificação Nome: [name] @@ -820,45 +852,45 @@ Pasta mãe: [folder_path] Usuário: [username] URL: [url]', 'notify_deleted_email_subject' => '[sitename]: [name] - Removido da lista de notificação', -'november' => 'November', +'november' => 'Novembro', 'now' => 'agora', -'no_action' => 'No action required', +'no_action' => 'Nenhuma ação é requerida', 'no_approval_needed' => 'Nenhuma aprovação pendente.', 'no_attached_files' => 'Não há arquivos anexados', 'no_current_version' => 'Você está executando uma versão antiga do SeedDMS. A última versão disponível é [latestversion].', 'no_default_keywords' => 'não há palavras-chave disponíveis', -'no_docs_checked_out' => '', +'no_docs_checked_out' => 'Nenhum documento retirado', 'no_docs_locked' => 'Nenhum documento bloqueado.', -'no_docs_needs_correction' => '', -'no_docs_rejected' => '', +'no_docs_needs_correction' => 'Nenhum documento que precise ser corrigido', +'no_docs_rejected' => 'Nenhum documento rejeitado.', 'no_docs_to_approve' => 'There are currently no documents that require approval.', 'no_docs_to_look_at' => 'Não há documentos que precisam de atenção.', -'no_docs_to_receipt' => '', -'no_docs_to_review' => 'There are currently no documents that require review.', -'no_docs_to_revise' => '', +'no_docs_to_receipt' => 'Não é necessário recibo de documentos.', +'no_docs_to_review' => 'Atualmente, não há documentos que exijam avaliação.', +'no_docs_to_revise' => 'Atualmente, não há documentos que precisem ser revisados.', 'no_email_or_login' => 'Login e e-mail devem ser digitados', 'no_fulltextindex' => 'Nenhum índice de texto completo disponível', 'no_groups' => 'Sem grupos', 'no_group_members' => 'Este grupo não tem membros', 'no_linked_files' => 'Não há arquivos vinculados', -'no_previous_versions' => 'No other versions found', -'no_receipt_needed' => '', +'no_previous_versions' => 'Nenhuma outra versão encontrada', +'no_receipt_needed' => 'Atualmente, não há documentos que exijam uma confirmação de recebimento.', 'no_review_needed' => 'Nenhuma revisão pendente.', -'no_revision_needed' => '', -'no_revision_planed' => '', +'no_revision_needed' => 'Nenhuma revisão pendente.', +'no_revision_planed' => 'Nenhuma revisão do documento agendada.', 'no_update_cause_locked' => 'Por isso você não pode atualizar este documento. Por favor contacte usuário que poáui a trava.', 'no_user_image' => 'não foi encontrado imagem de perfil', 'no_version_check' => 'Verificação de uma nova versão do SeedDMS falhou! Isso pode ser causado por allow_url_fopen configurado para 0 na sua configuração do PHP.', -'no_version_modification' => '', -'no_workflow_available' => '', +'no_version_modification' => 'Nenhuma modificação de versão', +'no_workflow_available' => 'Nenhum fluxo de trabalho disponível', 'objectcheck' => 'Verificação da Pasta/Documento', -'object_check_critical' => '', -'object_check_warning' => '', -'obsolete' => 'Obsolete', -'october' => 'October', +'object_check_critical' => 'Erros críticos', +'object_check_warning' => 'Avisos', +'obsolete' => 'Obsoleto', +'october' => 'Outubro', 'old' => 'Antigo', 'only_jpg_user_images' => 'Somente imagens jpg podem ser utilizadas como avatar', -'order_by_sequence_off' => '', +'order_by_sequence_off' => 'O pedido por sequência é desativado nas configurações. Se você quiser que este parâmetro tenha efeito, você terá que ativá-lo novamente.', 'original_filename' => 'Arquivo original', 'overall_indexing_progress' => 'Progresso geral da indexação', 'owner' => 'Proprietário', @@ -866,7 +898,7 @@ URL: [url]', 'ownership_changed_email_body' => 'Proprietário mudou Documento: [name] Pasta mãe: [folder_path] -Proprietário antigo: [old_owner] +Proprietário amterior: [old_owner] Novo dono: [new_owner] Usuário: [username] URL: [url]', @@ -878,9 +910,9 @@ URL: [url]', 'password_expired' => 'Senha expirou', 'password_expires_in_days' => 'Senha expira em %s dias.', 'password_forgotten' => 'Esqueceu sua senha', -'password_forgotten_email_body' => 'Caro usuário de SeedDMS, +'password_forgotten_email_body' => 'Caro usuário, -nós recebemos um pedido para alterar sua senha. +Recebemos um pedido para alterar sua senha. Isso pode ser feito clicando no seguinte link: @@ -898,23 +930,23 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ 'password_strength_insuffient' => 'A força da senha é insuficiente', 'password_wrong' => 'Senha errada', 'pdf_converters' => 'Conversores de PDF', -'pending_approvals' => '', -'pending_receipt' => '', -'pending_reviews' => '', -'pending_revision' => '', -'pending_workflows' => '', +'pending_approvals' => 'Aprovações pendentes', +'pending_receipt' => 'Recibos pendentes', +'pending_reviews' => 'Avaliações pendentes', +'pending_revision' => 'Revisões pendentes', +'pending_workflows' => 'Fluxos de trabalho pendentes', 'personal_default_keywords' => 'palavras-chave pessoais', 'pl_PL' => 'Polonês', -'possible_substitutes' => '', +'possible_substitutes' => 'Substitutos', 'preset_expires' => 'Vencimento pré-definido', 'preview' => 'visualizar', -'preview_converters' => '', +'preview_converters' => 'Visualizar a conversão do documento', 'preview_images' => 'Imagens de pré-visualização', -'preview_markdown' => '', -'preview_pdf' => '', -'preview_plain' => '', +'preview_markdown' => 'Markdown', +'preview_pdf' => 'Visualizar como PDF', +'preview_plain' => 'Texto', 'previous_state' => 'Estado anterior', -'previous_versions' => 'Previous Versions', +'previous_versions' => 'Versões anteriores', 'process' => 'Processos', 'process_without_user_group' => 'Processos sem usuário/grupo', 'pt_BR' => 'Português (BR)', @@ -922,41 +954,52 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ 'quota_exceeded' => 'Sua cota de disco foi ultrapassada em [bytes].', 'quota_is_disabled' => 'Suporte a cota está desativado nas configurações. A definição de cota do usuário não terá efeito até que seja habilitada novamente.', 'quota_warning' => 'Seu uso máximo do disco foi ultrapassado em [bytes]. Por favor, remova documentos ou versões anteriores.', -'receipts_accepted' => '', -'receipts_not_touched' => '', -'receipts_rejected' => '', -'receipts_without_group' => '', -'receipts_without_user' => '', -'receipt_deletion_email_body' => '', -'receipt_deletion_email_subject' => '', -'receipt_log' => '', -'receipt_request_email_body' => '', -'receipt_request_email_subject' => '', -'receipt_status' => '', -'receipt_summary' => '', -'receipt_update_failed' => '', -'reception' => '', -'reception_acknowleged' => '', -'reception_noaction' => '', -'reception_rejected' => '', -'recipients' => '', -'recipient_already_removed' => '', -'redraw' => '', +'receipts_accepted' => '[no_receipts] recibos já aceitos', +'receipts_not_touched' => '[no_receipts] recibos não tocados', +'receipts_rejected' => '[no_receipts] recibos já rejeitados', +'receipts_without_group' => 'Recibos sem grupo', +'receipts_without_user' => 'Recibos sem usuário', +'receipt_deletion_email_body' => 'O usuário foi removido da lista de destinatários +Documento: [name] +Versão: [versão] +Pasta mãe: [folder_path] +Destinatário: [destinatário] +Usuário: [nome de usuário] +URL: [url]', +'receipt_deletion_email_subject' => '[sitename]: [name] - Destinatário removido', +'receipt_log' => 'Log de entrada', +'receipt_request_email_body' => 'Pedido de entrada +Documento: [name] +Versão: [versão] +Pasta mãe: [folder_path] +Usuário: [nome de usuário] +URL: [url]', +'receipt_request_email_subject' => '[sitename]: [name] - Pedido de entrada', +'receipt_status' => 'Estado', +'receipt_summary' => 'Resumo da entrada', +'receipt_update_failed' => 'Confirmação de entrada falhou', +'reception' => 'Entrada', +'reception_acknowleged' => 'Entrada reconhecida', +'reception_noaction' => 'Nenhuma ação', +'reception_rejected' => 'Entrega rejeitada', +'recipients' => 'Destinatários', +'recipient_already_removed' => 'O destinatário já foi removido ou já acusou o recebimento.', +'redraw' => 'Redesenhar', 'refresh' => 'Atualizar', -'rejected' => 'Rejected', -'released' => 'Released', -'removed_approver' => 'has been removed from the list of approvers.', +'rejected' => 'Rejeitado', +'released' => 'Liberado', +'removed_approver' => 'foi removido da lista de aprovadores.', 'removed_file_email' => 'Remover anexo', 'removed_file_email_body' => 'Remover anexo Documento: [document] Usuário: [username] URL: [url]', 'removed_file_email_subject' => '[sitename]: [document] - Anexo removido', -'removed_recipient' => '', -'removed_reviewer' => 'has been removed from the list of reviewers.', -'removed_revisor' => '', -'removed_workflow_email_body' => 'Removido do fluxo de trabalho de documentos version -Document: [name] +'removed_recipient' => 'foi removido da lista de destinatários.', +'removed_reviewer' => 'foi removido da lista de avaliadores.', +'removed_revisor' => 'foi removido da lista de revisores.', +'removed_workflow_email_body' => 'Fluxo de trabalho removido da versão do documento +Documento: [name] Versão: [version] Fluxo de Trabalho: [workflow] Pasta mãe: [folder_path] @@ -967,69 +1010,91 @@ URL: [url]', 'remove_marked_files' => 'Remover arquivos marcados', 'repaired' => 'reparado', 'repairing_objects' => 'Reparando documentos e pastas', -'request_workflow_action_email_body' => '', -'request_workflow_action_email_subject' => '', -'reset_checkout' => '', -'restrict_access' => '', -'results_page' => 'Results Page', -'return_from_subworkflow' => 'Retorno de sub fluxo de trabalho', -'return_from_subworkflow_email_body' => 'Retorno de sub fluxo de trabalho +'request_workflow_action_email_body' => 'O fluxo de trabalho atingiu um estado que requer sua ação. +Documento: [name]] +Versão: [versão] +Fluxo de trabalho: [fluxo de trabalho] +Estado atual: [current_state] +Pasta mãe: [folder_path] +Usuário: [nome de usuário] +URL: [url]', +'request_workflow_action_email_subject' => '[sitename]: [name] - Ação de fluxo de trabalho requerida', +'reset_checkout' => 'Concluir retirada', +'restrict_access' => 'Nenhum acesso a', +'results_page' => 'Página de resultados', +'return_from_subworkflow' => 'Retorno de sub-fluxo de trabalho', +'return_from_subworkflow_email_body' => 'Retorno de sub-fluxo de trabalho Documento: [name] Versão: [version] Fluxo de Trabalho: [workflow] -Sub Fluxo de Trabalho: [subworkflow] +sub-fluxo de trabalho: [subworkflow] Pasta mãe: [folder_path] Usuário: [username] URL: [url]', -'return_from_subworkflow_email_subject' => '[sitename]: [name] - Retornar do sub fluxo de trabalho', +'return_from_subworkflow_email_subject' => '[sitename]: [name] - Retornar do sub-fluxo de trabalho', 'reverse_links' => 'Documentos, que têm um link para o documento atual', -'reviewers' => 'Reviewers', -'reviewer_already_assigned' => 'is already assigned as a reviewer', -'reviewer_already_removed' => 'has already been removed from review proceá or has already submitted a review', -'reviews_accepted' => '', -'reviews_not_touched' => '', -'reviews_rejected' => '', -'reviews_without_group' => '', -'reviews_without_user' => '', +'reviewers' => 'Avaliadores', +'reviewer_already_assigned' => 'já está atribuído como avaliador', +'reviewer_already_removed' => 'já foi removido do processo de revisão ou já enviou um comentário', +'reviews_accepted' => '[no_reviews] avaliações já aceitas', +'reviews_not_touched' => '[no_reviews] avaliações não tocadas', +'reviews_rejected' => '[no_reviews] avaliações já rejeitadas', +'reviews_without_group' => 'Avaliações sem grupo', +'reviews_without_user' => 'Avaliações sem usuário', 'review_deletion_email' => 'Pedido de revisão eliminado', -'review_deletion_email_body' => '', -'review_deletion_email_subject' => '', -'review_file' => '', -'review_group' => 'Review Group', +'review_deletion_email_body' => 'Solicitação de revisão excluída +Documento: [name] +Versão: [versão] +Pasta mãe: [folder_path] +Usuário: [nome de usuário] +URL: [url]', +'review_deletion_email_subject' => '[sitename]: [name] - Solicitação de revisão excluída', +'review_file' => 'Arquivo', +'review_group' => 'Grupo de Revisão', 'review_log' => 'Log de Revisão', 'review_request_email' => 'Pedido de revisão', -'review_request_email_body' => '', -'review_request_email_subject' => '', -'review_status' => 'Review Status', +'review_request_email_body' => 'Pedido de revisão +Documento: [name] +Versão: [versão] +Pasta mãe: [folder_path] +Usuário: [username] +URL: [url]', +'review_request_email_subject' => '[sitename]: [name] - Solicitação de revisão', +'review_status' => 'Estado da revisão', 'review_submit_email' => 'Revisão submetida', 'review_submit_email_body' => 'Submitida revisão de documento: [name] Versão: [version] -Status: [status] +Estado: [status] Comentário: [comment] Pasta mãe: [folder_path] Usuário: [username] URL: [url]', 'review_submit_email_subject' => '[sitename]: [name] - Revisão submetida', -'review_summary' => 'Review Summary', -'review_update_failed' => 'Error updating review status. Update failed.', -'revise_document' => '', -'revise_document_on' => '', -'revisions_accepted' => '', -'revisions_not_touched' => '', -'revisions_pending' => '', -'revisions_rejected' => '', -'revisions_without_group' => '', -'revisions_without_user' => '', -'revision_date' => '', -'revision_log' => '', -'revision_request_email_body' => '', -'revision_request_email_subject' => '', -'revision_status' => '', +'review_summary' => 'Resumo de revisão', +'review_update_failed' => 'Erro ao atualizar o status da revisão. Atualização falhou.', +'revise_document' => 'Revisar documento', +'revise_document_on' => 'Próxima revisão da versão do documento em [date]', +'revisions_accepted' => '[no_revisions] revisões já aceitas', +'revisions_not_touched' => '[no_revisions] revisões não sendo tocadas', +'revisions_pending' => '[no_revisions] revisões devidas no futuro', +'revisions_rejected' => '[no_revisions] revisões já rejeitadas', +'revisions_without_group' => 'Revisões sem grupo', +'revisions_without_user' => 'Revisões sem usuário', +'revision_date' => 'Data da revisão', +'revision_log' => 'Log de revisão', +'revision_request_email_body' => 'Pedido de revisão +Documento: [name] +Versão: [version] +Pasta mãe: [folder_path] +Usuário: [username] +URL: [url]', +'revision_request_email_subject' => '[sitename]: [name] - solicitação de revisão', +'revision_status' => 'Estado', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', -'revisors' => '', -'revisor_already_assigned' => '', -'revisor_already_removed' => '', +'revisors' => 'Revisores', +'revisor_already_assigned' => 'O usuário já está designado como revisor.', +'revisor_already_removed' => 'Revisor já foi removido do processo de revisão ou já revisou o documento.', 'rewind_workflow' => 'Fluxo de trabalho revisto', 'rewind_workflow_email_body' => 'Fluxo de processo foi revisto Documento: [name] @@ -1041,19 +1106,19 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Fluxo de processo foi revisto', 'rewind_workflow_warning' => 'Se você voltar um fluxo de trabalho ao seu estado inicial, então o log todo o fluxo de trabalho para este documento será eliminado e não poderá ser recuperado.', 'rm_attrdef' => 'Remover definição de atributo', -'rm_attrdefgroup' => '', -'rm_attr_value' => '', +'rm_attrdefgroup' => 'Remover este grupo de atributos', +'rm_attr_value' => 'Valor de atributo removido', 'rm_default_keyword_category' => 'Apague esta categoria', 'rm_document' => 'Remove documento', 'rm_document_category' => 'Remover categoria', -'rm_event' => '', +'rm_event' => 'Remover evento', 'rm_file' => 'Remove file', 'rm_folder' => 'Remove pasta', 'rm_from_clipboard' => 'Remover da área de transferência', 'rm_group' => 'Remove este grupo', -'rm_role' => '', -'rm_transmittal' => '', -'rm_transmittalitem' => '', +'rm_role' => 'Excluir este papel', +'rm_transmittal' => 'Por favor, confirme a exclusão da transmissão.', +'rm_transmittalitem' => 'Confirme a remoção', 'rm_user' => 'Remove este usuário', 'rm_user_from_processes' => '', 'rm_version' => 'Remove versão', @@ -1064,38 +1129,38 @@ URL: [url]', 'role' => 'Tipo de Perfil', 'role_admin' => 'Administrador', 'role_guest' => 'Convidado', -'role_info' => '', -'role_management' => '', -'role_name' => '', -'role_type' => '', +'role_info' => 'Informação', +'role_management' => 'Gerenciamento de papéis', +'role_name' => 'Nome', +'role_type' => 'Tipo de papel', 'role_user' => 'Usuário', 'ro_RO' => 'Romeno', -'run_subworkflow' => 'Executar sub fluxo de trabalho', -'run_subworkflow_email_body' => 'Sub fluxo de trabalho foi iniciado +'run_subworkflow' => 'Executar sub-fluxo de trabalho', +'run_subworkflow_email_body' => 'Sub-fluxo de trabalho foi iniciado Documento: [nome] Versão: [version] Fluxo de Trabalho: [workflow] -Sub fluxo de trabalho: [subworkflow] +Sub-fluxo de trabalho: [subworkflow] Pasta mãe: [folder_path] Usuário: [username] URL: [url]', -'run_subworkflow_email_subject' => '[sitename]: [name] - Sub fluxo de trabalho foi iniciado', +'run_subworkflow_email_subject' => '[sitename]: [name] - Sub-fluxo de trabalho foi iniciado', 'ru_RU' => 'Russo', -'saturday' => 'Saturday', +'saturday' => 'Sábado', 'saturday_abbr' => 'Sa', 'save' => 'Salvar', -'scheduler_class' => '', -'scheduler_class_description' => '', -'scheduler_class_parameter' => '', -'scheduler_class_tasks' => '', -'scheduler_task_mgr' => '', +'scheduler_class' => 'Classe', +'scheduler_class_description' => 'Descrição', +'scheduler_class_parameter' => 'Parâmetro', +'scheduler_class_tasks' => 'Tarefas de classe', +'scheduler_task_mgr' => 'Agendador', 'search' => 'Busca', 'search_fulltext' => 'Pesquisa em texto completo', 'search_in' => 'Busca em', 'search_mode_and' => 'todas as palavras', 'search_mode_documents' => 'Só Documentos', 'search_mode_folders' => 'Só Pastas', -'search_mode_or' => 'at least one word', +'search_mode_or' => 'pelo menos uma palavra', 'search_no_results' => 'não há documento que satisfaçam sua busca', 'search_query' => 'Busca por', 'search_report' => 'Encontrados [count] documentos', @@ -1103,91 +1168,96 @@ URL: [url]', 'search_resultmode' => 'Resultados da Busca', 'search_resultmode_both' => 'Documentos e Pastas', 'search_results' => 'Resultados da busca', -'search_results_access_filtered' => 'Search results may contain content to which access has been denied.', -'search_time' => 'Tempo decorrido: [time] sec.', +'search_results_access_filtered' => 'Os resultados da pesquisa podem conter conteúdo ao qual o acesso foi negado.', +'search_time' => 'Tempo decorrido: [time] seg.', 'seconds' => 'segundos', -'selection' => 'Selection', -'select_attrdefgrp_show' => '', -'select_attribute_value' => '', +'selection' => 'Seleção', +'select_attrdefgrp_show' => 'Escolha quando mostrar', +'select_attribute_value' => 'Selecione o valor do atributo', 'select_category' => 'Clique para selecionar a categoria', 'select_group' => 'Selecione o grupo', 'select_groups' => 'Clique para selecionar os grupos', 'select_grp_approvers' => 'Clique para selecionar o grupo aprovador', -'select_grp_ind_approvers' => '', -'select_grp_ind_notification' => '', -'select_grp_ind_recipients' => '', -'select_grp_ind_reviewers' => '', -'select_grp_ind_revisors' => '', +'select_grp_ind_approvers' => 'Clique para selecionar o grupo', +'select_grp_ind_notification' => 'Clique para selecionar o grupo de notificações', +'select_grp_ind_recipients' => 'Clique para selecionar o grupo de destinatários', +'select_grp_ind_reviewers' => 'Clique para selecionar o grupo de avaliadores', +'select_grp_ind_revisors' => 'Clique para selecionar o grupo de revisores', 'select_grp_notification' => 'Click para selecionar um grupo a ser notificado', -'select_grp_recipients' => '', +'select_grp_recipients' => 'Clique para selecionar grupo de destinatários', 'select_grp_reviewers' => 'Clique para selecionar o grupo revisor', -'select_grp_revisors' => '', +'select_grp_revisors' => 'Clique para selecionar o grupo de revisores', 'select_ind_approvers' => 'Clique para selecionar aprovador indivídual', 'select_ind_notification' => 'Click para selecionar notificações individuais', -'select_ind_recipients' => '', +'select_ind_recipients' => 'Clique para selecionar destinatários individuais', 'select_ind_reviewers' => 'Clique para selecionar revisor individual', -'select_ind_revisors' => '', +'select_ind_revisors' => 'Clique para selecionar revisores individuais', 'select_one' => 'Selecione um', 'select_user' => 'Selecione o usuário', 'select_users' => 'Clique para selecionar os usuários', 'select_value' => 'Selecionar opção', 'select_workflow' => 'Selecione o fluxo de trabalho', -'send_email' => '', -'send_login_data' => '', -'send_login_data_body' => '', -'send_login_data_subject' => '', +'send_email' => 'Enviar e-mail', +'send_login_data' => 'Enviar informações de login', +'send_login_data_body' => 'Login data + +Login: [login] +Nome: [username] + +[comment]', +'send_login_data_subject' => '[sitename]: [login] - Suas informações para login', 'send_test_mail' => 'Enviar email de teste', -'september' => 'September', +'september' => 'Setembro', 'sequence' => 'Sequência', 'seq_after' => 'Depois "[prevname]"', 'seq_end' => 'No final', 'seq_keep' => 'Manter posição', 'seq_start' => 'Primeira posição', -'sessions' => '', -'setDateFromFile' => '', -'setDateFromFolder' => '', +'sessions' => 'Usuários online', +'setDateFromFile' => 'Assumir a data do arquivo importado', +'setDateFromFolder' => 'Assumir a data da pasta importada', 'settings' => 'Configurações', 'settings_activate_module' => 'Ativar módulo', 'settings_activate_php_extension' => 'Ativar extensão PHP', 'settings_adminIP' => 'IP Administrador', 'settings_adminIP_desc' => 'Se definido administrador pode entrar apenas por endereço IP especificado, deixe em branco para evitar o controle. NOTA: só funciona com Autenticação local (não LDAP)', 'settings_Advanced' => 'Avançado', -'settings_advancedAcl' => '', -'settings_advancedAcl_desc' => '', -'settings_allowChangeRevAppInProcess' => '', -'settings_allowChangeRevAppInProcess_desc' => '', -'settings_allowReviewerOnly' => '', -'settings_allowReviewerOnly_desc' => '', +'settings_advancedAcl' => 'Controle de acesso avançado', +'settings_advancedAcl_desc' => 'O controle de acesso avançado permitirá ligar / desligar determinados módulos do software. Não pode ser usado para direitos de acesso em documentos e pastas.', +'settings_allowChangeRevAppInProcess' => 'Permitir alteração do revisor / aprovador após o início do processo', +'settings_allowChangeRevAppInProcess_desc' => 'Por padrão, os revisores e aprovadores não podem mais ser alterados depois que uma revisão ou aprovação for enviada. Essa opção permitirá que os administradores façam isso, desde que o documento não seja liberado ou rejeitado.', +'settings_allowReviewerOnly' => 'Permitir definir apenas o revisor', +'settings_allowReviewerOnly_desc' => 'Habilitar se for permitido definir apenas um revisor, mas nenhum aprovador no modo de fluxo de trabalho tradicional.', 'settings_apache_mod_rewrite' => 'Apache - Módulo Rewrite', 'settings_Authentication' => 'Definições de autenticação', 'settings_autoLoginUser' => 'Login automático', -'settings_autoLoginUser_desc' => '', +'settings_autoLoginUser_desc' => 'Use esse ID de usuário para acessos se o usuário ainda não tiver efetuado login. Esse acesso não criará uma sessão.', 'settings_available_languages' => 'Idiomas disponíveis', 'settings_available_languages_desc' => 'Apenas os idiomas selecionados serão carregados e mostrados no seletor de idioma. O idioma padrão sempre será carregado.', -'settings_backupDir' => '', -'settings_backupDir_desc' => '', +'settings_backupDir' => 'Diretório de backup', +'settings_backupDir_desc' => 'Diretório onde a ferramenta de backup salva backups. Se esse diretório não estiver definido ou não puder ser acessado, os backups serão salvos no diretório de conteúdo.', 'settings_cacheDir' => 'Diretório de cache', 'settings_cacheDir_desc' => 'Onde as imagens de visualização são armazenadas (melhor escolher um diretório que não é acessível através de seu web-server)', 'settings_Calendar' => 'Configurações do calendário', 'settings_calendarDefaultView' => 'Visualização Calendário Padrão', 'settings_calendarDefaultView_desc' => 'Visualização calendário padrão', 'settings_cannot_disable' => 'Arquivo ENABLE_INSTALL_TOOL não pode ser eliminado', -'settings_checkOutDir' => '', -'settings_checkOutDir_desc' => '', -'settings_cmdTimeout' => '', -'settings_cmdTimeout_desc' => '', +'settings_checkOutDir' => 'Diretório para documentos retirados', +'settings_checkOutDir_desc' => 'Esse é o diretório em que o conteúdo mais recente de um documento é copiado se o documento estiver com estado de retirado. Se você tornar esse diretório acessível para os usuários, eles poderão editar o arquivo e registrá-lo novamente quando terminar.', +'settings_cmdTimeout' => 'Tempo limite para comandos externos', +'settings_cmdTimeout_desc' => 'This duration in seconds determines when an external command (e.g. for creating the full text index) will be terminated.', 'settings_contentDir' => 'Diretório de conteúdo', 'settings_contentDir_desc' => 'Onde arquivos enviados são armazenados (melhor escolher um diretório que não é acessível através de seu web-server)', 'settings_contentOffsetDir' => 'Pasta de Compensação de Conteúdo', 'settings_contentOffsetDir_desc' => 'Para contornar as limitações do sistema de arquivos subjacente, uma nova estrutura de diretórios foi concebida que existe dentro do diretório de conteúdo (Content Directory). Isso requer um diretório base para começar. Normalmente, deixe Isso para a configuração padrão, 1048576, mas pode ser qualquer número ou cadeia de caracteres que ainda não existe dentro (Diretório de conteúdo)', -'settings_convertToPdf' => 'Converte o PDF para visualização', +'settings_convertToPdf' => 'Converter o documento em PDF para visualização', 'settings_convertToPdf_desc' => 'Se um documento não puder ser mostrado pelo navegador, uma versão em PDF será mostrada.', 'settings_cookieLifetime' => 'Tempo de Vida dos Cookies', 'settings_cookieLifetime_desc' => 'O tempo de vida de um cookie em segundos. Se definido como 0, o cookie será removido quando o navegador é fechado.', 'settings_coreDir' => 'Diretório Núcleo do SeedDMS', 'settings_coreDir_desc' => 'Caminho para SeedDMS_Core (opcional). Deixe em branco se você tiver instalado SeedDMS_Core em um lugar onde ele pode ser encontrado por PHP, por exemplo, Extra PHP Include-Path', -'settings_createCheckOutDir' => '', -'settings_createCheckOutDir_desc' => '', +'settings_createCheckOutDir' => 'Criar um diretório de retirada', +'settings_createCheckOutDir_desc' => 'Criar um diretório de retirada se não existir', 'settings_createdatabase' => 'Criar tabelas de banco de dados', 'settings_createdirectory' => 'Criar diretório', 'settings_currentvalue' => 'Valor atual', @@ -1203,14 +1273,14 @@ URL: [url]', 'settings_dbUser' => 'Nome do usuário', 'settings_dbUser_desc' => 'O nome de usuário para acesso ao banco de dados, informado durante o processo de instalação. Não edite campo a menos que seja absolutamente necessário, por exemplo, a transferência do banco de dados para um novo host.', 'settings_dbVersion' => 'Esquema de banco de dados muito antigo', -'settings_defaultAccessDocs' => '', -'settings_defaultAccessDocs_desc' => '', -'settings_defaultDocPosition' => '', -'settings_defaultDocPosition_desc' => '', -'settings_defaultDocPosition_val_end' => '', -'settings_defaultDocPosition_val_start' => '', +'settings_defaultAccessDocs' => 'Acesso padrão para novos documentos', +'settings_defaultAccessDocs_desc' => 'Quando um novo documento é criado, esse será o direito de acesso padrão.', +'settings_defaultDocPosition' => 'Posição do documento quando criado', +'settings_defaultDocPosition_desc' => 'Esta é a posição padrão dentro de uma pasta quando um documento é criado.', +'settings_defaultDocPosition_val_end' => 'fim', +'settings_defaultDocPosition_val_start' => 'início', 'settings_defaultSearchMethod' => 'Forma padrão para buscas', -'settings_defaultSearchMethod_desc' => '', +'settings_defaultSearchMethod_desc' => 'Método de pesquisa padrão, quando uma pesquisa é iniciada pelo formulário de pesquisa no menu principal.', 'settings_defaultSearchMethod_valdatabase' => 'Banco de Dados', 'settings_defaultSearchMethod_valfulltext' => 'texto completo', 'settings_delete_install_folder' => 'Para utilizar SeedDMS, você deve excluir o arquivo ENABLE_INSTALL_TOOL do diretório de configuração', @@ -1223,82 +1293,82 @@ URL: [url]', 'settings_Edition' => 'Configurações Edição', 'settings_editOnlineFileTypes' => 'Editar online os tipos de arquivos', 'settings_editOnlineFileTypes_desc' => 'Arquivos com as seguintes extensões podem ser editados online (use somente letras minúsculas)', -'settings_enable2FactorAuthentication' => '', -'settings_enable2FactorAuthentication_desc' => '', +'settings_enable2FactorAuthentication' => 'Ativar autenticação de dois fatores', +'settings_enable2FactorAuthentication_desc' => 'Ativar/desativar a autenticação de 2 fatores. Os usuários precisarão do Google Authenticator em seu celular.', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', -'settings_enableAdminReceipt' => '', -'settings_enableAdminReceipt_desc' => '', +'settings_enableAdminReceipt' => 'Permitir a recepção de documentos para administradores', +'settings_enableAdminReceipt_desc' => 'Ativar se você quiser que os administradores sejam listados como destinatários de documentos.', 'settings_enableAdminRevApp' => 'Permitir revisão/aprovação para administradores', 'settings_enableAdminRevApp_desc' => 'Ative esta opção se quiser que os administradores sejam listados como revisores/aprovadores e para transições de fluxo de trabalho.', 'settings_enableCalendar' => 'Habilitar Calendário', -'settings_enableCalendar_desc' => 'Habilitar/desabilitar calendário', +'settings_enableCalendar_desc' => 'Habilitar/Desabilitar calendário', 'settings_enableClipboard' => 'Habilitar Área de Transferência', -'settings_enableClipboard_desc' => 'Habilitar/desabilitar a área de transferência', -'settings_enableConverting' => 'Ativar Convertendo', -'settings_enableConverting_desc' => 'Ativar/dasativar conversão de arquivos', -'settings_enableDropFolderList' => '', -'settings_enableDropFolderList_desc' => '', +'settings_enableClipboard_desc' => 'Habilitar/Desabilitar a área de transferência', +'settings_enableConverting' => 'Ativar conversão', +'settings_enableConverting_desc' => 'Ativar/desativar conversão de arquivos', +'settings_enableDropFolderList' => 'Ativar lista de arquivos na pasta suspensa no menu', +'settings_enableDropFolderList_desc' => 'Ativar uma lista de arquivos na pasta suspensa. A lista é mostrada no menu principal.', 'settings_enableDropUpload' => 'Habilitar Upload Rápido', 'settings_enableDropUpload_desc' => 'Habilitar / Desabilitar a área na página \'Vista de Pastas\' para upload de arquivos por Arrastar e Soltar.', 'settings_enableDuplicateDocNames' => 'Permitir nomes duplicados de documento', 'settings_enableDuplicateDocNames_desc' => 'Permite ter nomes de documentos duplicados em uma pasta.', 'settings_enableEmail' => 'Ativar E-mail', 'settings_enableEmail_desc' => 'Ativar/desativar a notificação de e-mail automático', -'settings_enableFilterReceipt' => '', -'settings_enableFilterReceipt_desc' => '', +'settings_enableFilterReceipt' => 'Filtrar dono, revisor, ... da lista de recepção', +'settings_enableFilterReceipt_desc' => 'Ativar para filtrar alguns destinatários de uma lista de recepção, se os membros de um grupo estiverem selecionados.', 'settings_enableFolderTree' => 'Ativar Árvore de Pasta', 'settings_enableFolderTree_desc' => 'Falso para não mostrar a árvore de pastas', 'settings_enableFullSearch' => 'Ativar Pesquisa de texto completo', 'settings_enableFullSearch_desc' => 'Ativar Pesquisa de texto completo', 'settings_enableGuestAutoLogin' => 'Habilitar auto acesso para visitante', -'settings_enableGuestAutoLogin_desc' => '', +'settings_enableGuestAutoLogin_desc' => 'Se um login de convidado e login automático estiver ativado, o convidado será conectado automaticamente.', 'settings_enableGuestLogin' => 'Ativar Login de Visitante', 'settings_enableGuestLogin_desc' => 'Se você quiser quiser permitir login como convidado, marque esta opção. Nota: login de convidado deve ser usado apenas em um ambiente de confiança', -'settings_enableHelp' => 'Abilitar Ajuda', +'settings_enableHelp' => 'Habilitar Ajuda', 'settings_enableHelp_desc' => 'Ativar/desativar o link para telas de ajuda no menu', 'settings_enableLanguageSelector' => 'Ativar Seletor de Idioma', 'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login.', 'settings_enableLargeFileUpload' => 'Ativar envio de grandes arquivos', 'settings_enableLargeFileUpload_desc' => 'Se selecionado, o upload de arquivo também estará disponível através de um applet java chamado jumploader sem limite de tamanho de arquivo definido pelo navegador. Ele também permite fazer o upload de vários arquivos de uma só vez.', -'settings_enableMenuTasks' => '', -'settings_enableMenuTasks_desc' => '', -'settings_enableMultiUpload' => '', -'settings_enableMultiUpload_desc' => '', +'settings_enableMenuTasks' => 'Ativar lista de tarefas no menu', +'settings_enableMenuTasks_desc' => 'Ativar / desativar o item de menu que contém todas as tarefas do usuário. Contém documentos que precisam ser revisados, aprovados etc.', +'settings_enableMultiUpload' => 'Permitir envio de vários arquivos', +'settings_enableMultiUpload_desc' => 'Ao criar um novo documento, vários arquivos podem ser enviados. Cada um criará um novo documento.', 'settings_enableNotificationAppRev' => 'Habilitar notificações revisor/aprovador', 'settings_enableNotificationAppRev_desc' => 'Verificar o envio de uma notificação para o revisor/aprovador quando uma nova versão do documento for adicionada', -'settings_enableNotificationWorkflow' => '', -'settings_enableNotificationWorkflow_desc' => '', +'settings_enableNotificationWorkflow' => 'Enviar notificação aos usuários na próxima transição de fluxo de trabalho', +'settings_enableNotificationWorkflow_desc' => 'Se essa opção for ativada, os usuários e grupos que precisam executar uma ação na próxima transição de fluxo de trabalho serão notificados. Mesmo que eles não tenham adicionado uma notificação para o documento.', 'settings_enableOwnerNotification' => 'Habilitar notificações ao proprietário por padrão', 'settings_enableOwnerNotification_desc' => 'Verifique se há adição de uma notificação para o proprietário, se um documento for adicionado.', -'settings_enableOwnerReceipt' => '', -'settings_enableOwnerReceipt_desc' => '', +'settings_enableOwnerReceipt' => 'Permitir a recepção de documentos pelo proprietário', +'settings_enableOwnerReceipt_desc' => 'Ative isto se você quiser que o proprietário de um documento seja listado como um destinatário.', 'settings_enableOwnerRevApp' => 'Permitir revisão/aprovação para o proprietário', 'settings_enableOwnerRevApp_desc' => 'Habilite esta opção se quiser que o proprietário de um documento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.', -'settings_enablePasswordForgotten' => 'Ativar Senhas esquecidas', +'settings_enablePasswordForgotten' => 'Habilitar senha esquecida', 'settings_enablePasswordForgotten_desc' => 'Se você quiser permitir o usuário definir uma nova senha e enviá-la por e-mail, marque esta opção.', -'settings_enableReceiptReject' => '', -'settings_enableReceiptReject_desc' => '', -'settings_enableReceiptWorkflow' => '', -'settings_enableReceiptWorkflow_desc' => '', +'settings_enableReceiptReject' => 'Habilitar rejeição de entradas', +'settings_enableReceiptReject_desc' => 'Habilitar para ativar a rejeição de entradas.', +'settings_enableReceiptWorkflow' => 'Ativar reconhecimento de entrada de documento', +'settings_enableReceiptWorkflow_desc' => 'Habilitar para ativar o fluxo de trabalho para confirmar a entrada do documento.', 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva', 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva proceáando as pastas e contando eáes documentos e pastas que o usuário tem permissão de acesso.', -'settings_enableRevisionOnVoteReject' => '', -'settings_enableRevisionOnVoteReject_desc' => '', -'settings_enableRevisionWorkflow' => '', -'settings_enableRevisionWorkflow_desc' => '', -'settings_enableSelfReceipt' => '', -'settings_enableSelfReceipt_desc' => '', +'settings_enableRevisionOnVoteReject' => 'Rejeitar por um revisor', +'settings_enableRevisionOnVoteReject_desc' => 'Se definido, o documento será rejeitado se um revisor rejeitar o documento.', +'settings_enableRevisionWorkflow' => 'Habilitar revisão de documentos', +'settings_enableRevisionWorkflow_desc' => 'Habilitar para poder executar o fluxo de trabalho para revisar um documento após um determinado período de tempo.', +'settings_enableSelfReceipt' => 'Permitir a recepção de documentos para usuário conectado', +'settings_enableSelfReceipt_desc' => 'Habilitar isto se você quiser que o usuário atualmente logado seja listado como destinatário de um documento.', 'settings_enableSelfRevApp' => 'Permitir revisão/aprovação para usuário conectado', 'settings_enableSelfRevApp_desc' => 'Habilite esta opção se quiser que o usuário conectado no momento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.', -'settings_enableSessionList' => '', -'settings_enableSessionList_desc' => '', +'settings_enableSessionList' => 'Habilitar lista de usuários on-line no menu', +'settings_enableSessionList_desc' => 'Habilitar lista de usuários atualmente conectados no menu.', 'settings_enableThemeSelector' => 'Seleção de tema', 'settings_enableThemeSelector_desc' => 'Liga/desliga o seletor de tema na página de login.', -'settings_enableUpdateReceipt' => '', -'settings_enableUpdateReceipt_desc' => '', -'settings_enableUpdateRevApp' => '', -'settings_enableUpdateRevApp_desc' => '', +'settings_enableUpdateReceipt' => 'Permitir edição de entrada existente', +'settings_enableUpdateReceipt_desc' => 'Habilite isso se o usuário que fez uma recepção puder alterar a decisão.', +'settings_enableUpdateRevApp' => 'Permitir edição de revisão / aprovação existente', +'settings_enableUpdateRevApp_desc' => 'Habilite isso se o usuário que fez uma revisão / aprovação puder alterar a decisão, desde que a etapa atual do fluxo de trabalho não tenha sido concluída.', 'settings_enableUserImage' => 'Ativar Imagem de Usuário', 'settings_enableUserImage_desc' => 'Ativar Imagens de Usuários', 'settings_enableUsersView' => 'Ativar Usuários Visualizar', @@ -1306,11 +1376,11 @@ URL: [url]', 'settings_enableVersionDeletion' => 'Ativar exclusão de versões anteriores', 'settings_enableVersionDeletion_desc' => 'Ativar/desativar a exclusão de versões de documentos anteriores por usuários regulares. Administrador pode sempre apagar versões antigas.', 'settings_enableVersionModification' => 'Ativar modificação de versões', -'settings_enableVersionModification_desc' => 'Ativar/desativar a modificação de versões de documentos por usuários comuns, depois que uma versão foi enviada. Administrador pode sempre modificar a versão após o upload.', -'settings_enableWebdavReplaceDoc' => '', -'settings_enableWebdavReplaceDoc_desc' => '', -'settings_enableXsendfile' => '', -'settings_enableXsendfile_desc' => '', +'settings_enableVersionModification_desc' => 'Ativar/desativar a modificação de versões de documentos por usuários comuns, depois que uma versão foi enviada. Administrador pode sempre modificar a versão após o envio.', +'settings_enableWebdavReplaceDoc' => 'Substituir documento ao salvar', +'settings_enableWebdavReplaceDoc_desc' => 'Se ativado, salvar uma nova versão de um documento substituirá o documento antigo em vez de criar uma nova versão. Isso só será aplicado se o usuário, o tipo MIME e o nome do arquivo forem iguais à última versão. Isso pode ser útil quando os aplicativos salvam automaticamente um documento em intervalos fixos.', +'settings_enableXsendfile' => 'Usar o módulo xsendfile do apache', +'settings_enableXsendfile_desc' => 'Se esta opção estiver configurada e o módulo xsendfile do apache estiver instalado, ela será usada para entregar imagens.', 'settings_encryptionKey' => 'Chave de criptografia', 'settings_encryptionKey_desc' => 'Esta cadeia é usada para a criação de um identificador único a ser adicionado como um campo oculto para formular, a fim de evitar ataques CSRF.', 'settings_error' => 'Erro', @@ -1324,7 +1394,7 @@ URL: [url]', 'settings_extraPath_desc' => 'Caminho para o software adicional. Este é o diretório que contém, por exemplo, o diretório adodb ou pacotes adicionais em pear', 'settings_firstDayOfWeek' => 'Primeiro dia da semana', 'settings_firstDayOfWeek_desc' => 'Primeiro dia da semana', -'settings_footNote' => 'Nota de Pé', +'settings_footNote' => 'Nota de rodapé', 'settings_footNote_desc' => 'Mensagem a ser exibida na parte inferior de cada página', 'settings_fullSearchEngine' => 'Motor de texto', 'settings_fullSearchEngine_desc' => 'Selecione o método utilizado para a busca textual', @@ -1334,12 +1404,12 @@ URL: [url]', 'settings_guestID_desc' => 'ID do usuário-convidado usada quando conectado como convidado (na maioria das vezes não há necessidade de mudar)', 'settings_httpRoot' => 'Raiz Http', 'settings_httpRoot_desc' => 'O caminho relativo na URL, após a parte do domínio. Não inclua o prefixo http:// ou o nome do host. por exemplo Se a URL completa é http://www.example.com/seeddms/, definir \'/seeddms/\'. Se a URL é http://www.example.com/, definir \'/\'', -'settings_incItemsPerPage' => '', -'settings_incItemsPerPage_desc' => '', -'settings_initialDocumentStatus' => '', -'settings_initialDocumentStatus_desc' => '', -'settings_initialDocumentStatus_draft' => '', -'settings_initialDocumentStatus_released' => '', +'settings_incItemsPerPage' => 'Número de entradas carregadas no final da página', +'settings_incItemsPerPage_desc' => 'Se o número de pastas e documentos for limitado, isso definirá o número de objetos carregados adicionalmente ao rolar para baixo até a parte inferior da página da pasta de visualização. Configurar para 0, carregará o mesmo número de objetos que foi carregado inicialmente.', +'settings_initialDocumentStatus' => 'Estado do documento inicial', +'settings_initialDocumentStatus_desc' => 'Este estado será definido quando um documento for adicionado.', +'settings_initialDocumentStatus_draft' => 'Rascunho', +'settings_initialDocumentStatus_released' => 'liberada', 'settings_installADOdb' => 'Instalar ADOdb', 'settings_install_disabled' => 'O arquivo ENABLE_INSTALL_TOOL foi excluído. Agora você pode entrar em SeedDMS e fazer outras configurações.', 'settings_install_pear_package_log' => 'Instalar o Pacote pear \'Log\'', @@ -1350,8 +1420,8 @@ URL: [url]', 'settings_install_zendframework' => 'Instalar Zend Framework, se você pretende usar o motor de pesquisa de texto completo', 'settings_language' => 'Idioma padrão', 'settings_language_desc' => 'Idioma Padrão (nome de uma subpasta na pasta "languages")', -'settings_libraryFolder' => '', -'settings_libraryFolder_desc' => '', +'settings_libraryFolder' => 'Pasta da biblioteca', +'settings_libraryFolder_desc' => 'Pasta onde os documentos podem ser copiados para criar novos documentos.', 'settings_logFileEnable' => 'Ativar Log File', 'settings_logFileEnable_desc' => 'Ativar/Dasativar arquivo log', 'settings_logFileRotation' => 'Rotação do Arquivo Log', @@ -1362,34 +1432,34 @@ URL: [url]', 'settings_luceneClassDir_desc' => 'Caminho para SeedDMS_Lucene (opcional). Deixe em branco se você tiver instalado SeedDMS_Lucene em um lugar onde ele pode ser encontrado por PHP, por exemplo, PHP extras incluem-Path', 'settings_luceneDir' => 'Diretório para o índice de texto completo', 'settings_luceneDir_desc' => 'Caminho para o índice Lucene', -'settings_maxDirID' => 'Max Diretório ID', +'settings_maxDirID' => 'ID máxima de diretório', 'settings_maxDirID_desc' => 'O número máximo de sub-diretórios por diretório mãe. Padrão: 0.', -'settings_maxExecutionTime' => 'Max Tempo de Execução (s)', -'settings_maxExecutionTime_desc' => 'Isso define o tempo máximo em segundos que é permitido executar antes de ser finalizado pelo parse', -'settings_maxItemsPerPage' => '', -'settings_maxItemsPerPage_desc' => '', +'settings_maxExecutionTime' => 'Tempo máximo de execução (s)', +'settings_maxExecutionTime_desc' => 'Isso define o tempo máximo em segundos que é permitido executar antes de ser finalizado pelo parse.', +'settings_maxItemsPerPage' => 'Número máximo de entradas em uma página', +'settings_maxItemsPerPage_desc' => 'Restringe o número de pastas e documentos mostrados na página da pasta de visualização. Outros objetos serão carregados ao rolar para o final da página. Defina como 0 para sempre mostrar todos os objetos.', 'settings_maxRecursiveCount' => 'Max. número de contagem de documentos/pasta recursiva', 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.', -'settings_maxSizeForFullText' => '', -'settings_maxSizeForFullText_desc' => '', +'settings_maxSizeForFullText' => 'Tamanho máximo de arquivo para indexação instantânea', +'settings_maxSizeForFullText_desc' => 'Toda a nova versão do documento menor que o tamanho configurado será totalmente indexada logo após o envio. Em todos os outros casos, apenas os metadados serão indexados.', 'settings_maxUploadSize' => 'Tamanho máximo para arquivos enviados.', -'settings_maxUploadSize_desc' => '', +'settings_maxUploadSize_desc' => 'Esse é o tamanho máximo dos arquivos enviados. Ele terá efeito para versões de documentos e anexos.', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', 'settings_no_content_dir' => 'Diretório de conteúdo', 'settings_overrideMimeType' => 'Substituir MimeType', -'settings_overrideMimeType_desc' => '', +'settings_overrideMimeType_desc' => 'Substitua o MimeType entregue pelo navegador, se um arquivo for carregado. O novo MimeType é determinado pelo próprio SeedDMS.', 'settings_partitionSize' => 'Tamanho de arquivo parcial', 'settings_partitionSize_desc' => 'Tamanho dos arquivos parciais em bytes, enviados por jumploader. Não defina um valor maior do que o tamanho máximo de carregamento definido pelo servidor.', 'settings_passwordExpiration' => 'Expiração de senha', 'settings_passwordExpiration_desc' => 'O número de dias após o qual a senha expira e deve ser reajustada. 0 desliga a expiração da senha.', 'settings_passwordHistory' => 'Histórico de senha', -'settings_passwordHistory_desc' => 'O número de senhas que um usuário deve ter sido usado antes que uma senha pode ser reutilizada. 0 transforma o histórico de senhas Desligado.', -'settings_passwordStrength' => 'Min. força da senha', +'settings_passwordHistory_desc' => 'O número de senhas que um usuário deve ter usado antes que uma senha possa ser reutilizada. 0 transforma o histórico de senhas Desligado.', +'settings_passwordStrength' => 'Força mínima da senha', 'settings_passwordStrengthAlgorithm' => 'Algoritmo para a força da senha', -'settings_passwordStrengthAlgorithm_desc' => 'O algoritmo utilizado para o cálculo da força da senha. O algoritmo "simples" apenas verifica se há pelo menos oito caracteres totais, uma letra minúscula, uma letra maiúscula, um número e um caractere especial. Se essas condições forem satisfeitas a pontuação retornada é 100 caso contrário 0.', +'settings_passwordStrengthAlgorithm_desc' => 'O algoritmo utilizado para o cálculo da força da senha. O algoritmo "simples" apenas verifica se há pelo menos oito caracteres totais, uma letra minúscula, uma letra maiúscula, um número e um caractere especial. Se essas condições forem satisfeitas a pontuação retornada é 100, caso contrário é 0.', 'settings_passwordStrengthAlgorithm_valadvanced' => 'avançada', 'settings_passwordStrengthAlgorithm_valsimple' => 'simples', 'settings_passwordStrength_desc' => 'A força mínima de senha é um valor inteiro de 0 a 100. Defini-lo para 0 irá desativar a verificação para a força mínima senha.', @@ -1401,23 +1471,23 @@ URL: [url]', 'settings_php_mbstring' => 'Extensão PHP : php_mbstring', 'settings_php_version' => 'Versão PHP', 'settings_presetExpirationDate' => 'Data de Expiração Pré-Definida', -'settings_presetExpirationDate_desc' => '', +'settings_presetExpirationDate_desc' => 'Todos os novos documentos enviados terão uma data de expiração definida para esse valor. A data introduzida pode ser especificada como entendida pela função strtotime() do PHP, por ex. +5 semanas', 'settings_previewWidthDetail' => 'Largura de imagens de visualização (detalhe)', 'settings_previewWidthDetail_desc' => 'Largura imagem de visualização mostrados na página de detalhes', -'settings_previewWidthDropFolderList' => '', -'settings_previewWidthDropFolderList_desc' => '', +'settings_previewWidthDropFolderList' => 'Largura das imagens de pré-visualização (lista de pastas suspensas)', +'settings_previewWidthDropFolderList_desc' => 'Largura das imagens de visualização mostradas na lista ao selecionar um arquivo da pasta suspensa.', 'settings_previewWidthList' => 'Largura de imagens de visualização (lista)', 'settings_previewWidthList_desc' => 'Largura de imagens de visualização mostrados em listas', -'settings_previewWidthMenuList' => '', -'settings_previewWidthMenuList_desc' => '', +'settings_previewWidthMenuList' => 'Largura das imagens de pré-visualização (lista de menus)', +'settings_previewWidthMenuList_desc' => 'Largura das imagens de visualização mostradas como itens no menu da pasta suspensa.', 'settings_printDisclaimer' => 'Imprimir Responsabilidade', -'settings_printDisclaimer_desc' => 'Se for verdade a mensagem de aviso de isenção os arquivos lang.inc será impresso na parte inferior da página', +'settings_printDisclaimer_desc' => 'Se ativado, a mensagem de aviso de responsabilidade será mostrada na parte inferior de todas as páginas.', 'settings_quota' => 'Quota do Usuário', -'settings_quota_desc' => 'O número máximo de bytes que um utilizador pode usar no disco. Defina para 0 para o espaço em disco ilimitado. Este valor pode ser substituído para cada uso em seu perfil.', -'settings_removeFromDropFolder' => '', -'settings_removeFromDropFolder_desc' => '', -'settings_repositoryUrl' => '', -'settings_repositoryUrl_desc' => '', +'settings_quota_desc' => 'O número máximo de bytes que um utilizador pode usar no disco. Defina para 0 para o espaço em disco ilimitado. Este valor pode ser substituído para cada usuário em seu perfil.', +'settings_removeFromDropFolder' => 'Remover arquivo da pasta suspensa após o upload bem-sucedido', +'settings_removeFromDropFolder_desc' => 'Habilite isso, se um arquivo retirado da pasta suspensa for apagado após o envio bem-sucedido.', +'settings_repositoryUrl' => 'URL do repositório', +'settings_repositoryUrl_desc' => 'URL do repositório para extensões', 'settings_restricted' => 'acesso restrito', 'settings_restricted_desc' => 'Só permitir que os usuários façam login se eles têm uma entrada no banco de dados local (independentemente de autenticação bem-sucedida com LDAP)', 'settings_rootDir' => 'Diretório raiz', @@ -1427,11 +1497,11 @@ URL: [url]', 'settings_SaveError' => 'Erro no arquivo de configuração salvo', 'settings_Server' => 'Configuraçoes do servidor', 'settings_showFullPreview' => 'Mostra o documento completo', -'settings_showFullPreview_desc' => '', +'settings_showFullPreview_desc' => 'Ativar / desativar uma visualização completa do documento na página de detalhes, se o navegador for capaz de fazer isso.', 'settings_showMissingTranslations' => 'Mostrar traduções em falta', 'settings_showMissingTranslations_desc' => 'Listar todas as traduções faltando na página na parte inferior da página. O usuário conectado será capaz de apresentar uma proposta para uma tradução em falta que serão salvos em um arquivo CSV. Não ativar eáa função, se em um ambiente de produção!', -'settings_showSingleSearchHit' => '', -'settings_showSingleSearchHit_desc' => '', +'settings_showSingleSearchHit' => 'Ir direto para o único item de pesquisa', +'settings_showSingleSearchHit_desc' => 'Se a pesquisa resultar em apenas um item, ela será exibida imediatamente, em vez da lista de resultados.', 'settings_Site' => 'Site', 'settings_siteDefaultPage' => 'Página Padrão do Site', 'settings_siteDefaultPage_desc' => 'Página padrão no login. Se os padrões estiverem vazios para out/out.ViewFolder.php', @@ -1445,7 +1515,7 @@ URL: [url]', 'settings_smtpSendFrom' => 'Enviar a partir de', 'settings_smtpSendFrom_desc' => 'Enviar a partir de', 'settings_smtpSendTestMail' => 'Enviar email de teste', -'settings_smtpSendTestMail_desc' => '', +'settings_smtpSendTestMail_desc' => 'Envia um email de teste, para verificar a configuração atual do email.', 'settings_smtpServer' => 'Hostname do servidor SMTP', 'settings_smtpServer_desc' => 'Hostname do servidor SMTP', 'settings_smtpUser' => 'Usuário do servidor SMTP', @@ -1459,26 +1529,26 @@ URL: [url]', 'settings_sortUsersInList_desc' => 'Define se os usuários em menus de seleção são ordenados por login, ou por seu nome completo', 'settings_sortUsersInList_val_fullname' => 'Ordenar por nome completo', 'settings_sortUsersInList_val_login' => 'Ordenar por login', -'settings_stagingDir' => 'Diretório para uploads parciais', -'settings_stagingDir_desc' => 'O diretório onde jumploader coloca as partes de um upload de arquivo antes de ser colocado de volta juntos.', -'settings_start_install' => 'Inicializar a instalação', +'settings_stagingDir' => 'Diretório para envios parciais', +'settings_stagingDir_desc' => 'O diretório onde jumploader coloca as partes de um envio de arquivo antes de ser colocado de volta juntos.', +'settings_start_install' => 'Iniciar a instalação', 'settings_stopWordsFile' => 'Caminho para parar arquivo palavras', 'settings_stopWordsFile_desc' => 'Se a pesquisa de texto completo está habilitado, este arquivo irá conter palavras de parada que não está sendo indexado', 'settings_strictFormCheck' => 'Formulário de Verificação Rigorosa', 'settings_strictFormCheck_desc' => 'Verificação de forma rigorosa. Se definido como verdadeiro, então todos os campos do formulário serão verificados por um valor. Se for definido como falso, então (a maioria) comentários e campos de palavra-chave tornar facultativo. Comentários são sempre necessários quando enviar um comentário ou substituindo status do documento', -'settings_suggestionvalue' => 'Valor Sugestão', +'settings_suggestionvalue' => 'Valor da sugestão', 'settings_System' => 'Sistema', -'settings_tasksInMenu' => '', -'settings_tasksInMenu_approval' => '', -'settings_tasksInMenu_desc' => '', -'settings_tasksInMenu_needscorrection' => '', -'settings_tasksInMenu_receipt' => '', -'settings_tasksInMenu_review' => '', -'settings_tasksInMenu_revision' => '', -'settings_tasksInMenu_workflow' => '', +'settings_tasksInMenu' => 'Tarefas selecionadas', +'settings_tasksInMenu_approval' => 'Aprovações', +'settings_tasksInMenu_desc' => 'Selecione as tarefas que devem ser contadas. Se nenhuma for selecionado, todas as tarefas serão contadas.', +'settings_tasksInMenu_needscorrection' => 'Correção necessária', +'settings_tasksInMenu_receipt' => 'Recibos', +'settings_tasksInMenu_review' => 'Avaliações', +'settings_tasksInMenu_revision' => 'Revisões', +'settings_tasksInMenu_workflow' => 'Fluxo de trabalho', 'settings_theme' => 'Tema padrão', -'settings_theme_desc' => 'Estilo padrão (nome de uma subpasta na pasta "styles")', -'settings_titleDisplayHack' => 'Título Exibir Hack', +'settings_theme_desc' => 'Estilo padrão (nome de uma subpasta na pasta "estilos")', +'settings_titleDisplayHack' => 'Hack de exibição de título', 'settings_titleDisplayHack_desc' => 'Solução para os títulos das páginas que vão ao longo de mais de duas linhas.', 'settings_undelUserIds' => 'IDs de usuário não deletável', 'settings_undelUserIds_desc' => 'Lista de ID de usuários que não podem ser excluídos, separados por vírgula.', @@ -1491,7 +1561,7 @@ URL: [url]', 'settings_versiontolow' => 'Versão para baixo', 'settings_viewOnlineFileTypes' => 'Ver Tipos de arquivo on-line', 'settings_viewOnlineFileTypes_desc' => 'Os arquivos com uma das seguintes terminações podem ser visualizados on-line (use somente caracteres minúsculos)', -'settings_webdav' => '', +'settings_webdav' => 'WebDAV', 'settings_workflowMode' => 'Modo de fluxo de trabalho', 'settings_workflowMode_desc' => 'O fluxo de trabalho avançado permite especificar seu próprio fluxo de trabalho de liberação de versões de documentos.', 'settings_workflowMode_valadvanced' => 'avançado', @@ -1499,8 +1569,8 @@ URL: [url]', 'settings_workflowMode_valtraditional_only_approval' => 'tradicional (sem revisão)', 'settings_zendframework' => 'Zend Framework', 'set_expiry' => 'Configurar Expiração', -'set_owner' => 'Define proprietário', -'set_owner_error' => 'Proprietário configuração de erro', +'set_owner' => 'Definir proprietário', +'set_owner_error' => 'Erro ao definir proprietário', 'set_password' => 'Definir Senha', 'set_workflow' => 'Definir fluxo de trabalho', 'show_extension_changelog' => 'Mostrar Changelog', @@ -1510,224 +1580,227 @@ URL: [url]', 'sign_out' => 'Sair', 'sign_out_user' => 'Sair usuário', 'sk_SK' => 'Eslovaco', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Space used on data folder', 'splash_added_to_clipboard' => 'Adicionado a área de transferência', -'splash_add_access' => '', +'splash_add_access' => 'Direito de acesso adicionado', 'splash_add_attribute' => 'Novo atributo adicionado', 'splash_add_group' => 'Novo grupo adicionado', 'splash_add_group_member' => 'Novo membro do grupo adicionado', -'splash_add_role' => '', -'splash_add_to_transmittal' => '', -'splash_add_transmittal' => '', +'splash_add_role' => 'Novo papel adicionado', +'splash_add_to_transmittal' => 'Adicionar à transmissão', +'splash_add_transmittal' => 'Transmissão adicionada', 'splash_add_user' => 'Novo usuário adicionado', -'splash_cleared_cache' => '', -'splash_cleared_clipboard' => 'Área de transferência limpada', -'splash_delete_access' => '', +'splash_cleared_cache' => 'Cache limpo', +'splash_cleared_clipboard' => 'Área de transferência limpa', +'splash_delete_access' => 'Direito de acesso removido', 'splash_document_added' => 'Documento inserido', -'splash_document_checkedout' => '', +'splash_document_checkedout' => 'Documento retirado', 'splash_document_edited' => 'Documento salvo', -'splash_document_indexed' => '', +'splash_document_indexed' => 'Documento \'[name]\' indexado.', 'splash_document_locked' => 'Documento bloqueado', 'splash_document_unlocked' => 'Documento desbloqueado', -'splash_edit_access' => '', +'splash_edit_access' => 'Direito de acesso alterado', 'splash_edit_attribute' => 'Atributo salvo', -'splash_edit_event' => '', +'splash_edit_event' => 'Evento salvo', 'splash_edit_group' => 'Grupo salvo', -'splash_edit_role' => '', -'splash_edit_task' => '', +'splash_edit_role' => 'Papel salvo', +'splash_edit_task' => 'Tarefa salva', 'splash_edit_user' => 'Usuário salvo', -'splash_error_add_to_transmittal' => '', -'splash_error_rm_download_link' => '', -'splash_error_send_download_link' => '', -'splash_extension_getlist' => '', -'splash_extension_import' => '', -'splash_extension_refresh' => '', -'splash_extension_upload' => '', +'splash_error_add_to_transmittal' => 'Erro ao adicionar documento à transmissão', +'splash_error_rm_download_link' => 'Erro ao remover o link de download', +'splash_error_send_download_link' => 'Erro ao enviar o link de download', +'splash_extension_getlist' => 'Lista atualizada de extensões do repositório', +'splash_extension_import' => 'Extensão instalada', +'splash_extension_refresh' => 'Lista atualizada de extensões', +'splash_extension_upload' => 'Extensão instalada', 'splash_folder_edited' => 'Salvar modificação de pastas', -'splash_importfs' => '', -'splash_inherit_access' => '', +'splash_importfs' => 'Documentos [docs] e pastas [folders] importados', +'splash_inherit_access' => 'O direito de acesso será herdado', 'splash_invalid_folder_id' => 'ID de pasta inválida', 'splash_invalid_searchterm' => 'Termo de pesquisa inválido', 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente', -'splash_move_document' => '', -'splash_move_folder' => '', -'splash_notinherit_access' => '', -'splash_receipt_update_success' => '', +'splash_move_document' => 'Documento movido', +'splash_move_folder' => 'Pasta movida', +'splash_notinherit_access' => 'Direitos de acesso não herdados', +'splash_receipt_update_success' => 'Recepção adicionada com sucesso', 'splash_removed_from_clipboard' => 'Remover da área de transferência', 'splash_rm_attribute' => 'Atributo removido', -'splash_rm_attr_value' => '', +'splash_rm_attr_value' => 'Valor de atributo removido', 'splash_rm_document' => 'Documento removido', -'splash_rm_download_link' => '', +'splash_rm_download_link' => 'Link de download removido', 'splash_rm_folder' => 'Pasta excluida', 'splash_rm_group' => 'Grupo removido', 'splash_rm_group_member' => 'Membro do grupo removido', -'splash_rm_role' => '', -'splash_rm_transmittal' => '', +'splash_rm_role' => 'Papel removido', +'splash_rm_transmittal' => 'Transmissão excluída', 'splash_rm_user' => 'Usuário removido', -'splash_rm_user_processes' => '', -'splash_rm_workflow' => '', -'splash_rm_workflow_action' => '', -'splash_rm_workflow_state' => '', -'splash_saved_file' => '', -'splash_save_user_data' => '', -'splash_send_download_link' => '', -'splash_send_login_data' => '', -'splash_setowner' => '', +'splash_rm_user_processes' => 'Usuário removido de todos os processos', +'splash_rm_workflow' => 'Fluxo de trabalho removido', +'splash_rm_workflow_action' => 'Ação de fluxo de trabalho removida', +'splash_rm_workflow_state' => 'Estado do fluxo de trabalho removido', +'splash_saved_file' => 'Versão salva', +'splash_save_user_data' => 'Dados do usuário salvos', +'splash_send_download_link' => 'Link de download enviado por email.', +'splash_send_login_data' => 'Dados de login enviados', +'splash_setowner' => 'Definir novo dono', 'splash_settings_saved' => 'Configurações salvas', -'splash_set_default_access' => '', +'splash_set_default_access' => 'Conjunto de direitos de acesso padrão', 'splash_substituted_user' => 'Usuário substituido', 'splash_switched_back_user' => 'Comutada de volta ao usuário original', 'splash_toogle_group_manager' => 'Gerente Grupo alternado', -'splash_transfer_document' => '', -'splash_transfer_objects' => '', -'splash_trigger_workflow' => '', +'splash_transfer_document' => 'Documento transferido', +'splash_transfer_objects' => 'Objetos transferidos', +'splash_trigger_workflow' => 'Acionada transição do fluxo de trabalho', 'state_and_next_state' => 'Estado/Próximo estado', 'statistic' => 'Estatística', 'status' => 'Status', -'status_approval_rejected' => '', -'status_approved' => 'Approved', -'status_approver_removed' => 'Approver removed from proceá', -'status_needs_correction' => '', -'status_not_approved' => 'Not approved', -'status_not_receipted' => '', +'status_approval_rejected' => 'Rascunho rejeitado', +'status_approved' => 'Aprovado', +'status_approver_removed' => 'Aprovador removido do processo', +'status_needs_correction' => 'Precisa de correção', +'status_not_approved' => 'Não aprovado', +'status_not_receipted' => 'Ainda não recebido', 'status_not_reviewed' => 'Não revisado', -'status_not_revised' => '', -'status_receipted' => '', -'status_receipt_rejected' => '', -'status_recipient_removed' => '', -'status_reviewed' => '', -'status_reviewer_rejected' => '', +'status_not_revised' => 'não revisado', +'status_receipted' => 'Recebido', +'status_receipt_rejected' => 'Rejeitado', +'status_recipient_removed' => 'Destinatário removido da lista', +'status_reviewed' => 'Revisado', +'status_reviewer_rejected' => 'Rascunho rejeitado', 'status_reviewer_removed' => 'Revisor removido do processo', -'status_revised' => '', -'status_revision_rejected' => '', -'status_revision_sleeping' => '', -'status_revisor_removed' => '', -'status_unknown' => 'Unknown', +'status_revised' => 'revisado', +'status_revision_rejected' => 'Rejeitado', +'status_revision_sleeping' => 'pendente', +'status_revisor_removed' => 'Revisor removido da lista', +'status_unknown' => 'Desconhecido', 'storage_size' => 'Tamanho de armazenamento', -'submit_2_fact_auth' => '', -'submit_approval' => '', +'submit_2_fact_auth' => 'Salvar segredo', +'submit_approval' => 'Enviar aprovação', 'submit_login' => 'Entrar', 'submit_password' => 'Definir uma nova senha', 'submit_password_forgotten' => 'Iniciar processo', -'submit_receipt' => '', -'submit_review' => '', -'submit_revision' => '', +'submit_receipt' => 'Enviar recibo', +'submit_review' => 'Enviar revisão', +'submit_revision' => 'Adicionar revisão', 'submit_userinfo' => 'Submeter informação', -'subsribe_timelinefeed' => '', -'substitute_to_user' => '', +'subsribe_timelinefeed' => 'Inscrever-se no feed de linha do tempo', +'substitute_to_user' => 'Mudar para \'[username]\'', 'substitute_user' => 'Substituto do usuário', -'success_add_aro' => '', -'success_add_permission' => '', -'success_remove_permission' => '', -'success_toogle_permission' => '', -'sunday' => 'Sunday', -'sunday_abbr' => 'Su', +'success_add_aro' => 'Objeto de solicitação de acesso adicionado', +'success_add_permission' => 'Permissão adicionada', +'success_remove_permission' => 'Permissão removida', +'success_toogle_permission' => 'Permissão alterada', +'sunday' => 'Domingo', +'sunday_abbr' => 'Do', 'sv_SE' => 'Sueco', 'switched_to' => 'Comutado para', -'takeOverAttributeValue' => '', -'takeOverGrpApprover' => '', +'takeOverAttributeValue' => 'Assuma o valor do atributo da última versão', +'takeOverGrpApprover' => 'Assuma o grupo de aprovadores da última versão.', 'takeOverGrpReviewer' => 'Assuma o grupo de revisores da última versão.', -'takeOverIndApprover' => '', -'takeOverIndReviewer' => '', -'tasks' => '', -'task_description' => '', -'task_disabled' => '', -'task_frequency' => '', -'task_last_run' => '', -'task_name' => '', -'task_next_run' => '', +'takeOverIndApprover' => 'Assumir o aprovador individual da última versão.', +'takeOverIndReviewer' => 'Assuma o revisor individual da última versão.', +'tasks' => 'Tarefas', +'task_description' => 'Descrição', +'task_disabled' => 'Desativado', +'task_frequency' => 'Frequência', +'task_last_run' => 'Última execução', +'task_name' => 'Nome', +'task_next_run' => 'Próxima execução', 'temp_jscode' => 'Código javascript temporário', -'testmail_body' => 'Este e-mail é apenas para testar a configuração de correio de SeedDMS', -'testmail_subject' => 'Email Teste', +'testmail_body' => 'Este e-mail é apenas para testar a configuração de email de SeedDMS', +'testmail_subject' => 'Teste de Email', 'theme' => 'Tema', -'thursday' => 'Thursday', -'thursday_abbr' => 'Th', +'thursday' => 'Quinta-feira', +'thursday_abbr' => 'Qi', 'timeline' => 'Linha do Tempo', 'timeline_add_file' => 'Novo anexo', -'timeline_add_version' => '', -'timeline_full_add_file' => '', -'timeline_full_add_version' => '', -'timeline_full_scheduled_revision' => '', -'timeline_full_status_change' => '', -'timeline_scheduled_revision' => '', -'timeline_selected_item' => '', +'timeline_add_version' => 'Nova versão [version]', +'timeline_full_add_file' => '[document]
        Novo Anexo', +'timeline_full_add_version' => '[document]
        Nova versão [version]', +'timeline_full_scheduled_revision' => '[document]
        Revisão da versão [version]', +'timeline_full_status_change' => '[document]
        Versão [version]: [status]', +'timeline_scheduled_revision' => 'Revisão da versão [version]', +'timeline_selected_item' => 'Documento selecionado', 'timeline_skip_add_file' => 'anexo adicionado', -'timeline_skip_scheduled_revision' => '', +'timeline_skip_scheduled_revision' => 'Revisão agendada', 'timeline_skip_status_change_-1' => 'rejeitado', 'timeline_skip_status_change_-3' => 'expirado', 'timeline_skip_status_change_0' => 'revisão pendente', 'timeline_skip_status_change_1' => 'aprovação pendente', 'timeline_skip_status_change_2' => 'liberado', 'timeline_skip_status_change_3' => 'dentro do fluxo de trabalho', -'timeline_skip_status_change_4' => '', -'timeline_skip_status_change_5' => '', +'timeline_skip_status_change_4' => 'em revisão', +'timeline_skip_status_change_5' => 'rascunho', 'timeline_status_change' => 'Versão [versão]: [estado]', -'to' => 'To', -'toggle_manager' => 'Toggle manager', -'toggle_qrcode' => '', +'to' => 'Para', +'toggle_manager' => 'Alternar gerente', +'toggle_qrcode' => 'Mostrar / ocultar o código QR', 'to_before_from' => 'A data de término não pode ser anterior a data de início', 'transfer_document' => 'Transferir documento', 'transfer_no_read_access' => 'O usuário não possui acesso de leitura na pasta', 'transfer_no_write_access' => 'O usuário não possui acesso de escrita na pasta', -'transfer_objects' => '', -'transfer_objects_to_user' => '', -'transfer_to_user' => '', +'transfer_objects' => 'Transferir objetos', +'transfer_objects_to_user' => 'Novo proprietário', +'transfer_to_user' => 'Transferir para o usuário', 'transition_triggered_email' => 'Transição de fluxo de trabalho desencadeado', -'transition_triggered_email_body' => 'Transição do fluxo de trabalho triggered -Document: [name] -Version: [version] -Comment: [comment] -Workflow: [workflow] -Previous estado: [previous_state] -Current estado: [current_state] -Parent pasta: [folder_path] -User: [username] +'transition_triggered_email_body' => 'Transição do fluxo de trabalho acionada +Documento: [name] +Versão: [version] +Comentário: [comment] +Fluxo de trabalho: [workflow] +Estado anterior: [previous_state] +Estado atual: [current_state] +Pasta mãe: [folder_path] +Usuário: [username] URL: [url]', 'transition_triggered_email_subject' => '[sitename]: [name] - Transição de fluxo de trabalho desencadeado', -'transmittal' => '', -'transmittalitem_removed' => '', -'transmittalitem_updated' => '', -'transmittal_comment' => '', -'transmittal_name' => '', -'transmittal_size' => '', +'transmittal' => 'Transmissão', +'transmittalitem_removed' => 'Item de transmissão removido', +'transmittalitem_updated' => 'Documento atualizado para a versão mais recente', +'transmittal_comment' => 'Comentário', +'transmittal_name' => 'Nome', +'transmittal_size' => 'Tamanho', 'tree_loading' => 'Aguarde, a estrutura de diretórios está sendo carregada...', 'trigger_workflow' => 'Fluxo de trabalho', 'tr_TR' => 'Turco', -'tuesday' => 'Tuesday', -'tuesday_abbr' => 'Tu', +'tuesday' => 'Terça-feira', +'tuesday_abbr' => 'Te', 'type_of_hook' => '', 'type_to_search' => 'Tipo de pesquisa', 'uk_UA' => 'Ucraniano', 'under_folder' => 'Na pasta', 'unknown_attrdef' => 'Definição de atributo desconhecido', -'unknown_command' => 'Command not recognized.', +'unknown_command' => 'Comando não reconhecido.', 'unknown_document_category' => 'Categoria desconhecida', -'unknown_group' => 'Unknown group id', -'unknown_id' => 'unknown id', -'unknown_keyword_category' => 'Unknown category', -'unknown_owner' => 'Unknown owner id', -'unknown_user' => 'Unknown user id', +'unknown_group' => 'ID de grupo desconhecido', +'unknown_id' => 'ID desconhecido', +'unknown_keyword_category' => 'Categoria desconhecida', +'unknown_owner' => 'ID do proprietário desconhecida', +'unknown_user' => 'ID do usuário desconhecida', 'unlinked_content' => 'Conteúdo não conectado', 'unlinked_documents' => 'Documentos não conectados', 'unlinked_folders' => 'Pastas não conectadas', 'unlinking_objects' => 'Conteúdos não conectados', -'unlock_cause_access_mode_all' => 'você pode atualizá-lo, porque voc tem mode de acesso "all". Trava será automaticamente removida.', -'unlock_cause_locking_user' => 'você pode pode atualizá-lo, porque você o travou também. Trava será automaticamente removida.', +'unlock_cause_access_mode_all' => 'Você ainda pode atualizá-lo porque tem o modo de acesso "todos". A trava será automaticamente removida.', +'unlock_cause_locking_user' => 'Você pode pode atualizá-lo, porque você o travou também. A trava será automaticamente removida.', 'unlock_document' => 'Remover trava', -'update' => 'Update', -'update_approvers' => 'Update List of Approvers', +'update' => 'Atualizar', +'update_approvers' => 'Atualizar lista de aprovadores', 'update_document' => 'Atualizar', 'update_fulltext_index' => 'Índice de atualização de texto completo', -'update_info' => 'Update Information', +'update_info' => 'Atualizar informação', 'update_locked_msg' => 'Este documento está travado.', -'update_recipients' => '', -'update_reviewers' => 'Update List of Reviewers', -'update_revisors' => '', -'update_transmittalitem' => '', +'update_recipients' => 'Atualizar lista de destinatários', +'update_reviewers' => 'Atualizar lista de revisores', +'update_revisors' => 'Atualizar lista de reenviados', +'update_transmittalitem' => 'Atualize para a versão mais recente do documento', 'uploaded_by' => 'Inserido por', 'uploading_failed' => 'Inserção falhou. Por favor contacte o administrador', -'uploading_maxsize' => 'O arquivo excede o tamanho máximo permitido para upload.', -'uploading_zerosize' => 'Upload de um arquivo vazio. Upload é cancelado.', +'uploading_maxsize' => 'O arquivo excede o tamanho máximo permitido para envio.', +'uploading_zerosize' => 'Envio de um arquivo vazio. Envio cancelado.', 'used_discspace' => 'Espaço em disco usado', 'user' => 'Usuário', 'userid_groupid' => 'Id do Usuário/Id do Grupo', @@ -1735,7 +1808,7 @@ URL: [url]', 'users_and_groups' => 'Usuários/Grupos', 'users_done_work' => 'Usuários trabalho concluído', 'user_exists' => 'Usuário já existe.', -'user_group' => '', +'user_group' => 'Usuário/Grupo', 'user_group_management' => 'Gerenciamento Usuários/Grupos', 'user_image' => 'Imagem', 'user_info' => 'Perfil do usuário', @@ -1746,49 +1819,49 @@ URL: [url]', 'use_comment_of_document' => 'Utilize comentário de documento', 'use_default_categories' => 'Utilize categorias predefinidas', 'use_default_keywords' => 'Use palavras-chave pré-definidas', -'valid_till' => '', +'valid_till' => 'Válido até', 'version' => 'Versão', -'versioning_file_creation' => 'Versioning file creation', -'versioning_file_creation_warning' => 'With this operation you can create a file containing the versioning information of an entire DMS folder. After the creation every file will be saved inside the document folder.', +'versioning_file_creation' => 'Criação de arquivos de versão', +'versioning_file_creation_warning' => 'Com esta operação, você pode criar um arquivo contendo as informações de versão de uma pasta DMS inteira. Após a criação, todos os arquivos serão salvos dentro da pasta do documento.', 'versioning_info' => 'Informação de versionamento', 'versiontolow' => 'Versão para baixo', 'version_deleted_email' => 'Versão eliminado', -'version_deleted_email_body' => 'Versão deleted -Document: [name] -Version: [version] -Parent pasta: [folder_path] -User: [username] +'version_deleted_email_body' => 'Versão apagada +Documento: [name] +Versão: [version] +Pasta mãe: [folder_path] +Usuário: [username] URL: [url]', 'version_deleted_email_subject' => '[sitename]: [name] - Versão eliminada', 'version_info' => 'Informações da versão', 'view' => 'Visualizar', 'view_online' => 'Ver on-line', -'warning' => 'Warning', -'wednesday' => 'Wednesday', -'wednesday_abbr' => 'We', +'warning' => 'Aviso', +'wednesday' => 'Quarta-feira', +'wednesday_abbr' => 'Qa', 'weeks' => 'semanas', 'week_view' => 'Visualização semanal', 'workflow' => 'Fluxo de trabalho', -'workflows_involded' => '', +'workflows_involded' => 'Envolvido no fluxo de trabalho', 'workflow_actions_management' => 'Gestão de fluxo de trabalho ações', 'workflow_action_in_use' => 'Esta ação é usado atualmente por fluxos de trabalho.', 'workflow_action_name' => 'Nome', 'workflow_editor' => 'Editor de Fluxo de trabalho', 'workflow_group_summary' => 'Sumário do grupo', -'workflow_has_cycle' => '', +'workflow_has_cycle' => 'Fluxo de trabalho tem ciclo', 'workflow_initstate' => 'Estado inicial', 'workflow_in_use' => 'Esse fluxo de trabalho é usado atualmente por documentos.', -'workflow_layoutdata_saved' => '', +'workflow_layoutdata_saved' => 'Dados de layout salvos', 'workflow_management' => 'Gestão de fluxo de trabalho', 'workflow_name' => 'Nome', -'workflow_no_doc_rejected_state' => '', -'workflow_no_doc_released_state' => '', -'workflow_no_initial_state' => '', +'workflow_no_doc_rejected_state' => 'O documento não será rejeitado em um estado de fluxo de trabalho!', +'workflow_no_doc_released_state' => 'O documento não será liberado em um estado de fluxo de trabalho!', +'workflow_no_initial_state' => 'Nenhuma das transições começa com o estado inicial do fluxo de trabalho!', 'workflow_no_states' => 'Você deve primeiro definir estados de fluxo de trabalho, antes de adicionar um fluxo de trabalho.', 'workflow_save_layout' => '', -'workflow_state' => '', +'workflow_state' => 'estado do fluxo de trabalho', 'workflow_states_management' => 'Gestão de fluxo de trabalho estados', -'workflow_state_docstatus' => 'Status do documento', +'workflow_state_docstatus' => 'Estado do documento', 'workflow_state_in_use' => 'Este estado está sendo usado por fluxos de trabalho.', 'workflow_state_name' => 'Nome', 'workflow_summary' => 'Sumário de fluxo de trabalho', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index be4274008..0ea5e8553 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1535,6 +1535,9 @@ URL: [url]', 'sign_out' => 'Sign out', 'sign_out_user' => 'Sign out utilizator', 'sk_SK' => 'Slovacă', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Spatiu folosit în folderul de date', 'splash_added_to_clipboard' => 'Adăugat la clipboard', 'splash_add_access' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 4ec0281fe..39cb89aca 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1667) +// Translators: Admin (1668) $text = array( '2_factor_auth' => 'Двухфакторная аутентификация', @@ -711,7 +711,7 @@ URL: [url]', 'linked_documents' => 'Связанные документы', 'linked_files' => 'Приложения', 'linked_to_current_version' => '', -'linked_to_document' => '', +'linked_to_document' => 'Связан с документом', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте другой способ.', 'link_to_version' => '', @@ -1542,6 +1542,9 @@ URL: [url]', 'sign_out' => 'Выйти', 'sign_out_user' => 'Пользовательский выход', 'sk_SK' => 'Slovak', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Размер каталога данных', 'splash_added_to_clipboard' => 'Добавлено в буфер обмена', 'splash_add_access' => '', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 11bb845c7..5630c1c1a 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -1582,6 +1582,9 @@ Meno: [username] 'sign_out' => 'odhlásiť', 'sign_out_user' => 'Odhlásiť používateľa', 'sk_SK' => 'Slovenčina', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Space used on data folder', 'splash_added_to_clipboard' => 'Pridané do schránky', 'splash_add_access' => 'Prístupové právo pridané', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 241beb444..fe7d0a1b5 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1555,6 +1555,9 @@ Kommentar: [comment]', 'sign_out' => 'Logga ut', 'sign_out_user' => 'Logga ut användare', 'sk_SK' => 'Slovakiska', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Utrymme använt i datakatalogen', 'splash_added_to_clipboard' => 'Tillagt till urklipp', 'splash_add_access' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 8b91e8d0a..44185bc4b 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1514,6 +1514,9 @@ URL: [url]', 'sign_out' => 'Çıkış', 'sign_out_user' => 'Kullanıcı hesabından çıkış', 'sk_SK' => 'Slovakça', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Data klasörü kullanılan alan', 'splash_added_to_clipboard' => 'Panoya eklendi', 'splash_add_access' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 211252c90..7baa2cefc 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1334) +// Translators: Admin (1337) $text = array( '2_factor_auth' => '', @@ -332,7 +332,7 @@ URL: [url]', 'documentcontent' => '', 'documents' => 'док.', 'documents_checked_out_by_you' => 'Документи на Опрацюванні у вас', -'documents_expired' => '', +'documents_expired' => 'Застарілі документи', 'documents_in_process' => 'Документи в роботі', 'documents_locked' => 'Заблоковані документи', 'documents_locked_by_you' => 'Документи, які ви заблокували', @@ -866,7 +866,7 @@ URL: [url]', 'only_jpg_user_images' => 'Дозволені лише .jpg-зображення', 'order_by_sequence_off' => 'Можливість ручного сортування відключена в налаштуваннях. Якщо ви хочете використовувати цю функцію, ви повинні знову її включити.', 'original_filename' => 'Початкова назва файлу', -'overall_indexing_progress' => '', +'overall_indexing_progress' => 'Загальне просування індексації"', 'owner' => 'Власник', 'ownership_changed_email' => 'Власника змінено', 'ownership_changed_email_body' => 'Змінено власника @@ -1535,6 +1535,9 @@ URL: [url]', 'sign_out' => 'Вийти', 'sign_out_user' => 'Вихід користувача', 'sk_SK' => 'Slovak', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Розмір каталогу даних', 'splash_added_to_clipboard' => 'Додано до буферу обміну', 'splash_add_access' => '', @@ -1819,7 +1822,7 @@ URL: [url]', 'workflow_summary' => 'Підсумки по процесу', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Підсумки по користувачу', -'x_more_objects' => '', +'x_more_objects' => '[number] більше об\'єктів', 'year_view' => 'Рік', 'yes' => 'Так', 'zh_CN' => 'Chinese (CN)', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index afef9bc37..03bef725f 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (760), archonwang (469), fengjohn (5), yang86 (1) +// Translators: Admin (761), archonwang (469), fengjohn (5), yang86 (1) $text = array( '2_factor_auth' => '双重认证', @@ -1410,7 +1410,7 @@ URL: [url]', 'settings_presetExpirationDate_desc' => '', 'settings_previewWidthDetail' => '缩略图宽度（详情页中)', 'settings_previewWidthDetail_desc' => '详情页面中缩略图的宽度', -'settings_previewWidthDropFolderList' => '', +'settings_previewWidthDropFolderList' => '预览图像的宽度', 'settings_previewWidthDropFolderList_desc' => '', 'settings_previewWidthList' => '缩略图宽度(列表中)', 'settings_previewWidthList_desc' => '列表中缩略图的宽度', @@ -1516,6 +1516,9 @@ URL: [url]', 'sign_out' => '登出', 'sign_out_user' => '退出登录', 'sk_SK' => '斯洛伐克语', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => '数据文件夹使用空间', 'splash_added_to_clipboard' => '已复制', 'splash_add_access' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 7cadae681..c82622635 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -1365,6 +1365,9 @@ URL: [url]', 'sign_out' => '登出', 'sign_out_user' => '', 'sk_SK' => '斯洛伐克語', +'sort_by_date' => '', +'sort_by_name' => '', +'sort_by_sequence' => '', 'space_used_on_data_folder' => '資料檔案夾使用空間', 'splash_added_to_clipboard' => '已複製', 'splash_add_access' => '', From b3a2e0bb32c40f24978e7334416b8d23798d6351 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 11:47:34 +0200 Subject: [PATCH 068/467] search() sorts hits by name --- SeedDMS_Core/Core/inc.ClassDMS.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 83bedf665..c91376e83 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1436,6 +1436,7 @@ class SeedDMS_Core_DMS { if($limit) { $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; } + $searchQuery .= " ORDER BY `tblFolders`.`name`"; // Send the complete search query to the database. $resArr = $this->db->getResultArray($searchQuery); @@ -1675,6 +1676,8 @@ class SeedDMS_Core_DMS { if($limit) $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; + $searchQuery .= " ORDER BY `tblDocuments`.`name`"; + // Send the complete search query to the database. $resArr = $this->db->getResultArray($searchQuery); if($resArr === false) @@ -1683,11 +1686,13 @@ class SeedDMS_Core_DMS { $resArr = array(); } } else { + $searchQuery .= " ORDER BY `tblDocuments`.`name`"; + // Send the complete search query to the database. $resArr = $this->db->getResultArray($searchQuery); if($resArr === false) return false; - } + } // ------------------- Ausgabe der Ergebnisse ---------------------------- $numResults = count($resArr); From e16a5dd46ef52c6a774957a023719c3c7acf4af0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 13:37:16 +0200 Subject: [PATCH 069/467] fix typo in variable name --- out/out.ChangePassword.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/out/out.ChangePassword.php b/out/out.ChangePassword.php index a19768f91..a0885d8eb 100644 --- a/out/out.ChangePassword.php +++ b/out/out.ChangePassword.php @@ -27,9 +27,9 @@ require_once("inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0) - $referui = $_REQUEST["referuri"]; + $referuri = $_REQUEST["referuri"]; else - $referui = ''; + $referuri = ''; if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) { $hash = $_REQUEST["hash"]; @@ -39,10 +39,8 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referui'=>$referui, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referuri'=>$referuri, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength)); if($view) { $view($_GET); exit; } - -?> From 3e4d90fe91ffc8f3eed6f5416d5c273dc302e3f8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 13:38:39 +0200 Subject: [PATCH 070/467] parameters for search() can be an array, add support for sorting the output --- SeedDMS_Core/Core/inc.ClassDMS.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index c91376e83..d636e1f95 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1307,6 +1307,13 @@ class SeedDMS_Core_DMS { * @return array|bool */ function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array()) { /* {{{ */ + if(is_array($query)) { + foreach(array('limit', 'offset', 'logicalmode', 'searchin', 'startFolder', 'owner', 'status', 'creationstartdate', 'creationenddate', 'modificationstartdate', 'modificationenddate', 'categories', 'attributes', 'mode', 'expirationstartdate', 'expirationenddate') as $paramname) + ${$paramname} = isset($query[$paramname]) ? $query[$paramname] : ${$paramname}; + foreach(array('orderby') as $paramname) + ${$paramname} = isset($query[$paramname]) ? $query[$paramname] : ''; + $query = isset($query['query']) ? $query['query'] : ''; + } // Split the search string into constituent keywords. $tkeys=array(); if (strlen($query)>0) { @@ -1436,7 +1443,22 @@ class SeedDMS_Core_DMS { if($limit) { $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; } - $searchQuery .= " ORDER BY `tblFolders`.`name`"; + switch($orderby) { + case 'dd': + $searchQuery .= " ORDER BY `tblFolders`.`date` DESC"; + break; + case 'da': + case 'd': + $searchQuery .= " ORDER BY `tblFolders`.`date`"; + break; + case 'nd': + $searchQuery .= " ORDER BY `tblFolders`.`name` DESC"; + break; + case 'na': + default: + $searchQuery .= " ORDER BY `tblFolders`.`name`"; + break; + } // Send the complete search query to the database. $resArr = $this->db->getResultArray($searchQuery); From b8bc69bb117fa466630dfbc0ed6022a02432f814 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 18:01:53 +0200 Subject: [PATCH 071/467] add sorting by name,date for documents in search() --- SeedDMS_Core/Core/inc.ClassDMS.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index d636e1f95..5a8ca52c0 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1307,6 +1307,7 @@ class SeedDMS_Core_DMS { * @return array|bool */ function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array()) { /* {{{ */ + $orderby = ''; if(is_array($query)) { foreach(array('limit', 'offset', 'logicalmode', 'searchin', 'startFolder', 'owner', 'status', 'creationstartdate', 'creationenddate', 'modificationstartdate', 'modificationenddate', 'categories', 'attributes', 'mode', 'expirationstartdate', 'expirationenddate') as $paramname) ${$paramname} = isset($query[$paramname]) ? $query[$paramname] : ${$paramname}; @@ -1686,6 +1687,23 @@ class SeedDMS_Core_DMS { "`tblDocumentContent`.`version`, ". "`tblDocumentStatusLog`.`status`, `tblDocumentLocks`.`userID` as `lockUser` ".$searchQuery; + switch($orderby) { + case 'dd': + $orderbyQuery = " ORDER BY `tblDocuments`.`date` DESC"; + break; + case 'da': + case 'd': + $orderbyQuery = " ORDER BY `tblDocuments`.`date`"; + break; + case 'nd': + $orderbyQuery = " ORDER BY `tblDocuments`.`name` DESC"; + break; + case 'na': + default: + $orderbyQuery = " ORDER BY `tblDocuments`.`name`"; + break; + } + // calculate the remaining entrїes of the current page // If page is not full yet, get remaining entries if($limit) { @@ -1698,7 +1716,7 @@ class SeedDMS_Core_DMS { if($limit) $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; - $searchQuery .= " ORDER BY `tblDocuments`.`name`"; + $searchQuery .= $orderbyQuery; // Send the complete search query to the database. $resArr = $this->db->getResultArray($searchQuery); @@ -1708,7 +1726,7 @@ class SeedDMS_Core_DMS { $resArr = array(); } } else { - $searchQuery .= " ORDER BY `tblDocuments`.`name`"; + $searchQuery .= $orderbyQuery; // Send the complete search query to the database. $resArr = $this->db->getResultArray($searchQuery); From 86c03d3ee483d43169a2acb9f3c5810dbf205fc3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 18:02:26 +0200 Subject: [PATCH 072/467] check if $orderby is set before using it --- SeedDMS_Core/Core/inc.ClassFolder.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 5a9400197..59dac88d4 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -539,9 +539,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (!isset($this->_subFolders)) { $queryStr = "SELECT * FROM `tblFolders` WHERE `parent` = " . $this->_id; - if ($orderby[0]=="n") $queryStr .= " ORDER BY `name`"; - elseif ($orderby[0]=="s") $queryStr .= " ORDER BY `sequence`"; - elseif ($orderby[0]=="d") $queryStr .= " ORDER BY `date`"; + if ($orderby && $orderby[0]=="n") $queryStr .= " ORDER BY `name`"; + elseif ($orderby && $orderby[0]=="s") $queryStr .= " ORDER BY `sequence`"; + elseif ($orderby && $orderby[0]=="d") $queryStr .= " ORDER BY `date`"; if($dir == 'desc') $queryStr .= " DESC"; if(is_int($limit) && $limit > 0) { @@ -743,9 +743,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (!isset($this->_documents)) { $queryStr = "SELECT * FROM `tblDocuments` WHERE `folder` = " . $this->_id; - if ($orderby[0]=="n") $queryStr .= " ORDER BY `name`"; - elseif($orderby[0]=="s") $queryStr .= " ORDER BY `sequence`"; - elseif($orderby[0]=="d") $queryStr .= " ORDER BY `date`"; + if ($orderby && $orderby[0]=="n") $queryStr .= " ORDER BY `name`"; + elseif($orderby && $orderby[0]=="s") $queryStr .= " ORDER BY `sequence`"; + elseif($orderby && $orderby[0]=="d") $queryStr .= " ORDER BY `date`"; if($dir == 'desc') $queryStr .= " DESC"; if(is_int($limit) && $limit > 0) { From 3ab6d050cd9b6c26da5df31ccf62c22b41eef920 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 18:03:07 +0200 Subject: [PATCH 073/467] pass parameters to search() by array --- out/out.Search.php | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/out/out.Search.php b/out/out.Search.php index e5a7a52ff..8221df5ef 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -171,6 +171,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe $query = ""; } + if (isset($_GET["orderby"]) && is_string($_GET["orderby"])) { + $orderby = $_GET["orderby"]; + } + else { + $orderby = ""; + } + /* Select if only documents (0x01), only folders (0x02) or both (0x03) * are found */ @@ -360,7 +367,26 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe // ---------------- Start searching ----------------------------------------- $startTime = getTime(); - $resArr = $dms->search($query, 0, 0 /*$limit, ($pageNumber-1)*$limit*/, $mode, $searchin, $startFolder, $owner, $status, $creationdate ? $startdate : array(), $creationdate ? $stopdate : array(), array(), array(), $categories, $attributes, $resultmode, $expirationdate ? $expstartdate : array(), $expirationdate ? $expstopdate : array()); + $resArr = $dms->search(array( + 'query'=>$query, + 'limit'=>0, + 'offset'=>0 /*$limit, ($pageNumber-1)*$limit*/, + 'logicalmode'=>$mode, + 'searchin'=>$searchin, + 'startFolder'=>$startFolder, + 'owner'=>$owner, + 'status'=>$status, + 'creationstartdate'=>$creationdate ? $startdate : array(), + 'creationenddate'=>$creationdate ? $stopdate : array(), + 'modificationstartdate'=>array(), + 'modificationenddate'=>array(), + 'categories'=>$categories, + 'attributes'=>$attributes, + 'mode'=>$resultmode, + 'expirationstartdate'=>$expirationdate ? $expstartdate : array(), + 'expirationenddate'=>$expirationdate ? $expstopdate : array(), + 'orderby'=>$orderby + )); $searchTime = getTime() - $startTime; $searchTime = round($searchTime, 2); @@ -409,10 +435,14 @@ if($settings->_showSingleSearchHit && count($entries) == 1) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'query'=>$query, 'searchhits'=>$entries, 'totalpages'=>$totalPages, 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'cachedir'=>$settings->_cacheDir)); if($view) { + $view->setParam('showtree', showtree()); + $view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount); + $view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount); $view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/); $view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/); $view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false); $view->setParam('mode', isset($mode) ? $mode : ''); + $view->setParam('orderby', isset($orderby) ? $orderby : ''); $view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod); $view->setParam('resultmode', isset($resultmode) ? $resultmode : ''); $view->setParam('searchin', isset($searchin) ? $searchin : array()); From 619a1de980844fe524616d961ef9a82dc1549544 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 18:03:36 +0200 Subject: [PATCH 074/467] adding ordering of result for database search --- views/bootstrap/class.Search.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index f844dd070..d5b36979f 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -88,6 +88,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $expirationdate = $this->params['expirationdate']; $status = $this->params['status']; $this->query = $this->params['query']; + $orderby = $this->params['orderby']; $entries = $this->params['searchhits']; $totalpages = $this->params['totalpages']; $pageNumber = $this->params['pagenumber']; @@ -219,7 +220,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
        ".getMLText("name")."".getMLText("name"); + print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; + print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; + print " ".($orderby=="d"||$orderby=="da"?' ':($orderby=="dd"?' ':' ')).""; + print "".getMLText("owner")."".getMLText("status")."".getMLText("version")."
        contentContainerEnd(); -// }}} /* First check if any of the folder filters are set. If it is, * open the accordion. @@ -369,6 +369,9 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
      +
      "; print "\n\n"; print "\n"; - print "".getMLText("name")."\n"; + print "".getMLText("name"); + if(!$fullsearch) { + print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; + $tmp['orderby'] = $orderby=="d"||$orderby=="da)"?"dd":"d"; + print " ".($orderby=="d"||$orderby=="da"?' ':($orderby=="dd"?' ':' ')).""; + } + print "\n"; //print "".getMLText("attributes")."\n"; print "".getMLText("status")."\n"; print "".getMLText("action")."\n"; From b7063fada397d85dd1571a0a42cb1703bf35e558 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 20:39:37 +0200 Subject: [PATCH 075/467] add changes for 5.1.12 --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e3a3fa88e..c99630053 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,8 @@ -------------------------------------------------------------------------------- - fix for CVE-2019-12932 (Persistent or Stored XSS), excaping the search result in the autocompletion search form placed in the header -- folder/document list can be sorted ascending or descending +- folder/document list can be sorted by name, date, sequence (ascending or descending) +- search result can be sorted by name, date (ascending or descending) - do not check for Log.php during installation anymore, it's part of the vendor directory anyway From e8c9fd5e4e932d701d551a39ee17552762bc7ba0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Jun 2019 20:41:19 +0200 Subject: [PATCH 076/467] add changes for 5.1.12 --- SeedDMS_Core/package.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index e742bf36c..440f1c507 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,7 +12,7 @@ uwe@steinmann.cx yes - 2019-06-24 + 2019-06-26 5.1.12 @@ -24,8 +24,8 @@ GPL License -parameter $orderby passed to SeedDMS_Core_Folder::getDocuments() and SeedDMS_Core_Folder::getSubFolders() can be a string, but only the first char is -evaluated + - parameter $orderby passed to SeedDMS_Core_Folder::getDocuments() and SeedDMS_Core_Folder::getSubFolders() can be a string, but only the first char is evaluated + - SeedDMS_Core_DMS::search() excepts parameters as array, added orderby From cf6b85223306c6891d816e2fb82e3c593b642d12 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Jun 2019 14:18:39 +0200 Subject: [PATCH 077/467] do not access $data if there is none --- out/out.Charts.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/out/out.Charts.php b/out/out.Charts.php index 7114ad30f..cb1e73cba 100644 --- a/out/out.Charts.php +++ b/out/out.Charts.php @@ -41,13 +41,14 @@ $type = 'docsperuser'; if(!empty($_GET['type'])) { $type = $_GET['type']; } -$data = $dms->getStatisticalData($type); -switch($type) { - case 'docsperstatus': - foreach($data as &$rec) { - $rec['key'] = getOverallStatusText((int) $rec['key']); - } - break; +if($data = $dms->getStatisticalData($type)) { + switch($type) { + case 'docsperstatus': + foreach($data as &$rec) { + $rec['key'] = getOverallStatusText((int) $rec['key']); + } + break; + } } if($view) { From e0995e362c73e8fd3c5201b012fc53c689a74110 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Jun 2019 14:18:58 +0200 Subject: [PATCH 078/467] initialize $fieldwrap in order to prevent php warnings --- views/bootstrap/class.UpdateDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php index 80e5366dc..a75e27de6 100644 --- a/views/bootstrap/class.UpdateDocument.php +++ b/views/bootstrap/class.UpdateDocument.php @@ -447,7 +447,7 @@ console.log(element); } } } - $fieldwrap = array(); + $fieldwrap = array('', ''); if($tmp) { $fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpReviewers", $tmp)); } @@ -597,7 +597,7 @@ console.log(element); } } } - $fieldwrap = array(); + $fieldwrap = array('', ''); if($tmp) { $fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpApprovers", $tmp)); } From e6b9b15605aa20312102924578368c70e44a8b0e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Jun 2019 14:19:24 +0200 Subject: [PATCH 079/467] init $oldattributes in order to prevent php warnings --- op/op.EditFolder.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 5ced89a82..c2f2afc57 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -70,6 +70,7 @@ $oldcomment = $folder->getComment(); * will just update the old attribute object in array attributes[] and hence * also update the old value */ +$oldattributes = array(); foreach($folder->getAttributes() as $ai=>$aa) $oldattributes[$ai] = clone $aa; From 91ce7f6d6ee35331648712b1315aaca2e263c084 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Jun 2019 15:55:00 +0200 Subject: [PATCH 080/467] fix some typos, new translations --- languages/bg_BG/lang.inc | 8 ++--- languages/de_DE/lang.inc | 72 ++++++++++++++++++++-------------------- languages/fr_FR/lang.inc | 14 ++++---- languages/nl_NL/lang.inc | 6 ++-- languages/tr_TR/lang.inc | 4 +-- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 5b85e6cd1..d45eeed24 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (858) +// Translators: Admin (861) $text = array( '2_factor_auth' => '', @@ -1361,8 +1361,8 @@ $text = array( 'sign_out' => 'изход', 'sign_out_user' => '', 'sk_SK' => 'Словашки', -'sort_by_date' => '', -'sort_by_name' => '', +'sort_by_date' => 'Сортирай по дата"', +'sort_by_name' => 'Сортирай по име', 'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Размер на каталога с данните', 'splash_added_to_clipboard' => 'Добавено към клипборда', @@ -1634,7 +1634,7 @@ $text = array( 'workflow_summary' => 'Резюме за процес', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Резюме за потребител', -'x_more_objects' => '', +'x_more_objects' => 'още [number] документа', 'year_view' => 'годишен изглед', 'yes' => 'Да', 'zh_CN' => 'Китайски (Китай)', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 838f72826..80bf7e43c 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2657), dgrutsch (22) +// Translators: Admin (2684), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -48,7 +48,7 @@ URL: [url]', 'action_approve' => 'Freigeben', 'action_complete' => 'Komplett', 'action_is_complete' => 'Ist komplett', -'action_is_not_complete' => 'Ist Nicht komplett', +'action_is_not_complete' => 'Ist nicht komplett', 'action_reject' => 'Ablehnen', 'action_review' => 'Prüfen', 'action_revise' => 'Erneut prüfen', @@ -86,12 +86,12 @@ URL: [url]', 'all_documents' => 'Alle Dokumente', 'all_pages' => 'Alle', 'all_users' => 'Alle Benutzer', -'already_subscribed' => 'Bereits aboniert', +'already_subscribed' => 'Bereits abonniert', 'and' => 'und', 'apply' => 'Anwenden', 'approvals_accepted' => '[no_approvals] Freigaben', 'approvals_and_reviews_accepted' => '[no_approvals] Freigaben und [no_reviews] Prüfungen', -'approvals_and_reviews_not_touched' => '[no_approvals] offene Freigaben und [no_reviews] offenen Prüfungen', +'approvals_and_reviews_not_touched' => '[no_approvals] offene Freigaben und [no_reviews] offene Prüfungen', 'approvals_and_reviews_rejected' => '[no_approvals] abgelehnte Freigaben und [no_reviews] abgelehnte Prüfungen', 'approvals_not_touched' => '[no_approvals] offene Freigaben', 'approvals_rejected' => '[no_approvals] abgelehnte Freigaben', @@ -131,7 +131,7 @@ URL: [url]', 'approval_update_failed' => 'Störung bei der Aktualisierung des Berechtigungsstatus. Aktualisierung gescheitert', 'approvers' => 'Freigebender', 'approver_already_assigned' => 'Freigeber bereits zugewiesen', -'approver_already_removed' => 'Freigeber wurde bereits aus dem Freigabevorgang entfernt oder hat die Freigabe bereits abgeschlossen', +'approver_already_removed' => 'Freigeber wurde bereits aus dem Freigabevorgang entfernt oder hat die Freigabe bereits abgeschlossen', 'april' => 'April', 'archive' => 'Archiv', 'archive_creation' => 'Archiv erzeugen', @@ -255,7 +255,7 @@ URL: [url]', 'choose_attrdefgroup' => 'Attributgruppe wählen', 'choose_category' => 'Kategorie wählen', 'choose_group' => 'Gruppe wählen', -'choose_role' => 'Role wählen', +'choose_role' => 'Rolle wählen', 'choose_target_category' => 'Kategorie wählen', 'choose_target_document' => 'Dokument wählen', 'choose_target_file' => 'Datei wählen', @@ -276,7 +276,7 @@ URL: [url]', 'comment_for_current_version' => 'Kommentar zur aktuellen Version', 'configure_extension' => 'Erweiterung konfigurieren', 'confirm_clear_cache' => 'Wollen Sie wirklich den Cache löschen? Dies entfernt alle vorberechneten Vorschaubilder.', -'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltextindex neu erzeugen!.', +'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltext-Index neu erzeugen!.', 'confirm_move_document' => 'Dokument wirklich verschieben?', 'confirm_move_folder' => 'Ordner wirklich verschieben?', 'confirm_pwd' => 'Passwort-Bestätigung', @@ -290,7 +290,7 @@ URL: [url]', 'confirm_rm_folder_files' => 'Möchten Sie wirklich alle Dateien und Unterordner des Ordner "[foldername]" löschen?
      Vorsicht: Diese Operation kann nicht rückgängig gemacht werden.', 'confirm_rm_group' => 'Möchten Sie wirklich die Gruppe "[groupname]" löschen?
      Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.', 'confirm_rm_log' => 'Möchten Sie wirklich die Log-Datei "[logname]" löschen?
      Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.', -'confirm_rm_transmittal' => 'Bitte bestätigen Sie as Löschen der Dokumentenliste.', +'confirm_rm_transmittal' => 'Bitte bestätigen Sie das Löschen der Dokumentenliste.', 'confirm_rm_transmittalitem' => 'Löschen bestätigen', 'confirm_rm_user' => 'Möchten Sie wirklich den Benutzer "[username]" löschen?
      Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.', 'confirm_rm_user_from_processes' => 'Möchten Sie wirklich den Benutzer "[username]" aus allen Prozessen löschen?
      Beachten Sie, dass dies möglicherweise in der Freigabe von Dokumenten resultiert, wenn der Benutzer der einzige oder letzte Prüfer ist.', @@ -303,8 +303,8 @@ URL: [url]', 'converter_new_mimetype' => 'Neuer Mime-Type', 'copied_to_checkout_as' => 'Datei am [date] in den Checkout-Space als \'[filename]\' kopiert.', 'create_download_link' => 'Erzeuge Download Link', -'create_fulltext_index' => 'Erzeuge Volltextindex', -'create_fulltext_index_warning' => 'Sie möchten den Volltextindex neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.', +'create_fulltext_index' => 'Erzeuge Volltext-Index', +'create_fulltext_index_warning' => 'Sie möchten den Volltext-Index neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.', 'creation_date' => 'Erstellt am', 'cs_CZ' => 'Tschechisch', 'current_password' => 'Aktuelles Passwort', @@ -332,7 +332,7 @@ URL: [url]', 'documentcontent' => 'Dokumentenversion', 'documents' => 'Dokumente', 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente', -'documents_expired' => 'Abgelaufende Dokumente', +'documents_expired' => 'Abgelaufene Dokumente', 'documents_in_process' => 'Dokumente in Bearbeitung', 'documents_locked' => 'Gesperrte Dokumente', 'documents_locked_by_you' => 'Von mir gesperrte Dokumente', @@ -345,7 +345,7 @@ URL: [url]', 'documents_to_revise' => 'Erneute Prüfung erforderlich', 'documents_to_trigger_workflow' => 'Dokumente im Workflow', 'documents_user_draft' => 'Entwürfe', -'documents_user_expiration' => 'Abgelaufende Dokumente', +'documents_user_expiration' => 'Abgelaufene Dokumente', 'documents_user_needs_correction' => 'Dokumente, die korrigiert werden müssen', 'documents_user_no_reception' => 'Dokumente ohne Empfangsbestätigung', 'documents_user_obsolete' => 'Veraltete Dokumente', @@ -497,7 +497,7 @@ Der Link ist bis zum [valid] gültig. 'en_GB' => 'Englisch (GB)', 'equal_transition_states' => 'Start- und Endstatus ѕind gleich', 'error' => 'Fehler', -'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekt', +'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekts', 'error_add_permission' => 'Fehler beim Hinzufügen der Berechtigung', 'error_cleared_cache' => 'Fehler beim Löschen des Cache', 'error_edit_task' => 'Fehler beim Speichern der Task', @@ -522,7 +522,7 @@ Der Link ist bis zum [valid] gültig. 'exclude_items' => 'Einträge auslassen', 'expired' => 'abgelaufen', 'expired_at_date' => 'Abgelaufen am [datetime]', -'expired_documents' => 'Abgelaufende Dokumente', +'expired_documents' => 'Abgelaufene Dokumente', 'expires' => 'Ablaufdatum', 'expire_by_date' => 'Ablauf nach Datum', 'expire_in_1d' => 'Ablauf in 1 Tag', @@ -613,7 +613,7 @@ URL: [url]', 'from' => 'von', 'fr_FR' => 'Französisch', 'fullsearch' => 'Volltext', -'fullsearch_hint' => 'Volltextindex benutzen', +'fullsearch_hint' => 'Volltext-Index benutzen', 'fulltextsearch_disabled' => 'Volltext-Index ist ausgeschaltet', 'fulltext_converters' => 'Index Dokumentenumwandlung', 'fulltext_info' => 'Volltext-Index Info', @@ -835,7 +835,7 @@ URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [folder_name] - Neuer Ordner', 'new_user_image' => 'Neues Bild', 'next_state' => 'Neuer Status', -'nl_NL' => 'Holländisch', +'nl_NL' => 'Niederländisch', 'no' => 'Nein', 'notify_added_email' => 'Benachrichtigung per Mail wurde eingerichtet', 'notify_added_email_body' => 'Added to notification list @@ -909,22 +909,22 @@ URL: [url]', 'password_expired' => 'Passwort ist abgelaufen', 'password_expires_in_days' => 'Passwort läuft in %s Tagen ab.', 'password_forgotten' => 'Passwort vergessen', -'password_forgotten_email_body' => 'Sehr geehrter Anwender von SeedDMS, - -wir haben einen Anfrage zum Zurücksetzen Ihres Passworts erhalten. - -Dies kann durch den folgenden Link erfolgen: - -[url_prefix]out/out.ChangePassword.php?hash=[hash] - -Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren Sie bitte Ihren Adminstrator', +'password_forgotten_email_body' => 'Sehr geehrter Anwender von SeedDMS, + +wir haben einen Anfrage zum Zurücksetzen Ihres Passworts erhalten. + +Dies kann durch den folgenden Link erfolgen: + +[url_prefix]out/out.ChangePassword.php?hash=[hash] + +Sollen Sie danach immer noch Probleme bei der Anmeldung haben, dann kontaktieren Sie bitte Ihren Adminstrator', 'password_forgotten_email_subject' => '[sitename]: Passwort vergessen', 'password_forgotten_send_hash' => 'Anweisungen zum weiteren Vorgehen wurden an die E-Mail Adresse des Benutzers versandt', 'password_forgotten_text' => 'Füllen Sie bitte untenstehendes Formular aus. Weitere Anweisungen erhalten Sie dann in einer E-Mail die an Sie gesandt wird', 'password_forgotten_title' => 'Passwort gesendet', 'password_repeat' => 'Passwort wiederholen', 'password_send' => 'Passwort verschickt', -'password_send_text' => 'Ihr neues Passwort wurde an die angegebene E-Mail-Adresse versandt, wenn ein Benutzer mit diesem Login und dieser E-Mail-Adresse exitiert. Sollten Sie innerhalb der nächsten Minuten keine E-Mail bekommen, dann überprüfen Sie nochmal die Angaben und wiederholen Sie den Vorgang.', +'password_send_text' => 'Ihr neues Passwort wurde an die angegebene E-Mail-Adresse versandt, wenn ein Benutzer mit diesem Login und dieser E-Mail-Adresse existiert. Sollten Sie innerhalb der nächsten Minuten keine E-Mail bekommen, dann überprüfen Sie nochmal die Angaben und wiederholen Sie den Vorgang.', 'password_strength' => 'Passwortstärke', 'password_strength_insuffient' => 'Ungenügend starkes Passwort', 'password_wrong' => 'Falsches Passwort', @@ -1167,7 +1167,7 @@ URL: [url]', 'search_mode_and' => 'alle Begriffe', 'search_mode_documents' => 'Nur Dokumente', 'search_mode_folders' => 'Nur Ordner', -'search_mode_or' => 'min. ein Begriff', +'search_mode_or' => 'mind. ein Begriff', 'search_no_results' => 'Die Suche lieferte leider keine Treffer.', 'search_query' => 'Suchbegriffe', 'search_report' => 'Die Suche lieferte [doccount] Dokumente und [foldercount] Ordner in [searchtime] Sek.', @@ -1213,7 +1213,7 @@ Name: [username] [comment]', 'send_login_data_subject' => '[sitename]: [login] - Ihre Login-Daten', -'send_test_mail' => 'Sende Test-Email', +'send_test_mail' => 'Sende Test-E-mail', 'september' => 'September', 'sequence' => 'Reihenfolge', 'seq_after' => 'Nach "[prevname]"', @@ -1252,7 +1252,7 @@ Name: [username] 'settings_checkOutDir' => 'Verzeichnis für ausgecheckte Dokumente', 'settings_checkOutDir_desc' => 'Dies ist das Verzeichnis, in das Dokumenteninhalte bei einem Check out kopiert werden. Wenn dieses Verzeichnis für die Benutzer erreichbar ist, können die Dateien editiert und dann wieder eingecheckt werden.', 'settings_cmdTimeout' => 'Timeout für externe Programme', -'settings_cmdTimeout_desc' => 'Diese Zeit in Sekunden legt fest, wann ein externes Programm (z.B. für die Erstellung des Volltextindex) beendet wird.', +'settings_cmdTimeout_desc' => 'Diese Zeit in Sekunden legt fest, wann ein externes Programm (z.B. für die Erstellung des Volltext-Index) beendet wird.', 'settings_contentDir' => 'Content-Verzeichnis', 'settings_contentDir_desc' => 'Verzeichnis, in dem die Dokumente gespeichert werden. Sie sollten ein Verzeichnis wählen, das nicht durch den Web-Server erreichbar ist.', 'settings_contentOffsetDir' => 'Content Offset Directory', @@ -1320,7 +1320,7 @@ Name: [username] 'settings_enableDropUpload_desc' => 'Ein/Ausschalten des Bereichs auf der \'View Folder\' Seite zum Hochladen von Dateien per Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Erlaube doppelte Dokumentennamen', 'settings_enableDuplicateDocNames_desc' => 'Erlaube doppelte Dokumentennamen in einem Ordner.', -'settings_enableEmail' => 'E-mail aktivieren', +'settings_enableEmail' => 'E-Mail aktivieren', 'settings_enableEmail_desc' => 'Automatische E-Mail-Benachrichtigung ein-/ausschalten', 'settings_enableFilterReceipt' => 'Besitzer, Prüfer, ... aus Empfängerliste filtern', 'settings_enableFilterReceipt_desc' => 'Anwählen, um einige Empfänger aus der Liste zu entfernen, wenn diese als Mitglieder einer Gruppe eingetragen werden.', @@ -1437,7 +1437,7 @@ Name: [username] 'settings_loginFailure_desc' => 'Konto nach n Anmeldefehlversuchen sperren.', 'settings_luceneClassDir' => 'Lucene SeedDMS Verzeichnis', 'settings_luceneClassDir_desc' => 'Pfad zum PEAR-Paket SeedDMS_Lucene (optional). Lassen Sie diese Einstellung leer, wenn SeedDMS_Lucene ohnehin von PHP gefunden wird, weil es beispielweise im \'Extra PHP Include-Path\' installiert ist.', -'settings_luceneDir' => 'Verzeichnis für Volltextindex', +'settings_luceneDir' => 'Verzeichnis für Volltext-Index', 'settings_luceneDir_desc' => 'Verzeichnis in dem der Lucene-Index abgelegt wird.', 'settings_maxDirID' => 'Max. Anzahl Unterverzeichnisse', 'settings_maxDirID_desc' => 'Maximale Anzahl der Unterverzeichnisse in einem Verzeichnis. Ändern Sie diesen Wert nur, wenn Sie genau wissen was Sie tun! Voreingestellt ist 0.', @@ -1520,9 +1520,9 @@ Name: [username] 'settings_smtpPort' => 'SMTP Server Port', 'settings_smtpPort_desc' => 'SMTP Server Port, voreingestellt ist 25', 'settings_smtpSendFrom' => 'Absenderadresse', -'settings_smtpSendFrom_desc' => 'Absenderadresse für herausgehende Mails', -'settings_smtpSendTestMail' => 'Sende Testmail', -'settings_smtpSendTestMail_desc' => 'Verschickte eine Testmail, um die akuelle Konfiguration zu testen.', +'settings_smtpSendFrom_desc' => 'Absenderadresse für herausgehende E-Mails', +'settings_smtpSendTestMail' => 'Sende Test-E-Mail', +'settings_smtpSendTestMail_desc' => 'Verschickte eine Test-E-Mail, um die akuelle Konfiguration zu testen.', 'settings_smtpServer' => 'SMTP Server-Hostname', 'settings_smtpServer_desc' => 'SMTP Server-Hostname', 'settings_smtpUser' => 'SMTP Server User', @@ -1717,7 +1717,7 @@ Name: [username] 'task_name' => 'Name', 'task_next_run' => 'Nächste Ausführung', 'temp_jscode' => 'Temporärer Javascript-Code', -'testmail_body' => 'Diese Mail ist lediglich zum Test der Mail-Konfiguration von SeedDMS', +'testmail_body' => 'Diese Mail ist lediglich zum Test der E-Mail-Konfiguration von SeedDMS', 'testmail_subject' => 'Test Mail', 'theme' => 'Aussehen', 'thursday' => 'Donnerstag', @@ -1797,7 +1797,7 @@ URL: [url]', 'update' => 'Aktualisieren', 'update_approvers' => 'Liste der Freigebenden aktualisieren', 'update_document' => 'Aktualisieren', -'update_fulltext_index' => 'Aktualisiere Volltextindex', +'update_fulltext_index' => 'Aktualisiere Volltext-Index', 'update_info' => 'Informationen zur Aktualisierung', 'update_locked_msg' => 'Dieses Dokument wurde gesperrt

      Die Sperrung wurde von [username] eingerichtet.
      ', 'update_recipients' => 'Liste der Empfänger aktualisieren', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 71393d95c..4b15cc841 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (744) +// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (750) $text = array( '2_factor_auth' => 'Authentification forte', @@ -687,7 +687,7 @@ URL: [url]', 'invalid_link_id' => 'Identifiant de lien invalide', 'invalid_request_token' => 'Jeton de demande incorrect', 'invalid_review_status' => 'Statut de vérification invalide', -'invalid_sequence' => 'Valeur de séquence invalide', +'invalid_sequence' => 'Position invalide', 'invalid_status' => 'Statut de document invalide', 'invalid_target_doc_id' => 'Identifiant de document cible invalide', 'invalid_target_folder' => 'Identifiant de dossier cible invalide', @@ -891,7 +891,7 @@ URL: [url]', 'october' => 'Octobre', 'old' => 'Ancien', 'only_jpg_user_images' => 'Images d\'utilisateur au format .jpg seulement', -'order_by_sequence_off' => 'Le tri par séquence est désactivé dans les préférences. Si vous souhaitez que ce paramètre prenne effet, vous devez l\'activer.', +'order_by_sequence_off' => 'Le tri par position est désactivé dans les préférences. Si vous souhaitez que ce paramètre prenne effet, vous devez l’activer.', 'original_filename' => 'Nom de fichier original', 'overall_indexing_progress' => 'Progression globale de l’indexation', 'owner' => 'Propriétaire', @@ -1509,7 +1509,7 @@ Nom : [username] 'settings_sortFoldersDefault' => 'Méthode de tri par défaut des dossiers', 'settings_sortFoldersDefault_desc' => 'Ceci définit les méthodes de tri pour les dossiers et documents dans la vue du dossier.', 'settings_sortFoldersDefault_val_name' => 'Par nom', -'settings_sortFoldersDefault_val_sequence' => 'Par séquence', +'settings_sortFoldersDefault_val_sequence' => 'Par position', 'settings_sortFoldersDefault_val_unsorted' => 'Non trié', 'settings_sortUsersInList' => 'Tri des utilisateurs', 'settings_sortUsersInList_desc' => 'Définit si les utilisateurs dans les menus de sélection sont triés par identifiant ou par nom complet', @@ -1566,9 +1566,9 @@ Nom : [username] 'sign_out' => 'Déconnexion', 'sign_out_user' => 'Déconnecter l\'utilisateur', 'sk_SK' => 'Slovaque', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Trier par date', +'sort_by_name' => 'Trier par nom', +'sort_by_sequence' => 'Trier par position', 'space_used_on_data_folder' => 'Espace utilisé dans le répertoire de données', 'splash_added_to_clipboard' => 'Ajouté au presse-papier', 'splash_add_access' => 'Droits d’accès ajoutés', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index fc6328145..bafc1b108 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (766), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (768), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( '2_factor_auth' => '2-factor-authenticatie', @@ -1558,8 +1558,8 @@ Name: [username] 'sign_out' => 'Log uit', 'sign_out_user' => 'Log gebruiker uit', 'sk_SK' => 'Slowaaks', -'sort_by_date' => '', -'sort_by_name' => '', +'sort_by_date' => 'Sorteren op datum', +'sort_by_name' => 'Sorteren op naam', 'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Gebruikte diskomvang in data map', 'splash_added_to_clipboard' => 'Toegevoegd aan klembord', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 44185bc4b..53b580478 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1082), aydin (83) +// Translators: Admin (1083), aydin (83) $text = array( '2_factor_auth' => '', @@ -918,7 +918,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'preview_plain' => '', 'previous_state' => 'Önceki durum', 'previous_versions' => 'Önceki versiyonlar', -'process' => '', +'process' => 'İşlem', 'process_without_user_group' => '', 'pt_BR' => 'Portekizce', 'quota' => 'Kota', From cc892178841d5ad11adc5989378c1737a2480acd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Jun 2019 18:11:11 +0200 Subject: [PATCH 081/467] include Extension.php and friends to prevent php warnings --- out/out.ChangePassword.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/out/out.ChangePassword.php b/out/out.ChangePassword.php index a0885d8eb..5e3365307 100644 --- a/out/out.ChangePassword.php +++ b/out/out.ChangePassword.php @@ -22,6 +22,9 @@ if(!isset($settings)) require_once("../inc/inc.Settings.php"); require_once("inc/inc.LogInit.php"); require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; From b540f4a1b720fef8b63a38406683fc5169e8d80b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Jun 2019 08:43:37 +0200 Subject: [PATCH 082/467] fix uploaded documents from drop folder --- op/op.AddDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index ec27f46c6..84176ecda 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -262,7 +262,7 @@ $docsource = 'upload'; if($settings->_dropFolderDir) { if(isset($_POST["dropfolderfileform1"]) && $_POST["dropfolderfileform1"]) { - $fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$folder->getID().'/'.$_POST["dropfolderfileform1"]; + $fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"]; if(file_exists($fullfile)) { $docsource = 'dropfolder'; /* Check if a local file is uploaded as well */ From 514bdb88da04735898be861a1b97f594eac17656 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Jun 2019 08:46:31 +0200 Subject: [PATCH 083/467] add entry for 5.1.12 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c99630053..74cb88546 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - search result can be sorted by name, date (ascending or descending) - do not check for Log.php during installation anymore, it's part of the vendor directory anyway +- fix uploading documents from drop folder -------------------------------------------------------------------------------- Changes in version 5.1.11 From c17bd81148f139cd0d2409edad918bbfbaae3f6e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Jun 2019 10:46:20 +0200 Subject: [PATCH 084/467] replace placeholders in email header and footer --- CHANGELOG | 1 + inc/inc.ClassEmailNotify.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 74cb88546..96d3fa299 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ - do not check for Log.php during installation anymore, it's part of the vendor directory anyway - fix uploading documents from drop folder +- replace placeholders in email body header and footer -------------------------------------------------------------------------------- Changes in version 5.1.11 diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php index 62f1ddfa7..d96a64aa4 100644 --- a/inc/inc.ClassEmailNotify.php +++ b/inc/inc.ClassEmailNotify.php @@ -106,8 +106,8 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify { } - $message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang); - $message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang); + $message = getMLText("email_header", $params, "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang); + $message .= "\r\n\r\n".getMLText("email_footer", $params, "", $lang); $headers = array (); $headers['From'] = $from; From 6f2fb3e6467f1215d1e3a1c5eb7f2786bf2e14dd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Jun 2019 11:02:10 +0200 Subject: [PATCH 085/467] fix possible xss --- views/bootstrap/class.ViewDocument.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 413f2c775..eea44db3d 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -705,10 +705,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { echo ""; foreach($statuslog as $entry) { if($suser = $dms->getUser($entry['userID'])) - $fullname = $suser->getFullName(); + $fullname = htmlspecialchars($suser->getFullName()); else $fullname = "--"; - echo "".$entry['date']."".getOverallStatusText($entry['status'])."".$fullname."".$entry['comment']."\n"; + echo "".$entry['date']."".getOverallStatusText($entry['status'])."".$fullname."".htmlspecialchars($entry['comment'])."\n"; } print "\n\n"; $this->contentContainerEnd(); @@ -725,8 +725,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { echo "".$wkflog->getDate().""; echo "".$wkflog->getTransition()->getAction()->getName().""; $loguser = $wkflog->getUser(); - echo "".$loguser->getFullName().""; - echo "".$wkflog->getComment().""; + echo "".htmlspecialchars($loguser->getFullName()).""; + echo "".htmlspecialchars($wkflog->getComment()).""; echo ""; } print "\n\n"; From 1a5a1f3ecb3e3e799c1024c82390f6fc14fad284 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Jun 2019 11:03:27 +0200 Subject: [PATCH 086/467] add not for 5.1.12 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 96d3fa299..d5f949d2e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ -------------------------------------------------------------------------------- - fix for CVE-2019-12932 (Persistent or Stored XSS), excaping the search result in the autocompletion search form placed in the header +- fix more XSS problems on ViewDocument page - folder/document list can be sorted by name, date, sequence (ascending or descending) - search result can be sorted by name, date (ascending or descending) - do not check for Log.php during installation anymore, it's part of the From 3d9e752694d1a0caea16a9255c13d77d7720a401 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 09:56:19 +0200 Subject: [PATCH 087/467] new optional parameter $attachments for toIndividual() --- inc/inc.ClassEmailNotify.php | 37 ++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php index d96a64aa4..b6651b460 100644 --- a/inc/inc.ClassEmailNotify.php +++ b/inc/inc.ClassEmailNotify.php @@ -76,9 +76,10 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify { * @param string $message key of string containing the body of the mail * @param array $params list of parameters which replaces placeholder in * the subject and body + * @param array $attachments list of attachments * @return false or -1 in case of error, otherwise true */ - function toIndividual($sender, $recipient, $subject, $message, $params=array()) { /* {{{ */ + function toIndividual($sender, $recipient, $subject, $message, $params=array(), $attachments=array()) { /* {{{ */ if(is_object($recipient) && !strcasecmp(get_class($recipient), $this->_dms->getClassname('user')) && !$recipient->isDisabled() && $recipient->getEmail()!="") { $to = $recipient->getEmail(); $lang = $recipient->getLanguage(); @@ -109,6 +110,32 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify { $message = getMLText("email_header", $params, "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang); $message .= "\r\n\r\n".getMLText("email_footer", $params, "", $lang); + $mime = new Mail_mime(array('eol' => "\n")); + + $mime->setTXTBody($message); +// $mime->setHTMLBody($bodyhtml); + + if($attachments) { + foreach($attachments as $attachment) { + if(!$mime->addAttachment( + $attachment['file'], + $attachment['mimetype'], + isset($attachment['name']) ? $attachment['name'] : '', + isset($attachment['isfile']) ? $attachment['isfile'] : true + )) { + return false; + } + } + } + + $message = $mime->get(array( + 'text_encoding'=>'8bit', + 'html_encoding'=>'8bit', + 'head_charset'=>'utf-8', + 'text_charset'=>'utf-8', + 'html_charset'=>'utf-8' + )); + $headers = array (); $headers['From'] = $from; if($returnpath) @@ -119,7 +146,9 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify { $headers['Subject'] = substr($encoded_subject, strlen('Subject: ')); $headers['Date'] = date('r', time()); $headers['MIME-Version'] = "1.0"; - $headers['Content-type'] = "text/plain; charset=utf-8"; +// $headers['Content-type'] = "text/plain; charset=utf-8"; + + $hdrs = $mime->headers($headers); $mail_params = array(); if($this->smtp_server) { @@ -146,13 +175,13 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify { if (isset($GLOBALS['SEEDDMS_HOOKS']['mailqueue'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['mailqueue'] as $queueService) { if(method_exists($queueService, 'queueMailJob')) { - $ret = $queueService->queueMailJob($mail_params, $to, $headers, getMLText($subject, $params, "", $lang), $message); + $ret = $queueService->queueMailJob($mail_params, $to, $hdrs, getMLText($subject, $params, "", $lang), $message); if($ret !== null) return $ret; } } } - $result = $mail->send($to, $headers, $message); + $result = $mail->send($to, $hdrs, $message); if (PEAR::isError($result)) { return false; } else { From 164282cfb9db1c19f3a08935625197258f3be647 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 10:46:27 +0200 Subject: [PATCH 088/467] add new method hasSubFolderByName(), fix hasDocumetByName() hasDocumetByName() returned a positiv integer if documents of the folder has been loaded before. --- SeedDMS_Core/Core/inc.ClassFolder.php | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 59dac88d4..29ce71b10 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -520,6 +520,26 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { return $resArr[0]['c']; } /* }}} */ + /** + * Check if folder has as subfolder with given name + * + * @param string $name + * @return bool true if subfolder exists, false if not or in case + * of an error + */ + function hasSubFolderByName($name) { /* {{{ */ + $db = $this->_dms->getDB(); + /* Always check the database instead of iterating over $this->_documents, because + * it is probably not slower + */ + $queryStr = "SELECT count(*) as c FROM `tblFolders` WHERE `parent` = " . $this->_id . " AND `name` = ".$db->qstr($name); + $resArr = $db->getResultArray($queryStr); + if (is_bool($resArr) && !$resArr) + return false; + + return ($resArr[0]['c'] > 0); + } /* }}} */ + /** * Returns a list of subfolders * This function does not check for access rights. Use @@ -713,10 +733,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { */ function hasDocumentByName($name) { /* {{{ */ $db = $this->_dms->getDB(); - if (isset($this->_documents)) { - /** @noinspection PhpUndefinedFieldInspection */ /** @todo not $this->_documents? */ - return count($this->documents); - } + /* Always check the database instead of iterating over $this->_documents, because + * it is probably not slower + */ $queryStr = "SELECT count(*) as c FROM `tblDocuments` WHERE `folder` = " . $this->_id . " AND `name` = ".$db->qstr($name); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) From e9d5381aa659051794a6966ff8373143a006f2ed Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 10:47:42 +0200 Subject: [PATCH 089/467] more notes for 5.1.12, update release date --- SeedDMS_Core/package.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 440f1c507..98564e69b 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,7 +12,7 @@ uwe@steinmann.cx yes - 2019-06-26 + 2019-07-01 5.1.12 @@ -24,8 +24,11 @@ GPL License - - parameter $orderby passed to SeedDMS_Core_Folder::getDocuments() and SeedDMS_Core_Folder::getSubFolders() can be a string, but only the first char is evaluated - - SeedDMS_Core_DMS::search() excepts parameters as array, added orderby +- parameter $orderby passed to SeedDMS_Core_Folder::getDocuments() and SeedDMS_Core_Folder::getSubFolders() can be a string, but only the first char is evaluated +- SeedDMS_Core_DMS::search() excepts parameters as array, added orderby +- add SeedDMS_Core_Folder::hasSubFolderByName() +- fix SeedDMS_Core_Folder::hasDocumentByName() which returned an int > 0 if documents + has been loaded before and even if the document searching for was not among them.

      From 24a83e8f276786c4b2dde681c87b5a20b81b27d3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 10:48:12 +0200 Subject: [PATCH 090/467] more changes in 5.1.12 --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d5f949d2e..2ad3f9eb4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,10 @@ vendor directory anyway - fix uploading documents from drop folder - replace placeholders in email body header and footer +- SeedDMS_EmailNotify::toIndividual() can send attachments +- fix for searching a document with the same name, which sometimes found a duplicate + name even if it didn't exist +- add config option for checking of duplicate subfolder names in the same folder -------------------------------------------------------------------------------- Changes in version 5.1.11 From b1a895fb27a7b5bb7fbc2c9221fe649eecdeb9d4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 10:50:40 +0200 Subject: [PATCH 091/467] new config options for disallowing duplicate subfolder names --- conf/settings.xml.template | 2 ++ inc/inc.ClassSettings.php | 4 ++++ op/op.Settings.php | 1 + views/bootstrap/class.Settings.php | 1 + 4 files changed, 8 insertions(+) diff --git a/conf/settings.xml.template b/conf/settings.xml.template index 452c847fe..bc69afe77 100644 --- a/conf/settings.xml.template +++ b/conf/settings.xml.template @@ -248,6 +248,7 @@ - enableVersionDeletion: allow to delete versions after approval - enableVersionModification: allow to modify versions after approval - enableDuplicateDocNames: allow duplicate names in a folder + - enableDuplicateSubFolderNames: allow duplicate names in a folder - enableOwnerRevApp: XXX - enableSelfRevApp: XXX - presetExpirationDate: XXX @@ -260,6 +261,7 @@ enableVersionDeletion = "true" enableVersionModification = "true" enableDuplicateDocNames = "true" + enableDuplicateSubFolderNames = "true" enableOwnerRevApp = "false" enableSelfRevApp = "false" presetExpirationDate = "" diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index bb86e9bd5..6eb59977d 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -147,6 +147,8 @@ class Settings { /* {{{ */ var $_enableVersionModification = false; // enable/disable duplicate names of a document in a folder var $_enableDuplicateDocNames = true; + // enable/disable duplicate names of a subfolder in a folder + var $_enableDuplicateSubFolderNames = true; // override mimetype set by browser when uploading a file var $_overrideMimeType = false; // enable/disable notification when added as a reviewer/approver @@ -652,6 +654,7 @@ class Settings { /* {{{ */ $this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]); $this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]); $this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]); + $this->_enableDuplicateSubFolderNames = Settings::boolval($tab["enableDuplicateSubFolderNames"]); $this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]); $this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]); } @@ -965,6 +968,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion); $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification); $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames); + $this->setXMLAttributValue($node, "enableDuplicateSubFolderNames", $this->_enableDuplicateSubFolderNames); $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType); $this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder); diff --git a/op/op.Settings.php b/op/op.Settings.php index d02deff6d..b02ee237c 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -186,6 +186,7 @@ if ($action == "saveSettings") $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion"); $settings->_enableVersionModification = getBoolValue("enableVersionModification"); $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames"); + $settings->_enableDuplicateSubFolderNames = getBoolValue("enableDuplicateSubFolderNames"); $settings->_overrideMimeType = getBoolValue("overrideMimeType"); $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 27ea716b2..c627bf913 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -430,6 +430,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigCheckbox('settings_enableVersionDeletion', 'enableVersionDeletion'); ?> showConfigCheckbox('settings_enableVersionModification', 'enableVersionModification'); ?> showConfigCheckbox('settings_enableDuplicateDocNames', 'enableDuplicateDocNames'); ?> +showConfigCheckbox('settings_enableDuplicateSubFolderNames', 'enableDuplicateSubFolderNames'); ?> showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?> showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?> From ad86df5fc54ba014f14b262b730efc515e6b5e69 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 11:48:53 +0200 Subject: [PATCH 092/467] check for duplicate folder names --- op/op.AddSubFolder.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index 344fa3723..3d3d42019 100644 --- a/op/op.AddSubFolder.php +++ b/op/op.AddSubFolder.php @@ -99,6 +99,13 @@ if(!empty($_POST['notification_groups'])) { } } +/* Check if name already exists in the folder */ +if(!$settings->_enableDuplicateSubFolderNames) { + if($folder->hasSubFolderByName($name)) { + UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("subfolder_duplicate_name")); + } +} + $controller->setParam('folder', $folder); $controller->setParam('name', $name); $controller->setParam('comment', $comment); From 38413b671f193e48141e16ea39cd566796486034 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 11:49:17 +0200 Subject: [PATCH 093/467] added check for duplicate folder and document names if turned on --- restapi/index.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/restapi/index.php b/restapi/index.php index d4e2afa91..7efc667bc 100644 --- a/restapi/index.php +++ b/restapi/index.php @@ -374,7 +374,7 @@ function getFolderChildren($request, $response, $args) { /* {{{ */ } /* }}} */ function createFolder($request, $response, $args) { /* {{{ */ - global $dms, $userobj; + global $dms, $userobj, $settings; if(!$userobj) { return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403); @@ -410,6 +410,12 @@ function createFolder($request, $response, $args) { /* {{{ */ } } } + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateSubFolderNames) { + if($folder->hasSubFolderByName($params['name'])) { + return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400); + } + } if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) { $rec = __getFolderData($folder); @@ -506,7 +512,7 @@ function deleteFolder($request, $response, $args) { /* {{{ */ } /* }}} */ function uploadDocument($request, $response, $args) { /* {{{ */ - global $dms, $userobj; + global $dms, $userobj, $settings; if(!$userobj) { return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403); @@ -571,6 +577,12 @@ function uploadDocument($request, $response, $args) { /* {{{ */ $origfilename = $file_info->getClientFilename(); if (trim($docname) == '') $docname = $origfilename; + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateDocNames) { + if($mfolder->hasDocumentByName($docname)) { + return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); + } + } $temp = $file_info->file; $finfo = finfo_open(FILEINFO_MIME_TYPE); $userfiletype = finfo_file($finfo, $temp); @@ -662,7 +674,7 @@ function updateDocument($request, $response, $args) { /* {{{ */ * Old upload method which uses put instead of post */ function uploadDocumentPut($request, $response, $args) { /* {{{ */ - global $dms, $userobj; + global $dms, $userobj, $settings; if(!$userobj) { return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403); @@ -687,6 +699,12 @@ function uploadDocumentPut($request, $response, $args) { /* {{{ */ $userfiletype = finfo_file($finfo, $temp); $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION); finfo_close($finfo); + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateDocNames) { + if($mfolder->hasDocumentByName($docname)) { + return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); + } + } $res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0); unlink($temp); if($res) { From 4b9da8d495569f679f8973c8ab1b458e1204e730 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 11:50:10 +0200 Subject: [PATCH 094/467] add entry for 5.1.12 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 2ad3f9eb4..e87223075 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ - fix for searching a document with the same name, which sometimes found a duplicate name even if it didn't exist - add config option for checking of duplicate subfolder names in the same folder +- rest api also checks for duplicate folder/document names if turned on -------------------------------------------------------------------------------- Changes in version 5.1.11 From b4b2bd45e4ccffa45c6de10f21f60d669c5c7311 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 11:52:08 +0200 Subject: [PATCH 095/467] - add new translations --- languages/ar_EG/lang.inc | 3 +++ languages/bg_BG/lang.inc | 3 +++ languages/ca_ES/lang.inc | 3 +++ languages/cs_CZ/lang.inc | 3 +++ languages/de_DE/lang.inc | 5 ++++- languages/el_GR/lang.inc | 3 +++ languages/en_GB/lang.inc | 5 ++++- languages/es_ES/lang.inc | 3 +++ languages/fr_FR/lang.inc | 3 +++ languages/hr_HR/lang.inc | 3 +++ languages/hu_HU/lang.inc | 3 +++ languages/it_IT/lang.inc | 3 +++ languages/ko_KR/lang.inc | 3 +++ languages/lo_LA/lang.inc | 3 +++ languages/nl_NL/lang.inc | 3 +++ languages/pl_PL/lang.inc | 3 +++ languages/pt_BR/lang.inc | 3 +++ languages/ro_RO/lang.inc | 3 +++ languages/ru_RU/lang.inc | 3 +++ languages/sk_SK/lang.inc | 3 +++ languages/sv_SE/lang.inc | 3 +++ languages/tr_TR/lang.inc | 3 +++ languages/uk_UA/lang.inc | 3 +++ languages/zh_CN/lang.inc | 3 +++ languages/zh_TW/lang.inc | 3 +++ 25 files changed, 77 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 3bc07dbf9..de0f06586 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1231,6 +1231,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '', 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => '', 'settings_enableEmail_desc' => 'Enable/disable automatic email notification', 'settings_enableFilterReceipt' => '', @@ -1595,6 +1597,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'مجهول', 'storage_size' => 'حجم التخزين', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'ادخال موافقة', 'submit_login' => 'تسجيل الدخول', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index d45eeed24..63ee88dac 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -1094,6 +1094,8 @@ $text = array( 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => 'Разреши еднакви имена на документи', 'settings_enableDuplicateDocNames_desc' => 'Разрешава да има еднакви имена на документи в папката.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Включи E-mail', 'settings_enableEmail_desc' => 'Включване/изключване автоматично уведомяване по email', 'settings_enableFilterReceipt' => '', @@ -1458,6 +1460,7 @@ $text = array( 'status_revisor_removed' => '', 'status_unknown' => 'Неизвестен', 'storage_size' => 'Размер на хранилището', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Утвърди', 'submit_login' => 'Влез', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 309829143..5a6b43e65 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -1099,6 +1099,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '', 'settings_enableDuplicateDocNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Enable E-mail', 'settings_enableEmail_desc' => '', 'settings_enableFilterReceipt' => '', @@ -1463,6 +1465,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Desconegut', 'storage_size' => 'Storage size', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Enviar aprovació', 'submit_login' => 'Connectat', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 91524456f..6401ace3c 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1310,6 +1310,8 @@ Jméno: [username] 'settings_enableDropUpload_desc' => 'Povolit / zakázat pokládácí prostor na stránce \'Zobrazení složek\' pro upload souborů pomocí Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Povolit duplicitu názvů dokumentů', 'settings_enableDuplicateDocNames_desc' => 'Povolit duplicitu názvů dokumentů ve složce', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Zapnout E-mail', 'settings_enableEmail_desc' => 'Zapne / Vypne automatická e-mailová upozornění', 'settings_enableFilterReceipt' => 'Filtrování vlastníka, recenzenta, ... ze seznamu přijetí', @@ -1674,6 +1676,7 @@ Jméno: [username] 'status_revisor_removed' => 'Kontrolor odstraněn ze seznamu', 'status_unknown' => 'Neznámý', 'storage_size' => 'Velikost úložiště', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => 'Poslán tajný kód', 'submit_approval' => 'Poslat ke schválení', 'submit_login' => 'Přihlásit se', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 80bf7e43c..f2eef087d 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2684), dgrutsch (22) +// Translators: Admin (2687), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -1320,6 +1320,8 @@ Name: [username] 'settings_enableDropUpload_desc' => 'Ein/Ausschalten des Bereichs auf der \'View Folder\' Seite zum Hochladen von Dateien per Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Erlaube doppelte Dokumentennamen', 'settings_enableDuplicateDocNames_desc' => 'Erlaube doppelte Dokumentennamen in einem Ordner.', +'settings_enableDuplicateSubFolderNames' => 'Erlaube doppelte Namen von Unterordnern', +'settings_enableDuplicateSubFolderNames_desc' => 'Erlaube doppelte Namen von Unterordnern in einem Ordner.', 'settings_enableEmail' => 'E-Mail aktivieren', 'settings_enableEmail_desc' => 'Automatische E-Mail-Benachrichtigung ein-/ausschalten', 'settings_enableFilterReceipt' => 'Besitzer, Prüfer, ... aus Empfängerliste filtern', @@ -1684,6 +1686,7 @@ Name: [username] 'status_revisor_removed' => 'Wiederholungsprüfer von Liste entfernt', 'status_unknown' => 'unbekannt', 'storage_size' => 'Speicherverbrauch', +'subfolder_duplicate_name' => 'Doppelter Unterordnername', 'submit_2_fact_auth' => 'Schlüssel speichern', 'submit_approval' => 'Freigabe hinzufügen', 'submit_login' => 'Anmelden', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 06ffbc37f..b1484434b 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -1105,6 +1105,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '', 'settings_enableDuplicateDocNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => '', 'settings_enableEmail_desc' => '', 'settings_enableFilterReceipt' => '', @@ -1469,6 +1471,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => '', 'storage_size' => '', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => '', 'submit_login' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 97afa0ed0..566640a01 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1776), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1779), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1315,6 +1315,8 @@ Name: [username] 'settings_enableDropUpload_desc' => 'Enable/Disable the drop area on the \'View Folder\' page for uploading files by Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Allow duplicate document names', 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.', +'settings_enableDuplicateSubFolderNames' => 'Allow duplicat subfolder names', +'settings_enableDuplicateSubFolderNames_desc' => 'Allows to have duplicate subfolder names in a folder.', 'settings_enableEmail' => 'Enable E-mail', 'settings_enableEmail_desc' => 'Enable/disable automatic email notification', 'settings_enableFilterReceipt' => 'Filter out owner, reviewer, ... from reception list', @@ -1679,6 +1681,7 @@ Name: [username] 'status_revisor_removed' => 'Revisor removed from list', 'status_unknown' => 'Unknown', 'storage_size' => 'Storage size', +'subfolder_duplicate_name' => 'Duplicate subfolder name', 'submit_2_fact_auth' => 'Save secret', 'submit_approval' => 'Submit approval', 'submit_login' => 'Sign in', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 1da58b4d7..84c9dcca7 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -1246,6 +1246,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Habilite/Deshabilite el área de drop en la pagina \'\'Ver folder\' para subir archivos por Drag&Drop', 'settings_enableDuplicateDocNames' => 'Permite tener nombres de documento duplicados', 'settings_enableDuplicateDocNames_desc' => 'Permite tener un nombre de documento duplicado en una carpeta.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Habilitar E-mail', 'settings_enableEmail_desc' => 'Habilitar/Deshabilitar notificación automática por correo electrónico', 'settings_enableFilterReceipt' => '', @@ -1610,6 +1612,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Desconocido', 'storage_size' => 'Tamaño de almacenamiento', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Enviar aprobación', 'submit_login' => 'Conectar', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 4b15cc841..3c5a8a1bc 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -1299,6 +1299,8 @@ Nom : [username] 'settings_enableDropUpload_desc' => 'Active/désactive la zone de glisser-déposer sur la page d’un dossier afin d’y déposer des fichiers.', 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom', 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'E-mails', 'settings_enableEmail_desc' => 'Active/désactive la notification automatique par e-mail', 'settings_enableFilterReceipt' => '', @@ -1663,6 +1665,7 @@ Nom : [username] 'status_revisor_removed' => 'Réviseur retiré de la liste', 'status_unknown' => 'Inconnu', 'storage_size' => 'Taille occupée', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => 'Enregistrer la clé secrète', 'submit_approval' => 'Soumettre approbation', 'submit_login' => 'Connexion', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 4190c14e5..372269121 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1267,6 +1267,8 @@ Internet poveznica: [url]', 'settings_enableDropUpload_desc' => 'Omogući/onemogući prostor za ubacivanje na \'Vidi mapu\' stranici za učitavanje datoteka "Povuci i ispusti" postupkom.', 'settings_enableDuplicateDocNames' => 'Omogući dvostruke nazive dokumenata', 'settings_enableDuplicateDocNames_desc' => 'Omogućuje da u mapi imate dvostruke nazive dokumenata.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Omogući E-mail', 'settings_enableEmail_desc' => 'Omogući/onemogući automatsku email obavijest', 'settings_enableFilterReceipt' => '', @@ -1631,6 +1633,7 @@ Internet poveznica: [url]', 'status_revisor_removed' => 'Revizor uklonjen s liste', 'status_unknown' => 'Nepoznato', 'storage_size' => 'Veličina pohrane', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Pošaljite odobrenje', 'submit_login' => 'PRIJAVI SE', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 5b69cc8cb..b22819603 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -1245,6 +1245,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Be/Ki kapcsolja a \'Mappa nézet\' oldalon a fogd és vidd feltöltéshez tartozó területetet', 'settings_enableDuplicateDocNames' => 'Azonos dokumentum név engedélyezése', 'settings_enableDuplicateDocNames_desc' => 'Engedélyezi az azonos dokumentum neveket egy mappában.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Email engedélyezése', 'settings_enableEmail_desc' => 'Engedélyezi/tiltja az automatikus email értesítést', 'settings_enableFilterReceipt' => '', @@ -1609,6 +1611,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Ismeretlen', 'storage_size' => 'Tároló mérete', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Jóváhagyás küldése', 'submit_login' => 'Bejelentkezés', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 4501bfd90..7b5b8398b 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1279,6 +1279,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Abilita/disabilita l\'area di rilascio nella pagina \'Vista cartella\' per caricare i files con drag&drop (trascina e rilascia).', 'settings_enableDuplicateDocNames' => 'Permetti documenti con lo stesso nome', 'settings_enableDuplicateDocNames_desc' => 'Permetti documenti con lo stesso nome nella stessa cartella', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Abilita l\'email', 'settings_enableEmail_desc' => 'Abilita/disabilita la notifica automatica via email', 'settings_enableFilterReceipt' => '', @@ -1643,6 +1645,7 @@ URL: [url]', 'status_revisor_removed' => 'Revisore rimosso dalla lista', 'status_unknown' => 'Sconosciuto', 'storage_size' => 'Spazio di archiviazione', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => 'Salva segreto', 'submit_approval' => 'Invio approvazione', 'submit_login' => 'Accedi', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index e6ef93bd8..b97af1366 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1261,6 +1261,8 @@ URL : [url]', 'settings_enableDropUpload_desc' => 'Drag&Drop하여 파일을 업로드할 \'View_Folder\' 페이지의 드롭 영역을 활성/비활설 한다.', 'settings_enableDuplicateDocNames' => '중복 된 문서명 허용', 'settings_enableDuplicateDocNames_desc' => '이 폴더에 중복 된 문서명을 가질 수 있습니다.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => '전자 메일 사용', 'settings_enableEmail_desc' => '자동화 전자우편 알림 활성화/비활성화', 'settings_enableFilterReceipt' => '', @@ -1625,6 +1627,7 @@ URL : [url]', 'status_revisor_removed' => '감사자 목록에서 제거', 'status_unknown' => '알 수없는', 'storage_size' => '저장 크기', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => '승인 제출', 'submit_login' => '로그인', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 0f05286c1..ca3f4c8b5 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -1294,6 +1294,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'ເປີດ/ປິດ ໄຊ້ໜ້າຕ່າງພື້ນທີ່ວ່າງ ວິວໂຟລເດີ ເພື່ອອັບໂຫລດໄຟລໂດຍລາກ ແລະວາງ', 'settings_enableDuplicateDocNames' => 'ອະນຸຍາດໃຫ້ໄຊ້ເອກະສານຊໍ້າກັນ', 'settings_enableDuplicateDocNames_desc' => 'ອະນຸຍາດໃຫ້ມີເອກະສານຊໍ້າໃນໂຟລເດີ', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'ເປີດໄຊ້ອີເມວ', 'settings_enableEmail_desc' => 'ເປີດ/ປິດໄຊ້ງານການແຈ້ງເຕືອນທາງອີເມວໂດຍອັດຕະໂນມັດ', 'settings_enableFilterReceipt' => '', @@ -1658,6 +1660,7 @@ URL: [url]', 'status_revisor_removed' => 'ແກ້ໄຂຄຳອະທິບາຍອອກຈາກລາຍການ', 'status_unknown' => 'ບໍ່ຮູ້', 'storage_size' => 'ຂະໜາດພື້ນທີ່ເກັບຂໍ້ມູນ', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => 'ເກັບຄວາມລັບໄວ້', 'submit_approval' => 'ສະເໜີການອະນຸມັດ', 'submit_login' => 'ລົງຊື່ເຂົາໄຊ້', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index bafc1b108..8afaebd4a 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1291,6 +1291,8 @@ Name: [username] 'settings_enableDropUpload_desc' => 'Aanzetten DropUpload', 'settings_enableDuplicateDocNames' => 'Sta duplicaten van documentnamen toe', 'settings_enableDuplicateDocNames_desc' => 'Staat het toe om documentnamen te dupliceren in een folder.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'E-mail inschakelen', 'settings_enableEmail_desc' => 'Inschakelen/uitschakelen automatische email notificatie', 'settings_enableFilterReceipt' => '', @@ -1655,6 +1657,7 @@ Name: [username] 'status_revisor_removed' => 'Verwijderd', 'status_unknown' => 'Onbekend', 'storage_size' => 'Omvang opslag', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '2-factor-authentificatie verstuurd', 'submit_approval' => 'Verzend [Goedkeuring]', 'submit_login' => 'Log in', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 3db61e362..cb01e0cab 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1225,6 +1225,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => 'Zezwalaj na zduplikowane nazwy dokumentów', 'settings_enableDuplicateDocNames_desc' => 'Zezwala na tworzenie w folderze dokumentów o tej samej nazwie.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Włącz powiadomienia e-mail', 'settings_enableEmail_desc' => 'Włącz/Wyłącz automatyczne powiadomienia drogą mailową', 'settings_enableFilterReceipt' => '', @@ -1589,6 +1591,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Nieznany', 'storage_size' => 'Zajętość dysku', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Zaakceptuj', 'submit_login' => 'Zaloguj się', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 4161bfc18..5353a5484 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -1313,6 +1313,8 @@ Nome: [username] 'settings_enableDropUpload_desc' => 'Habilitar / Desabilitar a área na página \'Vista de Pastas\' para upload de arquivos por Arrastar e Soltar.', 'settings_enableDuplicateDocNames' => 'Permitir nomes duplicados de documento', 'settings_enableDuplicateDocNames_desc' => 'Permite ter nomes de documentos duplicados em uma pasta.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Ativar E-mail', 'settings_enableEmail_desc' => 'Ativar/desativar a notificação de e-mail automático', 'settings_enableFilterReceipt' => 'Filtrar dono, revisor, ... da lista de recepção', @@ -1677,6 +1679,7 @@ Nome: [username] 'status_revisor_removed' => 'Revisor removido da lista', 'status_unknown' => 'Desconhecido', 'storage_size' => 'Tamanho de armazenamento', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => 'Salvar segredo', 'submit_approval' => 'Enviar aprovação', 'submit_login' => 'Entrar', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 0ea5e8553..57ce5aa47 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1268,6 +1268,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Activare/dezactivare zona de plasare (drop area) în pagina \'Vizualizare Folder\' pentru încarcarea fisierelor folosind Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Permiteți nume de documente duplicate', 'settings_enableDuplicateDocNames_desc' => 'Permiteți sa existe nume de documente duplicate într-un fisier.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Activare E-mail', 'settings_enableEmail_desc' => 'Activare/dezactivare notificari automare prin e-mail', 'settings_enableFilterReceipt' => '', @@ -1632,6 +1634,7 @@ URL: [url]', 'status_revisor_removed' => 'Revizuitor eliminat din lista', 'status_unknown' => 'Necunoscut', 'storage_size' => 'Dimensiunea de stocare', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Trimite aprobare', 'submit_login' => 'Sign in', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 39cb89aca..97dda2ad0 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -1275,6 +1275,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Включить/отключить область в "Просмотр папки" для загрузки при помощи Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Разрешить документы
      с одинаковым названием', 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Включить e-mail', 'settings_enableEmail_desc' => 'Включить/отключить автоматическое уведомление по e-mail.', 'settings_enableFilterReceipt' => '', @@ -1639,6 +1641,7 @@ URL: [url]', 'status_revisor_removed' => 'Ревизор удален из списка', 'status_unknown' => 'Неизвестный', 'storage_size' => 'Размер хранилища', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Утвердить', 'submit_login' => 'Войти', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 5630c1c1a..b3eb847e6 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -1315,6 +1315,8 @@ Meno: [username] 'settings_enableDropUpload_desc' => 'Enable/Disable the drop area on the \'View Folder\' page for uploading files by Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Povoliť duplicitné názvy dokumentov', 'settings_enableDuplicateDocNames_desc' => 'Povoliť duplicitné názvy dokumentov v zložke.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Povoliť e-mail', 'settings_enableEmail_desc' => 'Povoliť/zakázať automatickú emailovú notifikáciu', 'settings_enableFilterReceipt' => 'Filter out owner, reviewer, ... from reception list', @@ -1679,6 +1681,7 @@ Meno: [username] 'status_revisor_removed' => 'Revisor removed from list', 'status_unknown' => 'Neznámy', 'storage_size' => 'Objem dát', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => 'Save secret', 'submit_approval' => 'Poslať schválenie', 'submit_login' => 'Prihlásiť sa', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index fe7d0a1b5..c189879bf 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1288,6 +1288,8 @@ Kommentar: [comment]', 'settings_enableDropUpload_desc' => 'Aktivera / avaktivera droppområdet på "Visa mapp" sidan för att ladda upp filer genom att dra och släppa.', 'settings_enableDuplicateDocNames' => 'Tillåter dubletter av dokumentnamn', 'settings_enableDuplicateDocNames_desc' => 'Tillåter att det finns dokument med samma namn i en mapp.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Använd e-postmeddelanden', 'settings_enableEmail_desc' => 'Aktivera/Inaktivera automatiska e-postmeddelanden', 'settings_enableFilterReceipt' => '', @@ -1652,6 +1654,7 @@ Kommentar: [comment]', 'status_revisor_removed' => 'Reviderare borttagen från listan', 'status_unknown' => 'Okänd', 'storage_size' => 'Lagringsstorlek', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => 'Spara hemlighet', 'submit_approval' => 'Skicka godkännande', 'submit_login' => 'Logga in', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 53b580478..19f357524 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1247,6 +1247,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '\'Klasör Görüntüle\' alanında dosyaları Sürükle&Bırak yöntemiyle yüklemek için sürükleme alanını etkinleştir/devredışı bırak', 'settings_enableDuplicateDocNames' => 'Mükerrer doküman isimlerine izin ver', 'settings_enableDuplicateDocNames_desc' => 'Bir klasör içinde aynı isimli dosyalara izin verir.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'E-Postayı Etkinleştir', 'settings_enableEmail_desc' => 'Otomatik e-posta bildirimlerini etkinleştir/devre dışı bırak', 'settings_enableFilterReceipt' => '', @@ -1611,6 +1613,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Bilinmeyen', 'storage_size' => 'Depo boyutu', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Onay ver', 'submit_login' => 'Giriş', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 7baa2cefc..9a40ccf69 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -1268,6 +1268,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Увімкнути/вимкнути область в "Перегляді каталогу" для завантаження за допомогою Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Дозволити документи
      з однаковою назвою', 'settings_enableDuplicateDocNames_desc' => 'Дозволити документи з однаковими назвами в каталозі.', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Увімкнути e-mail', 'settings_enableEmail_desc' => 'Увімкнути/вимкнути автоматичне сповіщення по e-mail.', 'settings_enableFilterReceipt' => '', @@ -1632,6 +1634,7 @@ URL: [url]', 'status_revisor_removed' => 'Ревізора видалено зі списку', 'status_unknown' => 'Невідомий', 'storage_size' => 'Розмір сховища', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => 'Затвердити', 'submit_login' => 'Увійти', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 03bef725f..82e50fca2 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -1249,6 +1249,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '允许重复的文件名', 'settings_enableDuplicateDocNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => '开启邮件', 'settings_enableEmail_desc' => '开启/关闭邮件自动提醒', 'settings_enableFilterReceipt' => '', @@ -1613,6 +1615,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => '未知', 'storage_size' => '存储大小', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => '提交审核', 'submit_login' => '登录', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index c82622635..a8af9e3b4 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -1098,6 +1098,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '允許重複的檔案名', 'settings_enableDuplicateDocNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => '', 'settings_enableEmail_desc' => '', 'settings_enableFilterReceipt' => '', @@ -1462,6 +1464,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => '未知', 'storage_size' => '存儲大小', +'subfolder_duplicate_name' => '', 'submit_2_fact_auth' => '', 'submit_approval' => '提交審核', 'submit_login' => '登錄', From 536067200e7c2034ae61322ad509d8d1674ebf33 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 13:05:40 +0200 Subject: [PATCH 096/467] add method isDescendant() --- SeedDMS_Core/Core/inc.ClassDocument.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 6680f6d9d..51be6bb5f 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -519,6 +519,24 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return true; } /* }}} */ + /** + * Check, if this document is below of a given folder + * + * @param object $folder parent folder + * @return boolean true if folder is a subfolder + */ + function isDescendant($folder) { /* {{{ */ + /* First check if the parent folder is folder looking for */ + if ($this->getFolder()->getID() == $folder->getID()) + return true; + /* Second, check for the parent folder of this document to be + * below the given folder + */ + if($this->getFolder()->isDescendant($folder)) + return true; + return false; + } /* }}} */ + /** * Return the parent folder of the document * From d18a3389bcc4da9637005db8b6363eccf046876a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 13:06:08 +0200 Subject: [PATCH 097/467] =?UTF-8?q?s=D1=96mplify=20and=20possibly=20fix=20?= =?UTF-8?q?method=20isDescendant()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SeedDMS_Core/Core/inc.ClassFolder.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 29ce71b10..32b7a93e2 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -692,15 +692,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { * @return boolean true if folder is a subfolder */ function isDescendant($folder) { /* {{{ */ - if ($this->_parentID == $folder->getID()) - return true; - elseif (isset($this->_parentID)) { - $res = $this->getParent(); - if (!$res) return false; - - return $this->_parent->isDescendant($folder); - } else + if(!$this->getParent()) return false; + if($this->getParent()->getID() == $folder->getID()) + return true; + return $this->getParent()->isDescendant($folder); } /* }}} */ /** From 7fc98be1be830ba5d42d72e0d658e5747a938481 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 20:40:21 +0200 Subject: [PATCH 098/467] check for duplicate names if this is turn on in the settings --- op/op.MoveDocument.php | 7 +++++++ op/op.MoveFolder.php | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php index 87d42d120..21682eb3d 100644 --- a/op/op.MoveDocument.php +++ b/op/op.MoveDocument.php @@ -62,6 +62,13 @@ if($document->isLocked()) { } } +/* Check if name already exists in the folder */ +if(!$settings->_enableDuplicateDocNames) { + if($targetFolder->hasDocumentByName($document->getName())) { + UI::exitError(getMLText("folder_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("document_duplicate_name")); + } +} + if ($targetid != $oldFolder->getID()) { if ($document->setFolder($targetFolder)) { // Send notification to subscribers. diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index 09693127b..72afcf7bf 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -60,6 +60,13 @@ if ($folder->getAccessMode($user, 'moveFolder') < M_READWRITE || $targetFolder-> UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied")); } +/* Check if name already exists in the folder */ +if(!$settings->_enableDuplicateSubFolderNames) { + if($targetFolder->hasSubFolderByName($folder->getName())) { + UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("subfolder_duplicate_name")); + } +} + $oldFolder = $folder->getParent(); if ($folder->setParent($targetFolder)) { // Send notification to subscribers. From d2614ba79d5b9ca7b437f7dbc4da5722358d3595 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 20:41:54 +0200 Subject: [PATCH 099/467] add entry for 5.1.12 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e87223075..d208b2198 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,8 @@ name even if it didn't exist - add config option for checking of duplicate subfolder names in the same folder - rest api also checks for duplicate folder/document names if turned on +- before moving a document/folder the target folder is checked for an object with + the same name, if this is turned on in the configuration -------------------------------------------------------------------------------- Changes in version 5.1.11 From 768ff5acb1d3b22c410d5601b7828aa9893a5c58 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 1 Jul 2019 21:36:22 +0200 Subject: [PATCH 100/467] update entry for 5.1.12 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b6f8a352e..d8b20d350 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,7 @@ -------------------------------------------------------------------------------- - fix editing of document attachments - make receipt summary look like approval/review summary -- merge changes up to 5.1.10 +- merge changes up to 5.1.12 - do not show the updating user in a revision workflow if the status is 0 this is misleading because the user starting the revision workflow is the one first accessing the document From c9d9bf6c7bb7983fb40d3254300c036eaccd4365 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Jul 2019 08:47:12 +0200 Subject: [PATCH 101/467] new function and controller for emptying a folder --- SeedDMS_Core/Core/inc.ClassFolder.php | 62 ++++++++++++++++++++++ SeedDMS_Core/package.xml | 1 + controllers/class.EmptyFolder.php | 76 +++++++++++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 controllers/class.EmptyFolder.php diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 32b7a93e2..a95856ea9 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -1038,6 +1038,12 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { * Remove recursively a folder * * Removes a folder, all its subfolders and documents + * This method triggers the callbacks onPreRemoveFolder and onPostRemoveFolder. + * If onPreRemoveFolder returns a boolean then this method will return + * imediately with the value returned by the callback. Otherwise the + * regular removal is executed, which in turn + * triggers further onPreRemoveFolder and onPostRemoveFolder callbacks + * and its counterparts for documents (onPreRemoveDocument, onPostRemoveDocument). * * @return boolean true on success, false in case of an error */ @@ -1093,6 +1099,62 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { return $ret; } /* }}} */ + /** + * Empty recursively a folder + * + * Removes all subfolders and documents of a folder but not the folder itself + * This method will call remove() on all its children. + * This method triggers the callbacks onPreEmptyFolder and onPostEmptyFolder. + * If onPreEmptyFolder returns a boolean then this method will return + * imediately. + * Be aware that the recursive calls of remove() will trigger the callbacks + * onPreRemoveFolder, onPostRemoveFolder, onPreRemoveDocument and onPostRemoveDocument. + * + * @return boolean true on success, false in case of an error + */ + function empty() { /* {{{ */ + /** @noinspection PhpUnusedLocalVariableInspection */ + $db = $this->_dms->getDB(); + + /* Check if 'onPreEmptyFolder' callback is set */ + if(isset($this->_dms->callbacks['onPreEmptyFolder'])) { + foreach($this->_dms->callbacks['onPreEmptyFolder'] as $callback) { + $ret = call_user_func($callback[0], $callback[1], $this); + if(is_bool($ret)) + return $ret; + } + } + + //Entfernen der Unterordner und Dateien + $res = $this->getSubFolders(); + if (is_bool($res) && !$res) return false; + $res = $this->getDocuments(); + if (is_bool($res) && !$res) return false; + + foreach ($this->_subFolders as $subFolder) { + $res = $subFolder->remove(); + if (!$res) { + return false; + } + } + + foreach ($this->_documents as $document) { + $res = $document->remove(); + if (!$res) { + return false; + } + } + + /* Check if 'onPostEmptyFolder' callback is set */ + if(isset($this->_dms->callbacks['onPostEmptyFolder'])) { + foreach($this->_dms->callbacks['onPostEmptyFolder'] as $callback) { + call_user_func($callback[0], $callback[1], $this); + } + } + + return true; + } /* }}} */ + /** * Returns a list of access privileges * diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 98564e69b..b659e7baf 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -29,6 +29,7 @@ - add SeedDMS_Core_Folder::hasSubFolderByName() - fix SeedDMS_Core_Folder::hasDocumentByName() which returned an int > 0 if documents has been loaded before and even if the document searching for was not among them. +- add new method SeedDMS_Core_Folder::empty() diff --git a/controllers/class.EmptyFolder.php b/controllers/class.EmptyFolder.php new file mode 100644 index 000000000..f31f64209 --- /dev/null +++ b/controllers/class.EmptyFolder.php @@ -0,0 +1,76 @@ + + * @copyright Copyright (C) 2010-2013 Uwe Steinmann + * @version Release: @package_version@ + */ + +/** + * Class which does the busines logic for downloading a document + * + * @category DMS + * @package SeedDMS + * @author Uwe Steinmann + * @copyright Copyright (C) 2010-2013 Uwe Steinmann + * @version Release: @package_version@ + */ +class SeedDMS_Controller_EmptyFolder extends SeedDMS_Controller_Common { + + public function run() { + $dms = $this->params['dms']; + $user = $this->params['user']; + $settings = $this->params['settings']; + $folder = $this->params['folder']; + $index = $this->params['index']; + $indexconf = $this->params['indexconf']; + + /* Get the document id and name before removing the document */ + $foldername = $folder->getName(); + $folderid = $folder->getID(); + + if(false === $this->callHook('preEmptyFolder')) { + if(empty($this->errormsg)) + $this->errormsg = 'hook_preEmptyFolder_failed'; + return null; + } + + $result = $this->callHook('emptyFolder', $folder); + if($result === null) { + /* Register a callback which removes each document from the fulltext index + * The callback must return null other the removal will be canceled. + */ + function removeFromIndex($arr, $document) { + $index = $arr[0]; + $indexconf = $arr[1]; + $lucenesearch = new $indexconf['Search']($index); + if($hit = $lucenesearch->getDocument($document->getID())) { + $index->delete($hit->id); + $index->commit(); + } + return null; + } + if($index) + $dms->setCallback('onPreEmptyDocument', 'removeFromIndex', array($index, $indexconf)); + + if (!$folder->empty()) { + $this->errormsg = 'error_occured'; + return false; + } + } elseif($result === false) { + if(empty($this->errormsg)) + $this->errormsg = 'hook_emptyFolder_failed'; + return false; + } + + if(!$this->callHook('postEmptyFolder')) { + } + + return true; + } +} From bf1c297594cc3e5ddfda07276f2b65bb0c32808a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Jul 2019 08:47:49 +0200 Subject: [PATCH 102/467] note about new EmptyFolder controller --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index d208b2198..87ed68fd7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ - rest api also checks for duplicate folder/document names if turned on - before moving a document/folder the target folder is checked for an object with the same name, if this is turned on in the configuration +- new controller EmptyFolder (currently not used) -------------------------------------------------------------------------------- Changes in version 5.1.11 From 10e419f7e3afc5cc1f2d47dffa98e0d95847f225 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Jul 2019 15:20:11 +0200 Subject: [PATCH 103/467] eliminate duplicate mails to the same group --- op/op.TriggerWorkflow.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php index 0e0e46d4f..5c572f08d 100644 --- a/op/op.TriggerWorkflow.php +++ b/op/op.TriggerWorkflow.php @@ -117,6 +117,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $usersinformed = array(); + $groupsinformed = array(); foreach($workflow->getNextTransitions($transition->getNextState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { if(!in_array($tuser->getUser()->getID(), $usersinformed)) { @@ -125,7 +126,10 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { } } foreach($ntransition->getGroups() as $tuser) { - $notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params); + if(!in_array($tuser->getUser()->getID(), $groupsinformed)) { + $groupsinformed[] = $tuser->getGroup()->getID(); + $notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params); + } } } } From 2c11d4b1c7fd6df93272c836acf55e83b6d62f69 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Jul 2019 15:21:07 +0200 Subject: [PATCH 104/467] new entry for 5.1.12 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 87ed68fd7..8d13dade9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ - before moving a document/folder the target folder is checked for an object with the same name, if this is turned on in the configuration - new controller EmptyFolder (currently not used) +- check for duplicate mails to the same group when a workflow was triggered -------------------------------------------------------------------------------- Changes in version 5.1.11 From a91a49cd56e5e59bde4ef31939f33c02b27468aa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 4 Jul 2019 14:33:24 +0200 Subject: [PATCH 105/467] add filetype 'folder' in getMimeIcon() This enables the use of getMimeIcon() for folders instead of using the protected $imgpath --- views/bootstrap/class.Bootstrap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 8090d872c..7e05c899f 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -993,6 +993,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $icons["sxm"] = "ooo_formula.png"; $icons["smf"] = "ooo_formula.png"; $icons["mml"] = "ooo_formula.png"; + $icons["folder"] = "folder.svg"; $icons["default"] = "text-x-preview.svg"; //"default.png"; @@ -2321,7 +2322,7 @@ $(document).ready( function() { $content = ''; $content .= "getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; - $content .= "getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">imgpath."folder.svg\" width=\"24\" height=\"24\" border=0>\n"; + $content .= "getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>\n"; $content .= "getID()."\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; $content .= "
      ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; if($comment) { From b90392191a7a60b506ac8a1ecc59f0781f23ecf9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 4 Jul 2019 14:35:05 +0200 Subject: [PATCH 106/467] seperate code for lines in clipboard into extra function allows to add hook for replacing those functions with code in an extension --- views/bootstrap/class.Clipboard.php | 132 ++++++++++++++++++---------- 1 file changed, 87 insertions(+), 45 deletions(-) diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php index d912e2e57..34f2f4451 100644 --- a/views/bootstrap/class.Clipboard.php +++ b/views/bootstrap/class.Clipboard.php @@ -91,6 +91,79 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style { echo $content; } /* }}} */ + /** + * Return row of clipboard for a folder + * + * @param object $folder + * @return string rendered html content + */ + public function folderClipboardRow($folder) { /* {{{ */ + $dms = $this->params['dms']; + + $content = ''; + $comment = $folder->getComment(); + if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; + $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; + $content .= "getID()."&showtree=".showtree()."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>\n"; + $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . ""; + if($comment) { + $content .= "
      ".htmlspecialchars($comment).""; + } + $content .= "\n"; + $content .= "\n"; + $content .= "
      getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\">
      "; + $content .= "\n"; + $content .= "\n"; + + return $content; + } /* }}} */ + + /** + * Return row of clipboard for a document + * + * @param object $document + * @return string rendered html content + */ + public function documentClipboardRow($document, $previewer) { /* {{{ */ + $dms = $this->params['dms']; + + $content = ''; + $comment = $document->getComment(); + if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; + $latestContent = $this->callHook('documentLatestContent', $document); + if($latestContent === null) + $latestContent = $document->getLatestContent(); + if($latestContent) { + $previewer->createPreview($latestContent); + $version = $latestContent->getVersion(); + $status = $latestContent->getStatus(); + + $content .= "getID()."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">"; + + if (file_exists($dms->contentDir . $latestContent->getPath())) { + $content .= "getID()."&version=".$version."\">"; + if($previewer->hasPreview($latestContent)) { + $content .= "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + } else { + $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + } + $content .= ""; + } else + $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + + $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . ""; + if($comment) { + $content .= "
      ".htmlspecialchars($comment).""; + } + $content .= "\n"; + $content .= "\n"; + $content .= "
      getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\">
      "; + $content .= "\n"; + $content .= ""; + } + return $content; + } /* }}} */ + /** * Return clipboard content rendered as html * @@ -112,19 +185,13 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style { foreach($clipboard['folders'] as $folderid) { /* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */ if($folder = $dms->getFolder($folderid)) { - $comment = $folder->getComment(); - if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; - $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; - $content .= "getID()."&showtree=".showtree()."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>\n"; - $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . ""; - if($comment) { - $content .= "
      ".htmlspecialchars($comment).""; + $txt = $this->callHook('folderClipboardItem', $folder, 'clipboard'); + if(is_string($txt)) + $content .= $txt; + else { + $content .= $this->folderClipboardRow($folder); } - $content .= "\n"; - $content .= "\n"; - $content .= "
      params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\">
      "; - $content .= "\n"; - $content .= "\n"; + $foldercount++; } } @@ -133,40 +200,15 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style { foreach($clipboard['docs'] as $docid) { /* FIXME: check for access rights, which could have changed after adding the document to the clipboard */ if($document = $dms->getDocument($docid)) { - $comment = $document->getComment(); - if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; - $latestContent = $this->callHook('documentLatestContent', $document); - if($latestContent === null) - $latestContent = $document->getLatestContent(); - if($latestContent) { - $previewer->createPreview($latestContent); - $version = $latestContent->getVersion(); - $status = $latestContent->getStatus(); - - $content .= ""; - - if (file_exists($dms->contentDir . $latestContent->getPath())) { - $content .= ""; - if($previewer->hasPreview($latestContent)) { - $content .= "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; - } else { - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; - } - $content .= ""; - } else - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; - - $content .= "" . htmlspecialchars($document->getName()) . ""; - if($comment) { - $content .= "
      ".htmlspecialchars($comment).""; - } - $content .= "\n"; - $content .= "\n"; - $content .= "
      params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\">
      "; - $content .= "\n"; - $content .= ""; - $doccount++; + $document->verifyLastestContentExpriry(); + $txt = $this->callHook('documentClipboardItem', $document, $previewer, 'clipboard'); + if(is_string($txt)) + $content .= $txt; + else { + $content .= $this->documentClipboardRow($document, $previewer); } + + $doccount++; } } } From 7a7542e01b17834f760328bc2557a8c3a06bf6f1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Jul 2019 08:07:52 +0200 Subject: [PATCH 107/467] fix wrong baseUrl which cause the styles not to be loaded --- views/bootstrap/class.ErrorDlg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.ErrorDlg.php b/views/bootstrap/class.ErrorDlg.php index ef5cc64ed..66bd63507 100644 --- a/views/bootstrap/class.ErrorDlg.php +++ b/views/bootstrap/class.ErrorDlg.php @@ -40,7 +40,7 @@ class SeedDMS_View_ErrorDlg extends SeedDMS_Bootstrap_Style { $settings = $this->params['settings']; if(!$plain) { - $this->htmlStartPage($pagetitle, 'errorpage', $settings->_httpRoot."out"); + $this->htmlStartPage($pagetitle, 'errorpage', $settings->_httpRoot."out/"); $this->globalNavigation(); $this->contentStart(); } From 853d1117389d9283b13a109db492355a0b3cd0fa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Jul 2019 08:09:12 +0200 Subject: [PATCH 108/467] new item for 5.1.12 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 8d13dade9..e2a8f100a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ the same name, if this is turned on in the configuration - new controller EmptyFolder (currently not used) - check for duplicate mails to the same group when a workflow was triggered +- new hook to output clipboard items -------------------------------------------------------------------------------- Changes in version 5.1.11 From 585c81bb66b88e3ef8fca2b9633ea269cfd85329 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Jul 2019 14:13:29 +0200 Subject: [PATCH 109/467] allow pass the object with the document content --- controllers/class.Download.php | 38 +++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/controllers/class.Download.php b/controllers/class.Download.php index 81a8c6ba7..9f8c0d2f9 100644 --- a/controllers/class.Download.php +++ b/controllers/class.Download.php @@ -28,25 +28,29 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common { switch($type) { case "version": - $version = $this->params['version']; - $document = $this->params['document']; - if($version < 1) { - $content = $this->callHook('documentLatestContent', $document); - if($content === null) - $content = $document->getLatestContent(); + if(empty($this->params['content'])) { + $version = $this->params['version']; + $document = $this->params['document']; + if($version < 1) { + $content = $this->callHook('documentLatestContent', $document); + if($content === null) + $content = $document->getLatestContent(); + } else { + $content = $this->callHook('documentContent', $document, $version); + if($content === null) + $content = $document->getContentByVersion($version); + } + if (!is_object($content)) { + $this->errormsg = 'invalid_version'; + return false; + } + /* set params['content'] for compatiblity with older extensions which + * expect the content in the controller + */ + $this->params['content'] = $content; } else { - $content = $this->callHook('documentContent', $document, $version); - if($content === null) - $content = $document->getContentByVersion($version); + $content = $this->params['content']; } - if (!is_object($content)) { - $this->errormsg = 'invalid_version'; - return false; - } - /* set params['content'] for compatiblity with older extensions which - * expect the content in the controller - */ - $this->params['content'] = $content; if(null === $this->callHook('version')) { if(file_exists($dms->contentDir . $content->getPath())) { header("Content-Transfer-Encoding: binary"); From 2e75779e4ed608a60d1b4716e38f7bf67dd0b858 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Jul 2019 14:24:43 +0200 Subject: [PATCH 110/467] some minor updates of lately added keys --- languages/cs_CZ/lang.inc | 6 +++--- languages/de_DE/lang.inc | 4 ++-- languages/en_GB/lang.inc | 4 ++-- languages/es_ES/lang.inc | 10 +++++----- languages/fr_FR/lang.inc | 12 ++++++------ languages/hr_HR/lang.inc | 4 ++-- languages/hu_HU/lang.inc | 4 ++-- languages/it_IT/lang.inc | 10 +++++----- languages/lo_LA/lang.inc | 4 ++-- languages/nl_NL/lang.inc | 6 +++--- languages/pl_PL/lang.inc | 4 ++-- languages/pt_BR/lang.inc | 4 ++-- languages/ro_RO/lang.inc | 4 ++-- languages/ru_RU/lang.inc | 4 ++-- languages/sk_SK/lang.inc | 4 ++-- languages/sv_SE/lang.inc | 4 ++-- languages/tr_TR/lang.inc | 10 +++++----- languages/uk_UA/lang.inc | 4 ++-- languages/zh_CN/lang.inc | 8 ++++---- 19 files changed, 55 insertions(+), 55 deletions(-) diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 6401ace3c..432689409 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1523), kreml (579) +// Translators: Admin (1525), kreml (579) $text = array( '2_factor_auth' => 'dvoufaktorové ověření', @@ -1554,7 +1554,7 @@ Jméno: [username] 'settings_updateDatabase' => 'Spustit skripty pro aktualizaci schématu databáze', 'settings_updateNotifyTime' => 'Update Notify Time', 'settings_updateNotifyTime_desc' => 'Uživatelé jsou informováni o změnách dokumentů, ke kterým došlo v posledních sekundách \'Aktualizace upozornění\'', -'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.2.0', +'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.6.38', 'settings_versioningFileName' => 'Verzování názvu souboru', 'settings_versioningFileName_desc' => 'Název souboru s informacemi o verzích vytvořeném nástrojem pro zálohování', 'settings_versiontolow' => 'Příliš nízká verze', @@ -1580,7 +1580,7 @@ Jméno: [username] 'sign_out_user' => 'Odhlášení uživatele', 'sk_SK' => 'Slovenština', 'sort_by_date' => '', -'sort_by_name' => '', +'sort_by_name' => 'Třídit podle jména', 'sort_by_sequence' => '', 'space_used_on_data_folder' => 'Použité místo pro data složky', 'splash_added_to_clipboard' => 'Přidáno do schránky', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index f2eef087d..92217c35b 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2687), dgrutsch (22) +// Translators: Admin (2688), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -1564,7 +1564,7 @@ Name: [username] 'settings_updateDatabase' => 'Datenbank-Update-Skript ausführen', 'settings_updateNotifyTime' => 'Update Notify Time', 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds', -'settings_upgrade_php' => 'Aktualisiere PHP auf mindestens version 5.2.0', +'settings_upgrade_php' => 'Aktualisiere PHP auf mindestens version 5.6.38', 'settings_versioningFileName' => 'Versionsinfo-Datei', 'settings_versioningFileName_desc' => 'Der Name der Datei mit Versionsinformationen, wie sie durch das Backup-Tool erzeugt werden.', 'settings_versiontolow' => 'Version zu gering', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 566640a01..282accc17 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1779), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1780), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1559,7 +1559,7 @@ Name: [username] 'settings_updateDatabase' => 'Run schema update scripts on database', 'settings_updateNotifyTime' => 'Update Notify Time', 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds', -'settings_upgrade_php' => 'Upgrade PHP to at least version 5.2.0', +'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38', 'settings_versioningFileName' => 'Versioning FileName', 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool', 'settings_versiontolow' => 'Version to low', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 84c9dcca7..4e93f1ff4 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (1114), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (1118), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', @@ -1490,7 +1490,7 @@ URL: [url]', 'settings_updateDatabase' => 'Lanzar scripts de actualización de esquema en la base de datos', 'settings_updateNotifyTime' => 'Tiempo de notificación de actualización', 'settings_updateNotifyTime_desc' => 'Se notificará a los usuarios sobre los cambios en documentos que tengan lugar en los próximos segundos de «Tiempo de notificación de actualización»', -'settings_upgrade_php' => 'Actualice PHP a una versión igual o mayor a 5.2.0', +'settings_upgrade_php' => 'Actualice PHP a una versión igual o mayor a 5.6.38', 'settings_versioningFileName' => 'Archivo de versionado', 'settings_versioningFileName_desc' => 'Nombre de archivo de información de versionado creado por la herramienta de copia de respaldo', 'settings_versiontolow' => 'Versión antigua', @@ -1515,9 +1515,9 @@ URL: [url]', 'sign_out' => 'Salir', 'sign_out_user' => 'Desconectar usuario', 'sk_SK' => 'Slovaco', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Ordenar por Fecha', +'sort_by_name' => 'Ordenar por Nombre', +'sort_by_sequence' => 'Ordenar por Secuencia', 'space_used_on_data_folder' => 'Espacio usado en la carpeta de datos', 'splash_added_to_clipboard' => 'Agregado al portapapeles', 'splash_add_access' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 3c5a8a1bc..ccd3831e8 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (750) +// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (755) $text = array( '2_factor_auth' => 'Authentification forte', @@ -1299,8 +1299,8 @@ Nom : [username] 'settings_enableDropUpload_desc' => 'Active/désactive la zone de glisser-déposer sur la page d’un dossier afin d’y déposer des fichiers.', 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom', 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Autoriser les sous-dossiers de même nom', +'settings_enableDuplicateSubFolderNames_desc' => 'Autorise plusieurs sous-dossiers de même nom dans un dossier.', 'settings_enableEmail' => 'E-mails', 'settings_enableEmail_desc' => 'Active/désactive la notification automatique par e-mail', 'settings_enableFilterReceipt' => '', @@ -1543,10 +1543,10 @@ Nom : [username] 'settings_updateDatabase' => 'Exécuter les scripts de mise à jour du schéma de la base', 'settings_updateNotifyTime' => 'Délai de notification des modifications', 'settings_updateNotifyTime_desc' => 'Les utilisateurs sont informés des modifications apportées aux documents qui ont eu lieu durant le délai précisé (en secondes).', -'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.2.0', +'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.6.38', 'settings_versioningFileName' => 'Nom des fichiers de versionnage', 'settings_versioningFileName_desc' => 'Nom des fichiers textes d’information créés depuis les outils de sauvegarde', -'settings_versiontolow' => '', +'settings_versiontolow' => 'Version trop ancienne', 'settings_viewOnlineFileTypes' => 'Aperçu en ligne des fichiers', 'settings_viewOnlineFileTypes_desc' => 'Extensions des fichiers pouvant être visionnés en ligne (en lettres minuscules uniquement).', 'settings_webdav' => 'WebDAV', @@ -1665,7 +1665,7 @@ Nom : [username] 'status_revisor_removed' => 'Réviseur retiré de la liste', 'status_unknown' => 'Inconnu', 'storage_size' => 'Taille occupée', -'subfolder_duplicate_name' => '', +'subfolder_duplicate_name' => 'Un sous-dossier porte déjà ce nom !', 'submit_2_fact_auth' => 'Enregistrer la clé secrète', 'submit_approval' => 'Soumettre approbation', 'submit_login' => 'Connexion', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 372269121..fe53bb654 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1221), marbanas (16) +// Translators: Admin (1222), marbanas (16) $text = array( '2_factor_auth' => '', @@ -1511,7 +1511,7 @@ Internet poveznica: [url]', 'settings_updateDatabase' => 'Pokreni shemu ažuriranja skripti na bazi podataka', 'settings_updateNotifyTime' => 'Ažuriraj vrijeme obavijesti', 'settings_updateNotifyTime_desc' => 'Korisnici se obavještavaju o promjenama dokumenta koje su se dogodile unutar zadnjih \'Update Notify Time\' sekundi', -'settings_upgrade_php' => 'Ažuriraj PHP najmanje na verziju 5.2.0', +'settings_upgrade_php' => 'Ažuriraj PHP najmanje na verziju 5.6.38', 'settings_versioningFileName' => 'Naziv datoteke verzije dokumenta', 'settings_versioningFileName_desc' => 'Naziv datoteke s informacijom o verziji kreirane alatom za stvaranje sigurnosne kopije', 'settings_versiontolow' => 'Na nižu verziju', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index b22819603..b6b681de3 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (632), ribaz (1036) +// Translators: Admin (633), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -1489,7 +1489,7 @@ URL: [url]', 'settings_updateDatabase' => 'Adatbázis séma frissítő szkript futtatása', 'settings_updateNotifyTime' => 'Értesítési idő frissítése', 'settings_updateNotifyTime_desc' => 'Felhasználók értesítést kapnak az \'Értesítés frissítési idő\' által meghatározott másodperc alatt történt dokumentum változásokról', -'settings_upgrade_php' => 'Frissítse a PHP-t legalább 5.2.0 verzióra', +'settings_upgrade_php' => 'Frissítse a PHP-t legalább 5.6.38 verzióra', 'settings_versioningFileName' => 'Változatkezelő állománynév', 'settings_versioningFileName_desc' => 'A változáskezelő információs állomány neve létrehozva a mentő eszközzel', 'settings_versiontolow' => 'túl alacsony verzió', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 7b5b8398b..55f2ee3de 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1624), rickr (144), s.pnt (26) +// Translators: Admin (1628), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', @@ -1523,7 +1523,7 @@ URL: [url]', 'settings_updateDatabase' => 'Esegui gli script di aggiornamento schema sul database', 'settings_updateNotifyTime' => 'Intervallo notifica di aggiornamento', 'settings_updateNotifyTime_desc' => 'Intervallo di tempo in secondi durante il quale ogni modifica ad un documento verrà notificata agli utenti', -'settings_upgrade_php' => 'Aggiornare PHP alla versione 5.2.0 o superiori', +'settings_upgrade_php' => 'Aggiornare PHP alla versione 5.6.38 o superiori', 'settings_versioningFileName' => 'Nome file di versione', 'settings_versioningFileName_desc' => 'Nome attribuito al file di versione creato dallo strumento di backup.', 'settings_versiontolow' => 'Versione obsoleta', @@ -1548,9 +1548,9 @@ URL: [url]', 'sign_out' => 'Disconnettiti', 'sign_out_user' => 'Disconnetti l\'utente', 'sk_SK' => 'Slovacco', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Ordina per Data', +'sort_by_name' => 'Ordina per Nom', +'sort_by_sequence' => 'Ordina per Sequenza', 'space_used_on_data_folder' => 'Spazio utilizzato dai dati', 'splash_added_to_clipboard' => 'Aggiunto agli appunti', 'splash_add_access' => '', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index ca3f4c8b5..84965ef76 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1468) +// Translators: Admin (1469) $text = array( '2_factor_auth' => 'ການກວດສອບແບບ 2 ປັດໃຈ', @@ -1538,7 +1538,7 @@ URL: [url]', 'settings_updateDatabase' => 'ຮຽກໄຊ້ສະຄິບການປັບປຸງສະຄິບໃນຖານຂໍ້ມູນ', 'settings_updateNotifyTime' => 'ອັບເດດເວລາການແຈ້ງເຕືອນ', 'settings_updateNotifyTime_desc' => 'ຜູ້ໄຊ້ຈະໄດ້ຮັບການແຈ້ງກ່ຽວກັບການປ່ຽນແປງເອກະສານທີ່ເກີດຂື້ນພາຍໃນວິນາທີສຸດທ້າຍ "ແຈ້ງເຕືອນເວລາ "', -'settings_upgrade_php' => 'ອັບເກດ PHP ຢ່າງນ້ອຍຕ້ອງເປັນເວີຊັ້ນ 5.2.0', +'settings_upgrade_php' => 'ອັບເກດ PHP ຢ່າງນ້ອຍຕ້ອງເປັນເວີຊັ້ນ 5.6.38', 'settings_versioningFileName' => 'ການກຳນົດຊື່ໄຟລ', 'settings_versioningFileName_desc' => 'ຊື່ຂອງແຟ້ມຂໍ້ມູນການກຳນົດເວີຊັນທີ່ສ້າງໂດຍເຄື່ອງມືສຳຮອງຂໍ້ມູນ', 'settings_versiontolow' => 'ເວີຊັນເກົ່າ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 8afaebd4a..d2f34f932 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (768), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (770), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( '2_factor_auth' => '2-factor-authenticatie', @@ -1535,7 +1535,7 @@ Name: [username] 'settings_updateDatabase' => 'Voer schema update scripts uit op database', 'settings_updateNotifyTime' => 'Update Notificatie Tijd', 'settings_updateNotifyTime_desc' => 'Gebruikers worden niet genotificeerd over documentwijzigingen die plaats vinden binnen de laatste \'Update Notificatie Tijd\' seconden', -'settings_upgrade_php' => 'Upgrade PHP minimaal naar versie 5.2.0', +'settings_upgrade_php' => 'Upgrade PHP minimaal naar versie 5.6.38', 'settings_versioningFileName' => 'Versie-informatie Bestandsnaam', 'settings_versioningFileName_desc' => 'De naam van het versie informatie bestand gemaakt door het backupgereedschap', 'settings_versiontolow' => 'Versie te laag', @@ -1562,7 +1562,7 @@ Name: [username] 'sk_SK' => 'Slowaaks', 'sort_by_date' => 'Sorteren op datum', 'sort_by_name' => 'Sorteren op naam', -'sort_by_sequence' => '', +'sort_by_sequence' => 'Sorteer op volgorde', 'space_used_on_data_folder' => 'Gebruikte diskomvang in data map', 'splash_added_to_clipboard' => 'Toegevoegd aan klembord', 'splash_add_access' => '', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index cb01e0cab..46fc1324a 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (830), netixw (84), romi (93), uGn (112) +// Translators: Admin (831), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -1469,7 +1469,7 @@ URL: [url]', 'settings_updateDatabase' => 'Uruchom skrytoy aktualizujące shemat bazy danych', 'settings_updateNotifyTime' => 'Okres powiadamiania o zmianach', 'settings_updateNotifyTime_desc' => 'Użytkownicy są powiadamiani o zmianach w dokumentach, które miały miejsce w ciągu ostatnich \'Update Notify Time\' sekund', -'settings_upgrade_php' => 'Uaktualnij PHP do wersji przynajmniej 5.2.0', +'settings_upgrade_php' => 'Uaktualnij PHP do wersji przynajmniej 5.6.38', 'settings_versioningFileName' => 'Nazwa pliku z wersjonowaniem', 'settings_versioningFileName_desc' => 'Nazwa pliku, zawierającego informacje o wersjonowaniu, utworzonego przez narzędzie kopii zapasowej.', 'settings_versiontolow' => 'Za niska wersja', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 5353a5484..c34c3a96f 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1718), flaviove (627), lfcristofoli (352) +// Translators: Admin (1719), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => 'Autenticação de dois fatores', @@ -1557,7 +1557,7 @@ Nome: [username] 'settings_updateDatabase' => 'Executar scripts de atualização do esquema de banco de dados', 'settings_updateNotifyTime' => 'Atualizar Tempo de Notificação', 'settings_updateNotifyTime_desc' => 'Usuários são notificados sobe mudanças em documentos que se realizaram nos últimos segundos \'Tempo de Atualização de Notificação\'', -'settings_upgrade_php' => 'Atualize PHP para pelo menos a versão 5.2.0', +'settings_upgrade_php' => 'Atualize PHP para pelo menos a versão 5.6.38', 'settings_versioningFileName' => 'Versionando NomedoArquivo', 'settings_versioningFileName_desc' => 'O nome do arquivo de informações de versões criadas pela ferramenta de backup', 'settings_versiontolow' => 'Versão para baixo', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 57ce5aa47..cf81b7c97 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1085), balan (87) +// Translators: Admin (1086), balan (87) $text = array( '2_factor_auth' => '', @@ -1512,7 +1512,7 @@ URL: [url]', 'settings_updateDatabase' => 'Rulați script-urile de actualizare a schemei bazei de date', 'settings_updateNotifyTime' => 'Timpul de actualizare a notificarilor', 'settings_updateNotifyTime_desc' => 'Utilizatorii sunt notificați cu privire la schimbările suferite de un documentul în ultima perioadă a \'Timpul de actualizare a notificarilor\' în secunde', -'settings_upgrade_php' => 'Upgrade PHP cel puțin la versiunea 5.2.0', +'settings_upgrade_php' => 'Upgrade PHP cel puțin la versiunea 5.6.38', 'settings_versioningFileName' => 'Nume Fișier versionare', 'settings_versioningFileName_desc' => 'Numele fișierului cu informatii ale versiunilor creat de către instrumentul de backup', 'settings_versiontolow' => 'Versiunea e prea mică(veche)', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 97dda2ad0..0471d460b 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1668) +// Translators: Admin (1669) $text = array( '2_factor_auth' => 'Двухфакторная аутентификация', @@ -1519,7 +1519,7 @@ URL: [url]', 'settings_updateDatabase' => 'Запустить обновление схемы БД', 'settings_updateNotifyTime' => 'Период уведомлений об изменениях', 'settings_updateNotifyTime_desc' => 'Пользователи уведомляются об изменениях документов за указанные последние секунды.', -'settings_upgrade_php' => 'Обновите PHP до версии не ниже 5.2.0', +'settings_upgrade_php' => 'Обновите PHP до версии не ниже 5.6.38', 'settings_versioningFileName' => 'Название файла версий', 'settings_versioningFileName_desc' => 'Названия файла версий, создаваемого инструментом резервного копирования.', 'settings_versiontolow' => 'Слишком старая версия', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index b3eb847e6..838324151 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1224), destinqo (19), pS2017 (508), ssebech (4) +// Translators: Admin (1225), destinqo (19), pS2017 (508), ssebech (4) $text = array( '2_factor_auth' => '2-faktorové overovanie', @@ -1559,7 +1559,7 @@ Meno: [username] 'settings_updateDatabase' => 'Run schema update scripts on database', 'settings_updateNotifyTime' => 'Aktualizovať čas notifikácie', 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds', -'settings_upgrade_php' => 'Upgrade PHP to at least version 5.2.0', +'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38', 'settings_versioningFileName' => 'Versioning FileName', 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool', 'settings_versiontolow' => 'Verzia je nízka', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index c189879bf..f362ad09a 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1159), MagnusI (649), tmichelfelder (106) +// Translators: Admin (1160), MagnusI (649), tmichelfelder (106) $text = array( '2_factor_auth' => '2-faktors autentisering', @@ -1532,7 +1532,7 @@ Kommentar: [comment]', 'settings_updateDatabase' => 'Kör schemauppdateringsskript på databasen', 'settings_updateNotifyTime' => 'Tid för uppdateringsmeddelande', 'settings_updateNotifyTime_desc' => 'Användare meddelas om att ändringar i dokumentet har genomförts inom de senaste \'Tid för uppdateringsmeddelande\' sekunder.', -'settings_upgrade_php' => 'Uppdatera PHP till åtminstone version 5.2.0', +'settings_upgrade_php' => 'Uppdatera PHP till åtminstone version 5.6.38', 'settings_versioningFileName' => 'Versionsinfo-filnamn', 'settings_versioningFileName_desc' => 'Namnet på versionsinfo-fil som skapas med backup-verktyget', 'settings_versiontolow' => 'Version för låg', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 19f357524..b8b53939a 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1083), aydin (83) +// Translators: Admin (1087), aydin (83) $text = array( '2_factor_auth' => '', @@ -1491,7 +1491,7 @@ URL: [url]', 'settings_updateDatabase' => 'Veritabanında schema update betik çalıştır', 'settings_updateNotifyTime' => 'Güncelleme Bildirim Zamanı', 'settings_updateNotifyTime_desc' => 'Kullanıcılara doküman güncellemelerinin \'Update Notify Time\' saniyede gerçekleştiği bildirilir.', -'settings_upgrade_php' => 'PHP versiyonu en az 5.2.0 olmalıdır', +'settings_upgrade_php' => 'PHP versiyonu en az 5.6.38 olmalıdır', 'settings_versioningFileName' => 'Versiyonlama DosyaAdı', 'settings_versioningFileName_desc' => 'Yedekleme aracı tarafından oluşturulan versiyon bilgisi dosyasının adı', 'settings_versiontolow' => 'Versiyon düşük', @@ -1516,9 +1516,9 @@ URL: [url]', 'sign_out' => 'Çıkış', 'sign_out_user' => 'Kullanıcı hesabından çıkış', 'sk_SK' => 'Slovakça', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Tarihe göre sırala', +'sort_by_name' => 'Ada göre sırala', +'sort_by_sequence' => 'Eklenme sırasına göre sırala', 'space_used_on_data_folder' => 'Data klasörü kullanılan alan', 'splash_added_to_clipboard' => 'Panoya eklendi', 'splash_add_access' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 9a40ccf69..be3385893 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1337) +// Translators: Admin (1338) $text = array( '2_factor_auth' => '', @@ -1512,7 +1512,7 @@ URL: [url]', 'settings_updateDatabase' => 'Запустити оновлення схеми БД', 'settings_updateNotifyTime' => 'Період сповіщень про зміни', 'settings_updateNotifyTime_desc' => 'Користувачі отримують сповіщення за вказані останні секунди.', -'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.2.0', +'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.6.38', 'settings_versioningFileName' => 'Назва файлу версій', 'settings_versioningFileName_desc' => 'Назва файлу версій, створеного інструментами резервного копіювання.', 'settings_versiontolow' => 'Надто стара версія', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 82e50fca2..72d351a6f 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (761), archonwang (469), fengjohn (5), yang86 (1) +// Translators: Admin (765), archonwang (469), fengjohn (5), yang86 (1) $text = array( '2_factor_auth' => '双重认证', @@ -1518,9 +1518,9 @@ URL: [url]', 'sign_out' => '登出', 'sign_out_user' => '退出登录', 'sk_SK' => '斯洛伐克语', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => '日期排序', +'sort_by_name' => '文件名排序', +'sort_by_sequence' => '顺序排列', 'space_used_on_data_folder' => '数据文件夹使用空间', 'splash_added_to_clipboard' => '已复制', 'splash_add_access' => '', From abf9465e311e771cddddac3e1825a6d755a566db Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Jul 2019 19:31:33 +0200 Subject: [PATCH 111/467] ??? --- CHANGELOG | 8 ++++---- Makefile | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e2a8f100a..ddd684165 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,17 +19,17 @@ the same name, if this is turned on in the configuration - new controller EmptyFolder (currently not used) - check for duplicate mails to the same group when a workflow was triggered -- new hook to output clipboard items +- new hook to output clipboard items -------------------------------------------------------------------------------- Changes in version 5.1.11 -------------------------------------------------------------------------------- - fix for CVE-2019-12744 (Remote Command Execution through unvalidated file upload), add .htaccess file to data directory, better documentation - for installing seeddms + for installing seeddms - fix for CVE-2019-12745 (Persistent or Stored XSS in UsrMgr) and CVE-2019-12801 (Persistent or Stored XSS in GroupMgr), propperly escape - strings used in Select2 js library used by UsrMgr and GroupMgr + strings used in Select2 js library used by UsrMgr and GroupMgr - do not show attributes in search results in extra column anymore - fix setting language during login (Closes #437) - fix indexing documents even if no preIndexDocument hook is set (Closes #437) @@ -84,7 +84,7 @@ - catch error when updating a document fails (Closes #410) - use always 'Send from' address as Return-Path when set, only if not set the logged in user's email will be used (Closes #418) -- show the debug output when sending a test mail +- show the debug output when sendind a test mail - add hooks add hooks folderListPreContent and folderListPostContent in class.ViewFolder.php - do not redirect to ForcePassword page if out.Logout.php was opened. This diff --git a/Makefile b/Makefile index 3d8dc4be3..f10892e27 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,8 @@ NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-up EXTENSIONS := \ dynamic_content.tar.gz\ login_action.tar.gz\ - example.tar.gz + example.tar.gz\ + tbs_template.tar.gz PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc @@ -39,10 +40,12 @@ webapp: repository: mkdir -p tmp/seeddms-repository-$(VERSION) cp -a repository/www repository/utils repository/doc tmp/seeddms-repository-$(VERSION) + rm -f tmp/seeddms-repository/utils/update-repository.log mkdir -p tmp/seeddms-repository-$(VERSION)/files mkdir -p tmp/seeddms-repository-$(VERSION)/accounts cp -a repository/files/.htaccess tmp/seeddms-repository-$(VERSION)/files cp -a repository/accounts/.htaccess tmp/seeddms-repository-$(VERSION)/accounts + cp inc/inc.ClassExtensionMgr.php tmp/seeddms-repository-$(VERSION)/utils (cd tmp; tar --exclude=.svn -czvf ../seeddms-repository-$(VERSION).tar.gz seeddms-repository-$(VERSION)) rm -rf tmp @@ -55,6 +58,9 @@ example.tar.gz: ext/example login_action.tar.gz: ext/login_action tar czvf login_action.tar.gz ext/login_action +tbs_template.tar.gz: ext/tbs_template + tar czvf tbs_template.tar.gz ext/tbs_template + extensions: $(EXTENSIONS) doc: From f09ece975ba202e7e5257d3c7655bd727c834e8d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Jul 2019 19:32:02 +0200 Subject: [PATCH 112/467] turn load on demand on in jqtree --- views/bootstrap/class.Bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 7e05c899f..1644d6de3 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1593,7 +1593,7 @@ $(document).ready(function() { $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { @@ -1613,7 +1613,7 @@ $(document).ready(function() { $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); $children[] = $node; } return $children; @@ -1652,7 +1652,7 @@ $(document).ready(function() { } else { $root = $this->params['dms']->getFolder($this->params['rootfolderid']); - $tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>false, 'is_folder'=>true)); + $tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>true, 'is_folder'=>true)); } ?> From a6af3cf0cd98148a6aa4f22e68f72904182be3e4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Jul 2019 20:39:54 +0200 Subject: [PATCH 113/467] add entry form 5.1.12 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index ddd684165..840b0b31f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ - new controller EmptyFolder (currently not used) - check for duplicate mails to the same group when a workflow was triggered - new hook to output clipboard items +- turn on load on demand again in the folder tree -------------------------------------------------------------------------------- Changes in version 5.1.11 From d11887311c9956522c031f60030db6696b62c35b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Jul 2019 17:14:56 +0200 Subject: [PATCH 114/467] declare variables in SeedDMS_Core_DocumentContent --- SeedDMS_Core/Core/inc.ClassDocument.php | 69 ++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 51be6bb5f..cbf26d2ab 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2653,6 +2653,70 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ * @version Release: @package_version@ */ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ + /** + * @var object document + */ + protected $_document; + + /** + * @var integer version + */ + protected $_version; + + /** + * @var string comment + */ + protected $_comment; + + /** + * @var string date + */ + protected $_date; + + /** + * @var integer userID + */ + protected $_userID; + + /** + * @var string dir on disk (deprecated) + */ + protected $_dir; + + /** + * @var string original file name + */ + protected $_orgFileName; + + /** + * @var string file type (actually the extension without the leading dot) + */ + protected $_fileType; + + /** + * @var string mime type + */ + protected $_mimeType; + + /** + * @var string checksum of content + */ + protected $_checksum; + + /** + * @var object workflow + */ + protected $_workflow; + + /** + * @var object workflow state + */ + protected $_workflowState; + + /** + * @var object dms + */ + public $_dms; /** * Recalculate the status of a document @@ -2745,7 +2809,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ function getOriginalFileName() { return $this->_orgFileName; } function getFileType() { return $this->_fileType; } function getFileName(){ return $this->_version . $this->_fileType; } - function getDir() { return $this->_dir; } + /** + * getDir and the corresponding database table field are deprecated + */ + function __getDir() { return $this->_dir; } function getMimeType() { return $this->_mimeType; } function getDocument() { return $this->_document; } From 16e9d3748cc9eb8489dd14b8e195dbf38812826f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Jul 2019 17:15:40 +0200 Subject: [PATCH 115/467] new command transferdocument and linkdocument transferdocument moves the version of one document to another document linkdocument creates a link between on document and another document --- op/op.Ajax.php | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 44778b452..7146fe78e 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -341,6 +341,96 @@ switch($command) { } break; /* }}} */ + case 'transfercontent': /* {{{ */ + if($user) { + if(!checkFormKey('movedocument', 'GET')) { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>'')); + } else { + $mdocument = $dms->getDocument($_REQUEST['docid']); + if($mdocument) { + if ($mdocument->getAccessMode($user, 'transferContent') >= M_READWRITE) { + /* Check if source document has more than one version */ + $versions = $mdocument->getContent(); + if(count($versions) == 1) { + if($targetdoc = $dms->getDocument($_REQUEST['targetdocumentid'])) { + if($targetdoc->getAccessMode($user, 'transferContent') >= M_READWRITE) { + if($targetdoc->addContent($versions[0]->getComment(), $versions[0]->getUser(), $dms->contentDir . $versions[0]->getPath(), $versions[0]->getOriginalFileName(), $versions[0]->getFileType(), $versions[0]->getMimeType())) { //, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null) { + if($mdocument->remove()) { + header('Content-Type: application/json'); + echo json_encode(array('success'=>true, 'message'=>getMLText('splash_transfer_content'), 'data'=>'')); + add_log_line(); + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>'Error removing source document', 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>'Error transfering content', 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('splash_source_doc_has_versions'), 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>'')); + } + } + } + break; /* }}} */ + + case 'linkdocument': /* {{{ */ + if($user) { + if(!checkFormKey('movedocument', 'GET')) { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>'')); + } else { + $mdocument = $dms->getDocument($_REQUEST['docid']); + if($mdocument) { + if ($mdocument->getAccessMode($user, 'linkDocument') >= M_READ) { + if($targetdoc = $dms->getDocument($_REQUEST['targetdocumentid'])) { + if($targetdoc->getAccessMode($user, 'linkDocument') >= M_READWRITE) { + if($targetdoc->addDocumentLink($mdocument->getID(), $user->getID(), false)) { + header('Content-Type: application/json'); + echo json_encode(array('success'=>true, 'message'=>getMLText('splash_link_document'), 'data'=>'')); + add_log_line(); + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>'Error linking document', 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>'')); + } + } else { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>'')); + } + } + } + break; /* }}} */ + case 'deletefolder': /* {{{ */ if($user) { if(!checkFormKey('removefolder', 'GET')) { From e1ae62ec7ec662ffa1d8ffadc2d078cadc4ea216 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Jul 2019 17:18:03 +0200 Subject: [PATCH 116/467] overhaul drag&drop code documents can be dropped on other documents, files can be dropped on folders --- styles/bootstrap/application.js | 332 ++++++++++++++++++--------- views/bootstrap/class.Bootstrap.php | 41 +++- views/bootstrap/class.Clipboard.php | 5 +- views/bootstrap/class.Search.php | 2 +- views/bootstrap/class.ViewFolder.php | 4 +- 5 files changed, 260 insertions(+), 124 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 086d46a6b..d1b5f96df 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -545,7 +545,6 @@ function onAddClipboard(ev) { /* {{{ */ } function sendFileToServer(formData,status) { - formData.append('command', 'uploaddocument'); var uploadURL = ajaxurl; //Upload URL var extraData ={}; //Extra Data. var jqXHR=$.ajax({ @@ -641,18 +640,28 @@ function onAddClipboard(ev) { /* {{{ */ } } - SeedDMSUpload.handleFileUpload = function(files,obj) { - var target = obj.data('target'); - if(target) { + SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) { + /* target is set for the quick upload area */ + var target_id = obj.data('target'); + var target_type = 'folder'; + /* droptarget is set for folders and documents in lists */ + var droptarget = obj.data('droptarget'); + if(droptarget) { + target_type = droptarget.split("_")[0]; + target_id = droptarget.split("_")[1]; + } + if(target_type == 'folder' && target_id) { for (var i = 0; i < files.length; i++) { if(files[i].size <= maxFileSize) { var fd = new FormData(); - fd.append('folderid', target); - fd.append('formtoken', obj.data('formtoken')); + fd.append('targettype', target_type); + fd.append('folderid', target_id); + fd.append('formtoken', obj.data('uploadformtoken')); fd.append('userfile', files[i]); + fd.append('command', 'uploaddocument'); // fd.append('path', files[i].webkitRelativePath); - var status = new createStatusbar(obj); + var status = new createStatusbar(statusbar); status.setFileNameSize(files[i].name,files[i].size); sendFileToServer(fd,status); } else { @@ -666,6 +675,32 @@ function onAddClipboard(ev) { /* {{{ */ }); } } + } else if(target_type == 'document' && target_id) { + /* + for (var i = 0; i < files.length; i++) { + if(files[i].size <= maxFileSize) { + var fd = new FormData(); + fd.append('targettype', target_type); + fd.append('documentid', target_id); + fd.append('formtoken', obj.data('uploadformtoken')); + fd.append('userfile', files[i]); + fd.append('command', 'uploaddocument'); + + var status = new createStatusbar(statusbar); + status.setFileNameSize(files[i].name,files[i].size); + sendFileToServer(fd,status); + } else { + noty({ + text: maxFileSizeMsg + '
      ' + files[i].name + ' (' + files[i].size + ' Bytes)', + type: 'error', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + timeout: 5000, + }); + } + } + */ } } }( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery )); /* }}} */ @@ -690,120 +725,209 @@ $(document).ready(function() { /* {{{ */ var files = e.originalEvent.dataTransfer.files; //We need to send dropped files to Server - SeedDMSUpload.handleFileUpload(files,obj); + SeedDMSUpload.handleFileUpload(files,obj,obj); }); - $(document).on('dragenter', '.table-row-folder', function (e) { + $(document).on('dragenter', '.droptarget', function (e) { e.stopPropagation(); e.preventDefault(); $(e.currentTarget).css('border', '2px dashed #0B85A1'); }); - $(document).on('dragleave', '.table-row-folder', function (e) { + $(document).on('dragleave', '.droptarget', function (e) { e.stopPropagation(); e.preventDefault(); $(e.currentTarget).css('border', '0px solid white'); }); - $(document).on('dragover', '.table-row-folder', function (e) { + $(document).on('dragover', '.droptarget', function (e) { e.stopPropagation(); e.preventDefault(); }); - $(document).on('drop', '.table-row-folder', function (e) { + $(document).on('drop', '.droptarget', function (e) { e.preventDefault(); e.stopPropagation(); $(e.currentTarget).css('border', '0px solid white'); - attr_rel = $(e.currentTarget).attr('rel'); + attr_rel = $(e.currentTarget).data('droptarget'); target_type = attr_rel.split("_")[0]; target_id = attr_rel.split("_")[1]; - console.log(e.originalEvent.dataTransfer.getData("text")); - var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); - source_type = source_info.type; - source_id = source_info.id; - formtoken = source_info.formtoken; -// source_type = e.originalEvent.dataTransfer.getData("type"); -// source_id = e.originalEvent.dataTransfer.getData("id"); -// formtoken = e.originalEvent.dataTransfer.getData("formtoken"); - if(source_type == 'document') { - bootbox.dialog(trans.confirm_move_document, [{ - "label" : " "+trans.move_document, - "class" : "btn-danger", - "callback": function() { - $.get('../op/op.Ajax.php', - { command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken }, - function(data) { - if(data.success) { - $('#table-row-document-'+source_id).hide('slow'); - noty({ - text: data.message, - 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, - }); - } - }, - 'json' - ); - } - }, { - "label" : trans.cancel, - "class" : "btn-cancel", - "callback": function() { - } - }]); + if(target_type == 'folder') { + var files = e.originalEvent.dataTransfer.files; + if(files.length > 0) { + console.log('Drop '+files.length+' files on '+target_type+' '+target_id); + SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span")); + } else { + var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); + source_type = source_info.type; + source_id = source_info.id; + formtoken = source_info.formtoken; + console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id); + if(source_type == 'document') { + bootbox.dialog(trans.confirm_move_document, [{ + "label" : " "+trans.move_document, + "class" : "btn-danger", + "callback": function() { + $.get('../op/op.Ajax.php', + { command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken }, + function(data) { + if(data.success) { + $('#table-row-document-'+source_id).hide('slow'); + noty({ + text: data.message, + 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, + }); + } + }, + 'json' + ); + } + }, { + "label" : trans.cancel, + "class" : "btn-cancel", + "callback": function() { + } + }]); - url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id; -// document.location = url; - } else if(source_type == 'folder' && source_id != target_id) { - bootbox.dialog(trans.confirm_move_folder, [{ - "label" : " "+trans.move_folder, - "class" : "btn-danger", - "callback": function() { - $.get('../op/op.Ajax.php', - { command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken }, - function(data) { - if(data.success) { - $('#table-row-folder-'+source_id).hide('slow'); - noty({ - text: data.message, - 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, - }); - } - }, - 'json' - ); - } - }, { - "label" : trans.cancel, - "class" : "btn-cancel", - "callback": function() { - } - }]); + url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id; + // document.location = url; + } else if(source_type == 'folder' && source_id != target_id) { + bootbox.dialog(trans.confirm_move_folder, [{ + "label" : " "+trans.move_folder, + "class" : "btn-danger", + "callback": function() { + $.get('../op/op.Ajax.php', + { command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken }, + function(data) { + if(data.success) { + $('#table-row-folder-'+source_id).hide('slow'); + noty({ + text: data.message, + 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, + }); + } + }, + 'json' + ); + } + }, { + "label" : trans.cancel, + "class" : "btn-cancel", + "callback": function() { + } + }]); - url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id; -// document.location = url; + url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id; + // document.location = url; + } + } + } else if(target_type == 'document') { + var files = e.originalEvent.dataTransfer.files; + if(files.length > 0) { + console.log('Drop '+files.length+' files on '+target_type+' '+target_id); + SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span")); + } else { + var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); + source_type = source_info.type; + source_id = source_info.id; + formtoken = source_info.formtoken; + console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id); + if(source_type == 'document') { + bootbox.dialog(trans.confirm_transfer_link_document, [{ + "label" : " "+trans.transfer_content, + "class" : "btn-danger", + "callback": function() { + $.get('../op/op.Ajax.php', + { command: 'transfercontent', docid: source_id, targetdocumentid: target_id, formtoken: formtoken }, + function(data) { + if(data.success) { + $('#table-row-document-'+source_id).hide('slow'); + noty({ + text: data.message, + 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, + }); + } + }, + 'json' + ); + } + }, { + "label" : trans.link_document, + "class" : "btn-danger", + "callback": function() { + $.get('../op/op.Ajax.php', + { command: 'linkdocument', docid: source_id, targetdocumentid: target_id, formtoken: formtoken }, + function(data) { + if(data.success) { + noty({ + text: data.message, + 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, + }); + } + }, + 'json' + ); + } + }, { + "label" : trans.cancel, + "class" : "btn-cancel", + "callback": function() { + } + }]); + + url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id; + // document.location = url; + } + } } }); $(document).on('dragstart', '.table-row-folder', function (e) { @@ -816,9 +940,6 @@ $(document).ready(function() { /* {{{ */ formtoken : $(e.target).attr('formtoken') }; e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); -// e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]); -// e.originalEvent.dataTransfer.setData("type","folder"); -// e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken')); }); $(document).on('dragstart', '.table-row-document', function (e) { @@ -831,9 +952,6 @@ $(document).ready(function() { /* {{{ */ formtoken : $(e.target).attr('formtoken') }; e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); -// e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]); -// e.originalEvent.dataTransfer.setData("type","document"); -// e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken')); }); /* Dropping item on alert below clipboard */ diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 1644d6de3..792e8960d 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -398,7 +398,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; for ($i = 0; $i < count($path); $i++) { $txtpath .= "
    • "; if ($i +1 < count($path)) { - $txtpath .= "getID()."&showtree=".showtree()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">". + $txtpath .= "getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" formtoken=\"".createFormKey('movefolder')."\">". htmlspecialchars($path[$i]->getName()).""; } else { @@ -1589,7 +1589,7 @@ $(document).ready(function() { if($path || $expandtree>=$level) { if($path) $pathfolder = array_shift($path); - $subfolders = $folder->getSubFolders($orderby[0], $orderdir); + $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { @@ -1597,7 +1597,7 @@ $(document).ready(function() { if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { - $documents = $subfolder->getDocuments($orderby[0], $orderdir); + $documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode); foreach($documents as $document) { $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); @@ -1609,7 +1609,7 @@ $(document).ready(function() { } return $children; } else { - $subfolders = $folder->getSubFolders($orderby[0], $orderdir); + $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { @@ -1634,7 +1634,7 @@ $(document).ready(function() { } else { $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0); if($showdocs) { - $documents = $folder->getDocuments($orderby[0], $orderdir); + $documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode); foreach($documents as $document) { $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); @@ -1675,7 +1675,7 @@ $(function() { onCreateLi: function(node, $li) { // Add 'icon' span before title if(node.is_folder) - $li.find('.jqtree-title').before(' ').attr('rel', 'folder_' + node.id).attr('formtoken', ''); + $li.find('.jqtree-title').before(' ').attr('rel', 'folder_' + node.id).attr('formtoken', '').attr('data-uploadformtoken', ''); else $li.find('.jqtree-title').before(' '); } @@ -2174,6 +2174,15 @@ $(document).ready( function() { "; } /* }}} */ + function documentListRowStart($document) { /* {{{ */ + $docID = $document->getID(); + return ""; + } /* }}} */ + + function documentListRowEnd($document) { /* {{{ */ + return "\n"; + } /* }}} */ + /** * Return HTML of a single row in the document list table * @@ -2197,7 +2206,7 @@ $(document).ready( function() { $docID = $document->getID(); if(!$skipcont) - $content .= ""; + $content .= $this->documentListRowStart($document); if($version) { $latestContent = $this->callHook('documentContent', $document, $version); @@ -2303,10 +2312,18 @@ $(document).ready( function() { $content .= ""; } if(!$skipcont) - $content .= "\n"; + $content .= $this->documentListRowEnd($document); return $content; } /* }}} */ + function folderListRowStart($folder) { /* {{{ */ + return "getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('adddocument')."\" formtoken=\"".createFormKey('movefolder')."\">"; + } /* }}} */ + + function folderListRowEnd($folder) { /* {{{ */ + return "\n"; + } /* }}} */ + function folderListRow($subFolder, $extracontent=array()) { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -2321,9 +2338,9 @@ $(document).ready( function() { if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; $content = ''; - $content .= "getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; - $content .= "getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>\n"; - $content .= "getID()."\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; + $content .= $this->folderListRowStart($subFolder); + $content .= "getID()."&showtree=".$showtree."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>\n"; + $content .= "getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; $content .= "
      ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; if($comment) { $content .= "
      ".htmlspecialchars($comment).""; @@ -2378,7 +2395,7 @@ $(document).ready( function() { } $content .= "
      • "; $content .= ""; - $content .= "\n"; + $content .= $this->folderListRowEnd($subFolder); return $content; } /* }}} */ diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php index 34f2f4451..13dafe1fa 100644 --- a/views/bootstrap/class.Clipboard.php +++ b/views/bootstrap/class.Clipboard.php @@ -103,7 +103,8 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style { $content = ''; $comment = $folder->getComment(); if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; - $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; +// $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; + $content .= $this->folderListRowStart($folder); $content .= "getID()."&showtree=".showtree()."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>\n"; $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . ""; if($comment) { @@ -138,7 +139,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style { $version = $latestContent->getVersion(); $status = $latestContent->getStatus(); - $content .= "getID()."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">"; + $content .= $this->documentListRowStart($document); if (file_exists($dms->contentDir . $latestContent->getPath())) { $content .= "getID()."&version=".$version."\">"; diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index d5b36979f..73415eaea 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -55,7 +55,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ header('Content-Type: application/javascript; charset=UTF-8'); - parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); + 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')); $this->printFolderChooserJs("form1"); $this->printDeleteFolderButtonJs(); diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 8962abeeb..cb9b409f3 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -94,7 +94,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $showtree = $this->params['showtree']; header('Content-Type: application/javascript; charset=UTF-8'); - parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); + 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')); ?> function folderSelected(id, name) { window.location = '../out/out.ViewFolder.php?folderid=' + id; @@ -390,7 +390,7 @@ $('#loadmore').click(function(e) { // $this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");"); // $this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');"); ?> -
      +
      "; echo "
      "; From 62f6431ac71f32a6dbeccb14475858e586599b1a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Jul 2019 17:19:46 +0200 Subject: [PATCH 117/467] new phrases --- languages/ar_EG/lang.inc | 5 +++++ languages/bg_BG/lang.inc | 5 +++++ languages/ca_ES/lang.inc | 5 +++++ languages/cs_CZ/lang.inc | 5 +++++ languages/de_DE/lang.inc | 7 ++++++- languages/el_GR/lang.inc | 5 +++++ languages/en_GB/lang.inc | 7 ++++++- languages/es_ES/lang.inc | 5 +++++ languages/fr_FR/lang.inc | 5 +++++ languages/hr_HR/lang.inc | 5 +++++ languages/hu_HU/lang.inc | 5 +++++ languages/it_IT/lang.inc | 5 +++++ languages/ko_KR/lang.inc | 5 +++++ languages/lo_LA/lang.inc | 5 +++++ languages/nl_NL/lang.inc | 5 +++++ languages/pl_PL/lang.inc | 5 +++++ languages/pt_BR/lang.inc | 5 +++++ languages/ro_RO/lang.inc | 5 +++++ languages/ru_RU/lang.inc | 5 +++++ languages/sk_SK/lang.inc | 5 +++++ languages/sv_SE/lang.inc | 5 +++++ languages/tr_TR/lang.inc | 5 +++++ languages/uk_UA/lang.inc | 5 +++++ languages/zh_CN/lang.inc | 5 +++++ languages/zh_TW/lang.inc | 5 +++++ 25 files changed, 127 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index de0f06586..fcc544ef2 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -283,6 +283,7 @@ URL: [url]', 'confirm_rm_user' => 'هل تود حقا ازالة المستخدم "[username]"?
      كن حذرا: هذا الاجراء لايمكن التراجع فيه', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'هل تود حقا ازالة الاصدار [version] الخاص بالمستند "[documentname]"?
      كن حذرا: هذا الاجراء لايمكن التراجع فيه', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'المحتوى', @@ -702,6 +703,7 @@ URL: [url]', 'linked_to_document' => 'ﺮﺒﻃ ﺐﻤﻠﻓ ﺄﺧﺭ', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل       صفحة التحميل.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'ﻉﺮﺿ ﻚﻟ ﺎﻠﺻﻼﺤﻳﺎﺗ', 'list_contains_no_access_docs' => '', @@ -1541,6 +1543,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => '', 'splash_invalid_searchterm' => '', +'splash_link_document' => '', 'splash_moved_clipboard' => '', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1571,6 +1574,7 @@ URL: [url]', 'splash_substituted_user' => '', 'splash_switched_back_user' => '', 'splash_toogle_group_manager' => '', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1660,6 +1664,7 @@ URL: [url]', 'toggle_manager' => 'رجح مدير', 'toggle_qrcode' => '', 'to_before_from' => '', +'transfer_content' => '', 'transfer_document' => 'ﺕﺮﺠﻣ ﺎﻠﻤﻠﻓ', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 63ee88dac..bce522960 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -266,6 +266,7 @@ $text = array( 'confirm_rm_user' => 'Изтрий потребител "[username]"?
      Действието е перманентно', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'Изтрий версия на [version] документ "[documentname]"?
      Действието е перманентно', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'Съдържание', @@ -631,6 +632,7 @@ $text = array( 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг начин.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Списък на права', 'list_contains_no_access_docs' => '', @@ -1404,6 +1406,7 @@ $text = array( 'splash_inherit_access' => '', 'splash_invalid_folder_id' => '', 'splash_invalid_searchterm' => '', +'splash_link_document' => '', 'splash_moved_clipboard' => '', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1434,6 +1437,7 @@ $text = array( 'splash_substituted_user' => '', 'splash_switched_back_user' => '', 'splash_toogle_group_manager' => '', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1523,6 +1527,7 @@ $text = array( 'toggle_manager' => 'Превключи мениджър', 'toggle_qrcode' => '', 'to_before_from' => '', +'transfer_content' => '', 'transfer_document' => 'Прехвърли документ', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 5a6b43e65..7408761fe 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -271,6 +271,7 @@ URL: [url]', 'confirm_rm_user' => '¿Vol realment eliminar l\'usuari "[username]"?
      Atenció: aquesta acció no es pot desfer.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => '¿Vol realment eliminar la versió [version] del document "[documentname]"?
      Atenció: aquesta acció no es pot desfer.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'Contingut', @@ -636,6 +637,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Llista tots els tipus d\'accés...', 'list_contains_no_access_docs' => '', @@ -1409,6 +1411,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => '', 'splash_invalid_searchterm' => '', +'splash_link_document' => '', 'splash_moved_clipboard' => '', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1439,6 +1442,7 @@ URL: [url]', 'splash_substituted_user' => '', 'splash_switched_back_user' => '', 'splash_toogle_group_manager' => '', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1528,6 +1532,7 @@ URL: [url]', 'toggle_manager' => 'Intercanviar manager', 'toggle_qrcode' => '', 'to_before_from' => '', +'transfer_content' => '', 'transfer_document' => 'transferir document', 'transfer_no_read_access' => '', 'transfer_no_write_access' => 'transferir sense poder escriure', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 432689409..1c8c0b91c 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Opravdu chcete odstranit uživatele "[username]"?
      Pozor: Akce je nevratná.', 'confirm_rm_user_from_processes' => 'Opravdu chcete odstranit uživatele "[username]" ze všech procesů?
      Pozor: Tato akce může vést k uvolnění dokumentů, pokud byl uživatel jediným nebo posledním schvalujícím.', 'confirm_rm_version' => 'Opravdu chcete odstranit verzi [version] dokumentu "[documentname]"?
      Buďte opatrní: Tuto činnost není možné vrátit zpět.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => 'Opravdu chcete přenést dokumenty, složky atd. Uživatele "[username]"?
      Pozor: Tuto akci nelze vrátit zpět.', 'confirm_update_transmittalitem' => 'Potvrďte aktualizaci', 'content' => 'Domů', @@ -740,6 +741,7 @@ URL: [url]', 'linked_to_document' => 'Provázáno s dokumentem', 'linked_to_this_version' => 'Provázáno odkazem s touto verzí', 'link_alt_updatedocument' => 'Chcete-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím alternativní stránku.', +'link_document' => '', 'link_to_version' => 'Provázat k verzi', 'list_access_rights' => 'Seznam všech přístupových práv ...', 'list_contains_no_access_docs' => 'Seznam obsahuje více dokumentů, ke kterým nemáte přístup a které se nezobrazují.', @@ -1620,6 +1622,7 @@ Jméno: [username] 'splash_inherit_access' => 'Přístupové právo bude zděděno', 'splash_invalid_folder_id' => 'Neplatné ID složky', 'splash_invalid_searchterm' => 'Neplatný vyhledávací dotaz', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky', 'splash_move_document' => 'Dokument přesunut', 'splash_move_folder' => 'Složka přesunuta', @@ -1650,6 +1653,7 @@ Jméno: [username] 'splash_substituted_user' => 'Zaměněný uživatel', 'splash_switched_back_user' => 'Přepnuto zpět na původního uživatele', 'splash_toogle_group_manager' => 'Manažer skupiny přepnut', +'splash_transfer_content' => '', 'splash_transfer_document' => 'Dokument přenesen', 'splash_transfer_objects' => 'Objekt přenesen', 'splash_trigger_workflow' => 'Spuštěn přechod workflow', @@ -1739,6 +1743,7 @@ Jméno: [username] 'toggle_manager' => 'Přepnout správce', 'toggle_qrcode' => 'Zobrazit / skrýt QR kód', 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení', +'transfer_content' => '', 'transfer_document' => 'Přenést dokument', 'transfer_no_read_access' => 'Uživatel nemá přístup ke čtení ve složce', 'transfer_no_write_access' => 'Uživatel nemá přístup k zápisu do složky', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 92217c35b..72afed2d7 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2688), dgrutsch (22) +// Translators: Admin (2694), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Möchten Sie wirklich den Benutzer "[username]" löschen?
      Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.', 'confirm_rm_user_from_processes' => 'Möchten Sie wirklich den Benutzer "[username]" aus allen Prozessen löschen?
      Beachten Sie, dass dies möglicherweise in der Freigabe von Dokumenten resultiert, wenn der Benutzer der einzige oder letzte Prüfer ist.', 'confirm_rm_version' => 'Wollen Sie die Version [version] des Dokumentes "[documentname]" wirklich löschen?
      Achtung: Dieser Vorgang kann nicht rückgängig gemacht werden.', +'confirm_transfer_link_document' => 'Möchten Sie das Dokument verlinken oder dessen Inhalt auf das Zieldokument als neue Version übertragen. Der Inhalt kann nur übertragen werden, wenn das Ursprungsdokument lediglich eine Version hat. Das Ursprungsdokument wird danach gelöscht.', 'confirm_transfer_objects' => 'Möchten Sie wirklich die Dokumente, Ordner, etc. des Benutzer "[username]" übertragen?
      Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.', 'confirm_update_transmittalitem' => 'Aktualisierung bestätigen', 'content' => 'Inhalt', @@ -739,6 +740,7 @@ URL: [url]', 'linked_to_document' => 'Mit dem Dokument verknüpft', 'linked_to_this_version' => 'Mit dieser Version verknüpft', 'link_alt_updatedocument' => 'Wenn Sie ein Dokument hochladen möchten, das größer als die maximale Dateigröße ist, dann benutzen Sie bitte die alternative Upload-Seite.', +'link_document' => 'Dokument verlinken', 'link_to_version' => 'An Version hängen', 'list_access_rights' => 'Alle Zugriffsrechte auflisten ...', 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.', @@ -1630,6 +1632,7 @@ Name: [username] 'splash_inherit_access' => 'Zugriffsrechte werden geerbt', 'splash_invalid_folder_id' => 'Ungültige Ordner-ID', 'splash_invalid_searchterm' => 'Ungültiger Suchbegriff', +'splash_link_document' => 'Link hinzugefügt', 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben', 'splash_move_document' => 'Dokument verschoben', 'splash_move_folder' => 'Ordner verschoben', @@ -1660,6 +1663,7 @@ Name: [username] 'splash_substituted_user' => 'Benutzer gewechselt', 'splash_switched_back_user' => 'Zum ursprünglichen Benutzer zurückgekehrt', 'splash_toogle_group_manager' => 'Gruppenverwalter gewechselt', +'splash_transfer_content' => 'Dokumenteninhalt übertragen', 'splash_transfer_document' => 'Dokument übertragen', 'splash_transfer_objects' => 'Objekte übertragen', 'splash_trigger_workflow' => '', @@ -1749,6 +1753,7 @@ Name: [username] 'toggle_manager' => 'Managerstatus wechseln', 'toggle_qrcode' => 'Zeige/verberge QR-Code', 'to_before_from' => 'Endedatum darf nicht vor dem Startdatum liegen', +'transfer_content' => 'Inhalt übertragen', 'transfer_document' => 'Dokument übertragen', 'transfer_no_read_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte', 'transfer_no_write_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index b1484434b..91e74cb03 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -266,6 +266,7 @@ $text = array( 'confirm_rm_user' => '', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => '', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'Περιεχόμενο', @@ -631,6 +632,7 @@ $text = array( 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => '', 'list_contains_no_access_docs' => '', @@ -1415,6 +1417,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => '', 'splash_invalid_searchterm' => '', +'splash_link_document' => '', 'splash_moved_clipboard' => '', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1445,6 +1448,7 @@ URL: [url]', 'splash_substituted_user' => '', 'splash_switched_back_user' => '', 'splash_toogle_group_manager' => '', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1534,6 +1538,7 @@ URL: [url]', 'toggle_manager' => '', 'toggle_qrcode' => '', 'to_before_from' => '', +'transfer_content' => '', 'transfer_document' => '', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 282accc17..e03f8dbff 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1780), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1786), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Do you really want to remove the user "[username]"?
      Be careful: This action cannot be undone.', 'confirm_rm_user_from_processes' => 'Do you really want to remove the user "[username]" from all processes?
      Be careful: This action can lead to the release of documents if the user was the only or last approver.', 'confirm_rm_version' => 'Do you really want to remove version [version] of document "[documentname]"?
      Be careful: This action cannot be undone.', +'confirm_transfer_link_document' => 'Select if you like to link the dragged document or transfer its content to the target document as a new version. Only documents with one version can be transferred. The dragged document will be removed afterwards.', 'confirm_transfer_objects' => 'Do you really want to transfer the documents, folders, etc. of the user "[username]"?
      Be careful: This action cannot be undone.', 'confirm_update_transmittalitem' => 'Confirm update', 'content' => 'Content', @@ -740,6 +741,7 @@ URL: [url]', 'linked_to_document' => 'Linked to document', 'linked_to_this_version' => 'Linked to this version', 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative upload page.', +'link_document' => 'Link document', 'link_to_version' => 'Attach to version', 'list_access_rights' => 'List all access rights ...', 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.', @@ -1625,6 +1627,7 @@ Name: [username] 'splash_inherit_access' => 'Access right will be inherited', 'splash_invalid_folder_id' => 'Invalid folder ID', 'splash_invalid_searchterm' => 'Invalid search term', +'splash_link_document' => 'Link added', 'splash_moved_clipboard' => 'Clipboard moved into current folder', 'splash_move_document' => 'Document moved', 'splash_move_folder' => 'Folder moved', @@ -1655,6 +1658,7 @@ Name: [username] 'splash_substituted_user' => 'Substituted user', 'splash_switched_back_user' => 'Switched back to original user', 'splash_toogle_group_manager' => 'Group manager toogled', +'splash_transfer_content' => 'Content transfered', 'splash_transfer_document' => 'Document transfered', 'splash_transfer_objects' => 'Objects transfered', 'splash_trigger_workflow' => 'Triggered transition of workflow', @@ -1744,6 +1748,7 @@ Name: [username] 'toggle_manager' => 'Toggle manager', 'toggle_qrcode' => 'Show/hide QR code', 'to_before_from' => 'End date may not be before start date', +'transfer_content' => 'Transfer content', 'transfer_document' => 'Transfer document', 'transfer_no_read_access' => 'The user does not have read access in the folder', 'transfer_no_write_access' => 'The user does not have write access in the folder', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 4e93f1ff4..aef6cca48 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -290,6 +290,7 @@ URL: [url]', 'confirm_rm_user' => '¿Desea realmente eliminar el usuario "[username]"?
      Atención: Esta acción no se puede deshacer.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => '¿Desea realmente eliminar la versión [version] del documento "[documentname]"?
      Atención: esta acción no se puede deshacer.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'Contenido', @@ -709,6 +710,7 @@ URL: [url]', 'linked_to_document' => 'Enlazado al documento', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la página de subida alternativa.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Listar los derechos de acceso', 'list_contains_no_access_docs' => '', @@ -1556,6 +1558,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'ID de carpeta inválido', 'splash_invalid_searchterm' => 'Término de búsqueda inválido', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1586,6 +1589,7 @@ URL: [url]', 'splash_substituted_user' => 'Usuario sustituido', 'splash_switched_back_user' => 'Cambió de nuevo al usuario original', 'splash_toogle_group_manager' => 'Administrador de grupo activado', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1675,6 +1679,7 @@ URL: [url]', 'toggle_manager' => 'Intercambiar mánager', 'toggle_qrcode' => '', 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio', +'transfer_content' => '', 'transfer_document' => 'Transferir documento', 'transfer_no_read_access' => 'El usuario no tiene acceso de lectura en la carpeta', 'transfer_no_write_access' => 'El usuario no tiene acceso de escritura en la carpeta', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index ccd3831e8..8fbefcd99 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Voulez-vous vraiment supprimer l’utilisateur « [username] » ?
      Attention : Cette action est irréversible.', 'confirm_rm_user_from_processes' => 'Voulez-vous vraiment retirer l’utilisateur « [username] » de tous les processus ?
      Attention : Cette action peut entrainer la publication des documents si l’utilisateur était le seul (ou dernier) approbateur.', 'confirm_rm_version' => 'Voulez-vous vraiment supprimer la version [version] du document « [documentname] » ?
      Attention : Cette action est irréversible.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => 'Voulez-vous vraiment transférer les documents, dossiers, etc. de l’utilisateur « [username] » ?
      Attention : Cette action est irréversible.', 'confirm_update_transmittalitem' => 'Confirmer la mise à jour', 'content' => 'Contenu', @@ -740,6 +741,7 @@ URL: [url]', 'linked_to_document' => 'Lié au document', 'linked_to_this_version' => 'Lié à cette version', 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la page d\'ajout multiple.', +'link_document' => '', 'link_to_version' => 'Version', 'list_access_rights' => 'Liste des droits d’accès…', 'list_contains_no_access_docs' => 'La liste contient des documents auxquels vous n’avez pas accès et qui ne sont donc pas affichés.', @@ -1609,6 +1611,7 @@ Nom : [username] 'splash_inherit_access' => 'Droits d’accès hérités', 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide', 'splash_invalid_searchterm' => 'Recherche invalide', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Contenu du presse-papier déplacé vers le dossier courant', 'splash_move_document' => 'Document déplacé', 'splash_move_folder' => 'Dossier déplacé', @@ -1639,6 +1642,7 @@ Nom : [username] 'splash_substituted_user' => 'Utilisateur de substitution', 'splash_switched_back_user' => 'Revenu à l\'utilisateur initial', 'splash_toogle_group_manager' => 'Responsable de groupe changé', +'splash_transfer_content' => '', 'splash_transfer_document' => 'Document transféré', 'splash_transfer_objects' => 'Objets transférés', 'splash_trigger_workflow' => 'Transition de workflow déclenchée', @@ -1728,6 +1732,7 @@ Nom : [username] 'toggle_manager' => 'Basculer \'Responsable\'', 'toggle_qrcode' => 'Afficher/masquer le QR code', 'to_before_from' => 'La date de fin ne peut pas être avant la date de début.', +'transfer_content' => '', 'transfer_document' => 'Transférer le document', 'transfer_no_read_access' => 'L’utilisateur n’a pas le droit de lecture dans ce dossier', 'transfer_no_write_access' => 'L’utilisateur n’a pas le droit d’écriture dans ce dossier', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index fe53bb654..44a8362c3 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -295,6 +295,7 @@ Internet poveznica: [url]', 'confirm_rm_user' => 'Da li zaista želite ukloniti korisnika "[username]"?
      Oprez: ova radnja nije povratna.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'Da li zaista želite ukloniti verziju [version] dokumenta "[documentname]"?
      Oprez: ova radnja nije povratna.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => 'Potvrdi izmjenu', 'content' => 'Sadržaj', @@ -714,6 +715,7 @@ Internet poveznica: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu upload page.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Izlistaj sve dozvole pristupa', 'list_contains_no_access_docs' => '', @@ -1577,6 +1579,7 @@ Internet poveznica: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Nevažeći ID mape', 'splash_invalid_searchterm' => 'Nevažeći traženi pojam', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1607,6 +1610,7 @@ Internet poveznica: [url]', 'splash_substituted_user' => 'Zamjenski korisnik', 'splash_switched_back_user' => 'Prebačeno nazad na izvornog korisnika', 'splash_toogle_group_manager' => 'Zamjenjen upravitelj grupe', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1696,6 +1700,7 @@ Internet poveznica: [url]', 'toggle_manager' => 'Zamjeni upravitelja', 'toggle_qrcode' => '', 'to_before_from' => 'Datum završetka ne može biti prije datuma početka', +'transfer_content' => '', 'transfer_document' => 'Prijenos dokumenta', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index b6b681de3..d310578fd 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -290,6 +290,7 @@ URL: [url]', 'confirm_rm_user' => 'Biztosan el kívánja távolítani ezt a felhasználót "[username]"?
      Legyen óvatos: Ez a művelet nem vonható vissza.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'Biztosan el kívánaj távolítani a dokumentum "[documentname]" [version] verzióját?
      Legyen óvatos: Ez a művelet nem vonható vissza.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'Tartalom', @@ -709,6 +710,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ha a jelenlegi maximális feltöltési méretnél nagyobb állományokat szeretne feltölteni, akkor használja az alternatív feltöltő oldalt.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Összes jogosultság felsorolása...', 'list_contains_no_access_docs' => '', @@ -1555,6 +1557,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Érvénytelen mappa azonosító', 'splash_invalid_searchterm' => 'Érvénytelen keresési feltétel', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1585,6 +1588,7 @@ URL: [url]', 'splash_substituted_user' => 'Helyettesített felhasználó', 'splash_switched_back_user' => 'Visszaváltva az eredeti felhasználóra', 'splash_toogle_group_manager' => 'Csoport kezelő kiválasztva', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1674,6 +1678,7 @@ URL: [url]', 'toggle_manager' => 'Kulcs kezelő', 'toggle_qrcode' => '', 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot', +'transfer_content' => '', 'transfer_document' => 'Tulajdonos váltás', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 55f2ee3de..228260ea4 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -296,6 +296,7 @@ URL: [url]', 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_user_from_processes' => 'Processo', 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => 'Conferma aggiornamento', 'content' => 'Contenuto', @@ -715,6 +716,7 @@ URL: [url]', 'linked_to_document' => 'Collegato al documento', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Elenca tutti i diritti di accesso...', 'list_contains_no_access_docs' => '', @@ -1589,6 +1591,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'ID cartella non valido', 'splash_invalid_searchterm' => 'Termine di ricerca non valido', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente', 'splash_move_document' => 'Documento spostato', 'splash_move_folder' => 'Cartella spostato', @@ -1619,6 +1622,7 @@ URL: [url]', 'splash_substituted_user' => 'Utente sostituito', 'splash_switched_back_user' => 'Ritorno all\'utente originale', 'splash_toogle_group_manager' => 'Amministratore di gruppo invertito', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1708,6 +1712,7 @@ URL: [url]', 'toggle_manager' => 'Gestore', 'toggle_qrcode' => 'Mostri / nascondi codice QR', 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio', +'transfer_content' => '', 'transfer_document' => 'Trasferisci Documento', 'transfer_no_read_access' => 'L`utente non ha i permessi in lettura per la cartella', 'transfer_no_write_access' => 'L`utente non ha i permessi in scrittura per la cartella', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index b97af1366..f515ed3f6 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -298,6 +298,7 @@ URL: [url]', 'confirm_rm_user' => '사용자 "[username]"을 정말 삭제 하시겠습니까?
      주의: 취소가 불가능 합니다.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => '문서 "[documentname]"의 버젼 [version]을 정말 삭제 하시겠습니까?
      주의: 취소가 불가능 합니다.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '업데이트 확인', 'content' => '콘텐츠', @@ -715,6 +716,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '최대 업로드 크기보다 큰 파일을 업로드하려는 경우, 대체 업로드 페이지를 upload page 사용하십시오.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => '모든 접근 권한 나열', 'list_contains_no_access_docs' => '', @@ -1571,6 +1573,7 @@ URL : [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => '잘못된 폴더 ID', 'splash_invalid_searchterm' => '잘못된 검색 범위', +'splash_link_document' => '', 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동', 'splash_move_document' => '문서 옮겨짐', 'splash_move_folder' => '폴더 옮겨짐', @@ -1601,6 +1604,7 @@ URL : [url]', 'splash_substituted_user' => '전환된 사용자', 'splash_switched_back_user' => '원래 사용자로 전환', 'splash_toogle_group_manager' => '그룹 관리자 전환', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1690,6 +1694,7 @@ URL : [url]', 'toggle_manager' => '전환 매니저', 'toggle_qrcode' => 'QR code 보이기/숨기기', 'to_before_from' => '종료일은 시작일 전이 될수 없습니다', +'transfer_content' => '', 'transfer_document' => '', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 84965ef76..0e881a928 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -293,6 +293,7 @@ URL: [url]', 'confirm_rm_user' => 'ເຈົ້າຄ້ອງການລົບຜູ້ໄຊ້ "[username]"?
      ລະວັງ: ການກະທຳນີ້ບໍ່ສາມາດຍົກເລີກໄດ້', 'confirm_rm_user_from_processes' => 'ເຈົ້າຕ້ອງການລົບຜູ້ໄຊ້ "[username] ອອກຈາກກະບວນການທັງຫມົດຫຼືບໍ
      ກະລຸນາໄຊ້ຄວາມລະມັດລະວັງ: ການດຳເນີນການນີ້ສາມາດນຳໄປສູ້ການເຜີຍແຜ່ເອກະສານໄດ້ຫາກຜູ້ໄຊ້ເປັນຜູ້ອະນຸມັດຜູ້ດຽວຫຼືເປັນຄົນສຸດທ້າຍເທົ່ານັ້ນ', 'confirm_rm_version' => 'ເຈົ້າຕ້ອງການລົບເອກະສານ [version] ເວີຊັນ [documentname] ລະວັງ: ເຈົ້າາບໍ່ສາມາດຍົກເລີກການດຳເນີນການນີ້ໄດ້', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => 'ເຈົ້າຕ້ອງການໂອນເອກະສານໂຟລເດີ ແລະອື່ນໆ ຂອງຜູ້ໄຊ້ "[username]"?
      ລະວັງ ການກະທໍານີ້ບໍ່ສາມາດຍົກເລີກໄດ້', 'confirm_update_transmittalitem' => 'ຢືນຢັນການອັບເດດ', 'content' => 'ເນື້ອຫາ', @@ -719,6 +720,7 @@ URL: [url]', 'linked_to_document' => 'ເຊື່ອມໂຍງກັລເອກະສານ', 'linked_to_this_version' => 'ເຊື່ອມໂຍງກັບເວີຊັນນີ້ແລ້ວ', 'link_alt_updatedocument' => 'ຖ້າເຈົ້າຕ້ອງການອັບໂຫລດໄຟລທີ່ໄຫ່ຍກວ່າຂະໜາດອັບໂຫລດສູງສຸດໃນປັດຈຸບັນກະລຸນາໄຊ້ ອັບໂຫລດຢູ່ຫ້າເຟສ ', +'link_document' => '', 'link_to_version' => 'ແນບໄປພ້ອມກັບເວີຊັນ', 'list_access_rights' => 'ສະແດງສິດທິການເຂົ້າເຖິງທັງໝົດ ...', 'list_contains_no_access_docs' => 'ລິດລາຍການປະກອບດ້ວຍເອກະສານເພີ່ມເຕີມທີ່ເຈົ້າບໍ່ສາມາດເຂົ້າເຖິງໄດ້ ແລະບໍ່ສະແດງ', @@ -1604,6 +1606,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'ID ໂຟລເດີບໍ່ຖືກຕ້ອງ', 'splash_invalid_searchterm' => 'ຄຳຄົນຫາບໍ່ຖືກຕ້ອງ', +'splash_link_document' => '', 'splash_moved_clipboard' => 'ຍ້າຍຄິບບອດໄປທີ່ໂຟລເດີປັດຈຸບັນແລ້ວ', 'splash_move_document' => 'ຍ້າຍເອກະສານແລ້ວ', 'splash_move_folder' => 'ຍ້າຍໂຟລເດີແລ້ວ', @@ -1634,6 +1637,7 @@ URL: [url]', 'splash_substituted_user' => 'ຜູ້ນຳໄຊ້ທີຖືກແທນທີ', 'splash_switched_back_user' => 'ປ່ຽນກັບໄປເປັນຜູ້ໄຊ້ເດີມ', 'splash_toogle_group_manager' => 'ການດູແລກຸ່ມ', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => 'ຖ່າຍໂອນວັດຖຸຮຽບຮ້ອຍແລ້ວ', 'splash_trigger_workflow' => '', @@ -1723,6 +1727,7 @@ URL: [url]', 'toggle_manager' => 'ສຳລັບຜູ້ຈັດການ', 'toggle_qrcode' => 'ສະແດງ/ ຊ້ອນລະຫັດ QR', 'to_before_from' => 'ວັນເລີ້ມຕົ້ນຈະບໍ່ຄືກັບວັນສຸດທ້າຍ', +'transfer_content' => '', 'transfer_document' => '', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index d2f34f932..d7cfb6de7 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -288,6 +288,7 @@ URL: [url]', 'confirm_rm_user' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen?
      Let op: deze handeling kan niet ongedaan worden gemaakt.', 'confirm_rm_user_from_processes' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen uit dit proces?
      Let op: deze handeling kan niet ongedaan worden gemaakt.', 'confirm_rm_version' => 'Weet U zeker dat U deze versie van het document "[documentname]" wilt verwijderen?
      Pas op: deze handeling kan niet ongedaan worden gemaakt.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => 'Weet U zeker dat U de documenten, mappen etc. van gebruiker "[username]" wilt overzetten?
      Let op: deze handeling kan niet ongedaan worden gemaakt.', 'confirm_update_transmittalitem' => 'Bevestig verandering van te verzenden item', 'content' => 'Welkomstpagina', @@ -714,6 +715,7 @@ URL: [url]', 'linked_to_document' => 'Bijlage(n) bij document', 'linked_to_this_version' => 'Bijlage bij deze versie', 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve upload pagina.', +'link_document' => '', 'link_to_version' => 'Bijlage(n) bij versie', 'list_access_rights' => 'Toegangsrechten', 'list_contains_no_access_docs' => 'Geen toegankelijke documenten', @@ -1601,6 +1603,7 @@ Name: [username] 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Ongeldige map ID', 'splash_invalid_searchterm' => 'Ongeldige zoekterm', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map', 'splash_move_document' => 'Document verplaatst', 'splash_move_folder' => 'Map verplaatst', @@ -1631,6 +1634,7 @@ Name: [username] 'splash_substituted_user' => 'Invallers gebruiker', 'splash_switched_back_user' => 'Teruggeschakeld naar de oorspronkelijke gebruiker', 'splash_toogle_group_manager' => 'Group manager toogled', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => 'Objecten overgedragen', 'splash_trigger_workflow' => '', @@ -1720,6 +1724,7 @@ Name: [username] 'toggle_manager' => 'Wijzig Beheerder', 'toggle_qrcode' => 'Tonen/Verbergen QR-code', 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen', +'transfer_content' => '', 'transfer_document' => 'Document overdragen', 'transfer_no_read_access' => '', 'transfer_no_write_access' => 'De gebruiker heeft geen schrijfrechten in deze map', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 46fc1324a..ae4184483 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -283,6 +283,7 @@ URL: [url]', 'confirm_rm_user' => 'Czy rzeczywiście chcesz usunąć użytkownika "[username]"?
      Ostrożnie: Ta operacja nie może być cofnięta.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'Czy rzeczywiście chcesz usunąć wersję [version] dokumentu "[documentname]"?
      Ostrożnie: Ta operacja nie może być cofnięta.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'Zawartość', @@ -702,6 +703,7 @@ URL: [url]', 'linked_to_document' => 'Połączony z dokumentem', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Jeśli chcesz wczytać pliki większe niż bieżące maksimum, użyj alternatywnej strony wczytywania.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Pokaż uprawnienia dostępu', 'list_contains_no_access_docs' => '', @@ -1535,6 +1537,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Nieprawidłowy identyfikator folderu', 'splash_invalid_searchterm' => 'Nieprawidłowa wartość wyszukiwania', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1565,6 +1568,7 @@ URL: [url]', 'splash_substituted_user' => 'Zmieniono użytkownika', 'splash_switched_back_user' => 'Przełączono z powrotem do oryginalnego użytkownika', 'splash_toogle_group_manager' => 'Przełączono grupę menadżerów', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1654,6 +1658,7 @@ URL: [url]', 'toggle_manager' => 'Przełączanie zarządcy', 'toggle_qrcode' => '', 'to_before_from' => '', +'transfer_content' => '', 'transfer_document' => 'Transfer dokumentu', 'transfer_no_read_access' => 'Użytkownik nie ma prawa do odczytu w tym folderze', 'transfer_no_write_access' => 'Użytkownik nie ma prawa do zapisu w tym folderze', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index c34c3a96f..07729ae35 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Você realmente deseja remover o usuário "[username]"?
      Tenha cuidado: esta ação não pode ser desfeita.', 'confirm_rm_user_from_processes' => 'Você realmente deseja remover o usuário "[username]" de todos os processos?
      Tenha cuidado: essa ação pode levar à liberação de documentos se o usuário for o único ou o último aprovador.', 'confirm_rm_version' => 'Deseja realmente remover versão [version] do documento "[documentname]"?
      Por favor, tenha cuidado porque esta ação não poderá ser desfeita.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => 'Você realmente quer transferir os documentos, pastas etc. do usuário "[username]"?
      Tenha cuidado: Esta ação não pode ser desfeita.', 'confirm_update_transmittalitem' => 'Confirme a atualização', 'content' => 'Conteúdo', @@ -740,6 +741,7 @@ URL: [url]', 'linked_to_document' => 'Vinculado ao documento', 'linked_to_this_version' => 'Vinculado a esta versão', 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de envio.', +'link_document' => '', 'link_to_version' => 'Anexar à versão', 'list_access_rights' => 'Listar todos os direitos de acesso...', 'list_contains_no_access_docs' => 'A lista contém mais documentos aos quais você não tem acesso e não são exibidos.', @@ -1623,6 +1625,7 @@ Nome: [username] 'splash_inherit_access' => 'O direito de acesso será herdado', 'splash_invalid_folder_id' => 'ID de pasta inválida', 'splash_invalid_searchterm' => 'Termo de pesquisa inválido', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente', 'splash_move_document' => 'Documento movido', 'splash_move_folder' => 'Pasta movida', @@ -1653,6 +1656,7 @@ Nome: [username] 'splash_substituted_user' => 'Usuário substituido', 'splash_switched_back_user' => 'Comutada de volta ao usuário original', 'splash_toogle_group_manager' => 'Gerente Grupo alternado', +'splash_transfer_content' => '', 'splash_transfer_document' => 'Documento transferido', 'splash_transfer_objects' => 'Objetos transferidos', 'splash_trigger_workflow' => 'Acionada transição do fluxo de trabalho', @@ -1742,6 +1746,7 @@ Nome: [username] 'toggle_manager' => 'Alternar gerente', 'toggle_qrcode' => 'Mostrar / ocultar o código QR', 'to_before_from' => 'A data de término não pode ser anterior a data de início', +'transfer_content' => '', 'transfer_document' => 'Transferir documento', 'transfer_no_read_access' => 'O usuário não possui acesso de leitura na pasta', 'transfer_no_write_access' => 'O usuário não possui acesso de escrita na pasta', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index cf81b7c97..cac87904d 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Sigur doriți să eliminați utilizatorul "[username]"?
      Fiți atenți: Această acțiune nu poate fi anulată.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'Sigur doriți să eliminați versiunea [version] a documentului "[documentname]"?
      Fiți atenți: Această acțiune nu poate fi anulată.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'Conținut', @@ -714,6 +715,7 @@ URL: [url]', 'linked_to_document' => 'Atasat documentului', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa pagină de încărcare.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Listeaza toate drepturile de acces', 'list_contains_no_access_docs' => '', @@ -1578,6 +1580,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'ID folder invalid', 'splash_invalid_searchterm' => 'Termen de căutare invalid', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1608,6 +1611,7 @@ URL: [url]', 'splash_substituted_user' => 'Utilizator substituit', 'splash_switched_back_user' => 'Comutat înapoi la utilizatorul original', 'splash_toogle_group_manager' => 'Comută Managerul de grup', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1697,6 +1701,7 @@ URL: [url]', 'toggle_manager' => 'Comută Manager', 'toggle_qrcode' => '', 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere', +'transfer_content' => '', 'transfer_document' => 'Transfer document', 'transfer_no_read_access' => '', 'transfer_no_write_access' => 'Utilizatorul nu are drepturi de scriere pe acest dosar', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 0471d460b..49917e420 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Удалить пользователя «[username]»?
      Действие необратимо', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'Удалить версию [version] документа «[documentname]»?
      Действие необратимо', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => 'Подтвердите обновление', 'content' => 'Содержимое', @@ -714,6 +715,7 @@ URL: [url]', 'linked_to_document' => 'Связан с документом', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте другой способ.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Показать все права доступа', 'list_contains_no_access_docs' => '', @@ -1585,6 +1587,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Неверный идентификатор каталога', 'splash_invalid_searchterm' => 'Неверный поисковый запрос', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1615,6 +1618,7 @@ URL: [url]', 'splash_substituted_user' => 'Пользователь переключён', 'splash_switched_back_user' => 'Переключён на исходного пользователя', 'splash_toogle_group_manager' => 'Изменён менеджер группы', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1704,6 +1708,7 @@ URL: [url]', 'toggle_manager' => 'Изменить как менеджера', 'toggle_qrcode' => '', 'to_before_from' => 'Конечная дата не может быть меньше начальной даты', +'transfer_content' => '', 'transfer_document' => 'Передать документ', 'transfer_no_read_access' => 'Пользователь не имеет доступа на чтение в этой папке', 'transfer_no_write_access' => 'Пользователь не имеет доступа на запись в этой папке', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 838324151..741df4153 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Skutočne si prajete odstrániť používateľa "[username]"?
      Buďte opatrní, táto akcia je nezvratná.', 'confirm_rm_user_from_processes' => 'Do you really want to remove the user "[username]" from all processes?
      Be careful: This action can lead to the release of documents if the user was the only or last approver.', 'confirm_rm_version' => 'Naozaj chcete odstrániť verziu [version] dokumentu "[documentname]"?
      Buďte opatrní: Túto operáciu nemožno vrátiť späť.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => 'Do you really want to transfer the documents, folders, etc. of the user "[username]"?
      Be careful: This action cannot be undone.', 'confirm_update_transmittalitem' => 'Potvrdiť aktualizáciu', 'content' => 'Obsah', @@ -740,6 +741,7 @@ URL: [url]', 'linked_to_document' => 'Prepojené s dokumentom', 'linked_to_this_version' => 'Prepojené s touto verziou', 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative upload page.', +'link_document' => '', 'link_to_version' => 'Pripojiť k verzii', 'list_access_rights' => 'Zobraziť všetky prístupové práva', 'list_contains_no_access_docs' => 'Zoznam obsahuje viac dokumentov, ku ktorým nemáte prístup a nie sú zobrazené.', @@ -1625,6 +1627,7 @@ Meno: [username] 'splash_inherit_access' => 'Access right will be inherited', 'splash_invalid_folder_id' => 'Neplatné ID zložky', 'splash_invalid_searchterm' => 'Invalid search term', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Schránka sa presunula do aktuálnej zložky', 'splash_move_document' => 'Dokument bol presunutý', 'splash_move_folder' => 'Zložka bola presunutá', @@ -1655,6 +1658,7 @@ Meno: [username] 'splash_substituted_user' => 'Substituted user', 'splash_switched_back_user' => 'Switched back to original user', 'splash_toogle_group_manager' => 'Group manager toogled', +'splash_transfer_content' => '', 'splash_transfer_document' => 'Document transfered', 'splash_transfer_objects' => 'Objects transfered', 'splash_trigger_workflow' => '', @@ -1744,6 +1748,7 @@ Meno: [username] 'toggle_manager' => 'Prepnúť stav manager', 'toggle_qrcode' => 'Ukázať/skryť QR kód', 'to_before_from' => 'End date may not be before start date', +'transfer_content' => '', 'transfer_document' => 'Zmeniť vlastníka', 'transfer_no_read_access' => 'Používateľ nemá práva na čítanie v adresári', 'transfer_no_write_access' => 'Používateľ nemá práva na zapisovanie v adresári', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index f362ad09a..542705239 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -296,6 +296,7 @@ URL: [url]', 'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?
      OBS! Åtgärden kan inte ångras!', 'confirm_rm_user_from_processes' => 'Vill du verkligen ta bort användaren "[username]" från alla arbetsflöden?
      Var försiktig! Denna åtgärd kan innebära oönskad publicering om användaren är den sista eller enda godkännaren i ett arbetsflöde.', 'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?
      OBS! Åtgärden kan inte ångras!', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => 'Vill du verkligen flytta dokument, kataloger m m tillhörande användaren "[username]"? OBS! Åtgärden kan inte ångras!', 'confirm_update_transmittalitem' => 'Bekräfta uppdatering', 'content' => 'Innehåll', @@ -727,6 +728,7 @@ URL: [url]', 'linked_to_document' => 'Länkad till dokument', 'linked_to_this_version' => 'Länkad till denna version', 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer Alternativ uppladdning.', +'link_document' => '', 'link_to_version' => 'Kopppla till version', 'list_access_rights' => 'Lista alla rättigheter...', 'list_contains_no_access_docs' => 'Listan innehåller fler dokument som inte visas då du saknar rättigheter till dessa.', @@ -1598,6 +1600,7 @@ Kommentar: [comment]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Ogiltigt katalog-ID', 'splash_invalid_searchterm' => 'Ogiltigt sökord', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Urklipp flyttades till aktuell katalog', 'splash_move_document' => 'Dokumentet flyttat', 'splash_move_folder' => 'Katalogen flyttad', @@ -1628,6 +1631,7 @@ Kommentar: [comment]', 'splash_substituted_user' => 'Bytt användare', 'splash_switched_back_user' => 'Byt tillbaka till original användare', 'splash_toogle_group_manager' => 'Gruppmanager har ändrats', +'splash_transfer_content' => '', 'splash_transfer_document' => 'Dokument överfört', 'splash_transfer_objects' => 'Objekt överförda', 'splash_trigger_workflow' => '', @@ -1717,6 +1721,7 @@ Kommentar: [comment]', 'toggle_manager' => 'Byt manager', 'toggle_qrcode' => 'Visa/göm QR-kod', 'to_before_from' => 'Slutdatum får inte vara innan startdatum', +'transfer_content' => '', 'transfer_document' => 'Överför dokument', 'transfer_no_read_access' => 'Användaren har inte läsrättigheter i katalogen', 'transfer_no_write_access' => 'Användaren har inte skrivrättigheter i katalogen', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index b8b53939a..669122685 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -289,6 +289,7 @@ URL: [url]', 'confirm_rm_user' => '"[username]" kullanıcısını silmeyi onaylıyor musunuz?
      Dikkatli olun: Bu eylemin geri dönüşü yoktur.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => '"[documentname]" dokümanının [version] versiyonunu silmek istiyor musunuz?
      Dikkatli olun: Bu eylemin geri dönüşü yoktur.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => 'İçerik', @@ -708,6 +709,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Mevcut maksimum yükleme boyutundan daha büyük dosya yüklemek istiyorsanız alternatif yükleme sayfası için tıklayın.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Tüm erişim haklarini listele', 'list_contains_no_access_docs' => '', @@ -1557,6 +1559,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Hatalı klasör ID', 'splash_invalid_searchterm' => 'Hatalı arama terimi', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1587,6 +1590,7 @@ URL: [url]', 'splash_substituted_user' => 'Yerine geçilen kullanıcı', 'splash_switched_back_user' => 'Orijinal kullanıcıya geri dönüldü', 'splash_toogle_group_manager' => 'Grup yöneticisi değişti', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1676,6 +1680,7 @@ URL: [url]', 'toggle_manager' => 'Değişim yönetimi', 'toggle_qrcode' => '', 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz', +'transfer_content' => '', 'transfer_document' => 'Dokumanı gönder', 'transfer_no_read_access' => 'Kullanıcının klasörde okuma erişimi yok.', 'transfer_no_write_access' => 'Kullanıcının klasör üzerinde yazma hakkı yok', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index be3385893..ccc5a7c0e 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -295,6 +295,7 @@ URL: [url]', 'confirm_rm_user' => 'Видалити користувача «[username]»?
      Дія незворотня', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => 'Видалити версію [version] документа «[documentname]»?
      Дія незворотня', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => 'Підтвердити оновлення', 'content' => 'Вміст', @@ -714,6 +715,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Для завантаження файлів, які перевищують обмеження розміру, використовуйте інший метод.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => 'Повний список прав...', 'list_contains_no_access_docs' => '', @@ -1578,6 +1580,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => 'Невірний ідентифікатор каталогу', 'splash_invalid_searchterm' => 'Невірний пошуковий запит', +'splash_link_document' => '', 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1608,6 +1611,7 @@ URL: [url]', 'splash_substituted_user' => 'Користувача переключено', 'splash_switched_back_user' => 'Переключено на початкового користувача', 'splash_toogle_group_manager' => 'Змінено менеджера групи', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1697,6 +1701,7 @@ URL: [url]', 'toggle_manager' => 'Змінити ознаку менеджера', 'toggle_qrcode' => '', 'to_before_from' => 'Кінцева дата не може бути меншою початкової дати', +'transfer_content' => '', 'transfer_document' => '', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 72d351a6f..06fe3aa4b 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -287,6 +287,7 @@ URL: [url]', 'confirm_rm_user' => '您确定要删除"[username]"用户?
      请注意：此动作执行后不能撤销.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => '您确定要删除"[documentname]文档的[version]版本文件?
      请注意：此动作执行后不能撤销.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '确认更新', 'content' => '内容', @@ -710,6 +711,7 @@ URL: [url]', 'linked_to_document' => '链接到文档', 'linked_to_this_version' => '链接到版本', 'link_alt_updatedocument' => '超过20M大文件，请选择上传大文件.', +'link_document' => '', 'link_to_version' => '附加到版本', 'list_access_rights' => '列出所有的访问权限', 'list_contains_no_access_docs' => '', @@ -1559,6 +1561,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => '非法的文件夹 ID', 'splash_invalid_searchterm' => '无效的搜索项', +'splash_link_document' => '', 'splash_moved_clipboard' => '', 'splash_move_document' => '文档已迁移', 'splash_move_folder' => '文件夹已迁移', @@ -1589,6 +1592,7 @@ URL: [url]', 'splash_substituted_user' => '', 'splash_switched_back_user' => '', 'splash_toogle_group_manager' => '', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1678,6 +1682,7 @@ URL: [url]', 'toggle_manager' => '角色切换', 'toggle_qrcode' => '显示/隐藏 QR 码', 'to_before_from' => '结束日期不能早于开始日期', +'transfer_content' => '', 'transfer_document' => '共享文档', 'transfer_no_read_access' => '用户没有该文件夹的读权限', 'transfer_no_write_access' => '当前用户没有文件夹写入权限', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index a8af9e3b4..1decac6ff 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -270,6 +270,7 @@ URL: [url]', 'confirm_rm_user' => '您確定要刪除"[username]"用戶?
      請注意：此動作執行後不能撤銷.', 'confirm_rm_user_from_processes' => '', 'confirm_rm_version' => '您確定要刪除"[documentname]文檔的[version]版本檔?
      請注意：此動作執行後不能撤銷.', +'confirm_transfer_link_document' => '', 'confirm_transfer_objects' => '', 'confirm_update_transmittalitem' => '', 'content' => '內容', @@ -635,6 +636,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '超過20M大檔，請選擇上傳大檔.', +'link_document' => '', 'link_to_version' => '', 'list_access_rights' => '列出權限', 'list_contains_no_access_docs' => '', @@ -1408,6 +1410,7 @@ URL: [url]', 'splash_inherit_access' => '', 'splash_invalid_folder_id' => '', 'splash_invalid_searchterm' => '', +'splash_link_document' => '', 'splash_moved_clipboard' => '', 'splash_move_document' => '', 'splash_move_folder' => '', @@ -1438,6 +1441,7 @@ URL: [url]', 'splash_substituted_user' => '', 'splash_switched_back_user' => '', 'splash_toogle_group_manager' => '', +'splash_transfer_content' => '', 'splash_transfer_document' => '', 'splash_transfer_objects' => '', 'splash_trigger_workflow' => '', @@ -1527,6 +1531,7 @@ URL: [url]', 'toggle_manager' => '角色切換', 'toggle_qrcode' => '', 'to_before_from' => '', +'transfer_content' => '', 'transfer_document' => '', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', From c5e6131c141684438a4ed8f2230527c8339c6b80 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:39:44 +0200 Subject: [PATCH 118/467] use getVersion() instead of accessing _version which is now protected --- SeedDMS_Core/Core/inc.ClassDocument.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index cbf26d2ab..96b2355c7 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -1813,7 +1813,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $status = $version->getStatus(); $stID = $status["statusID"]; - $queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() . " AND `version` = " . $version->_version; + $queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() . " AND `version` = " . $version->getVersion(); if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -1831,7 +1831,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return false; } - $queryStr = "DELETE FROM `tblDocumentStatus` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'"; + $queryStr = "DELETE FROM `tblDocumentStatus` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -1861,7 +1861,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return false; } } - $queryStr = "DELETE FROM `tblDocumentReviewers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'"; + $queryStr = "DELETE FROM `tblDocumentReviewers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -1890,26 +1890,26 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return false; } } - $queryStr = "DELETE FROM `tblDocumentApprovers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'"; + $queryStr = "DELETE FROM `tblDocumentApprovers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'"; + $queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'"; + $queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // remove document files attached to version - $res = $this->getDocumentFiles($version->_version); + $res = $this->getDocumentFiles($version->getVersion()); if (is_bool($res) && !$res) { $db->rollbackTransaction(); return false; From e79e9de1cfea3271609f0c1bca98120506801dc8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:40:38 +0200 Subject: [PATCH 119/467] add new class SeedDMS_CSRF for creating time base tokens (currently not used) --- inc/inc.Utils.php | 74 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 15e9a7452..82bc8c0fc 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -480,21 +480,35 @@ function checkQuota($user) { /* {{{ */ return ($quota - $user->getUsedDiskSpace()); } /* }}} */ -function encryptData($key, $value){ +/** + * Encrypt any data with a key + * + * @param string $key + * @param string $value plain text data + * @return string encrypted data + */ +function encryptData($key, $value) { /* {{{ */ $text = $value; $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND); $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $text, MCRYPT_MODE_ECB, $iv); return $crypttext; -} +} /* }}} */ -function decryptData($key, $value){ +/** + * Decrypt data previously encrypted by encrypt + * + * @param string $key + * @param string $value encrypted data + * @return string plain text data + */ +function decryptData($key, $value) { /* {{{ */ $crypttext = $value; $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND); $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $crypttext, MCRYPT_MODE_ECB, $iv); return trim($decrypttext); -} +} /* }}} */ /** * Return file extension for a give mimetype @@ -574,4 +588,56 @@ function sendFile($filename) { /* {{{ */ readfile($filename); } } /* }}} */ + +class SeedDMS_CSRF { + + protected $secret; + + public function __construct($secret) { + $this->secret = $secret; + } + + public function create_api_key() { + return base64_encode($this->encrypt(time().'|'.$_SERVER['REMOTE_ADDR'])); // !change if you dont want IP check + } + + public function check_api_key($key, $timeout = 5) { + if (empty($key)) exit('Invalid Key'); + + $keys = explode('|', $this->decrypt(base64_decode($key))); + + return ( + isset($key, $keys[0], $keys[1]) && + $keys[0] >= (time() - $timeout) && + $keys[1] == $_SERVER['REMOTE_ADDR'] // !change if you dont want IP check + ); + } + + public function encrypt($string, $key = 'PrivateKey', $method = 'AES-256-CBC') { + // hash + $key = hash('sha256', $key); + // create iv - encrypt method AES-256-CBC expects 16 bytes + $iv = substr(hash('sha256', $this->secret), 0, 16); + // encrypt + $output = openssl_encrypt($string, $method, $key, 0, $iv); + // encode + return base64_encode($output); + } + + public function decrypt($string, $key = 'PrivateKey', $method = 'AES-256-CBC') { + // hash + $key = hash('sha256', $key); + // create iv - encrypt method AES-256-CBC expects 16 bytes + $iv = substr(hash('sha256', $this->secret), 0, 16); + // decode + $string = base64_decode($string); + // decrypt + return openssl_decrypt($string, $method, $key, 0, $iv); + } +} + +//$CSRF = new SeedDMS_CSRF($settings->_encryptionKey); +//$kkk = $CSRF->create_api_key(); +//echo $kkk; +//echo $CSRF->check_api_key($kkk) ? 'valid' : 'invalid'; ?> From a115cb30f20081390c6915151931d12208583bd0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:41:40 +0200 Subject: [PATCH 120/467] add style for div.statusbar-container --- styles/bootstrap/application.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index 6a02e1153..4740d89f9 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -152,6 +152,25 @@ div.splash { display: none; } +div.statusbar-container { + display: none; + position: fixed; + right:10px; + top:60px; + width:300px; + padding:10px; + background-color: white; + border: 1px solid #E0E0E0; + border-radius: 4px; + z-index: 10; +} +div.statusbar-container h1 { + font-size: 21px; + line-height: 40px; + color: #333333; + font-weight: normal; +} + ul.jqtree-tree li.jqtree_common > .jqtree-element:hover { background-color: #E0E0E0; } From 9579c0480b03ac530a2a1285388c4a6a508b8a0d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:42:29 +0200 Subject: [PATCH 121/467] add code for bootbox, make drag&drop work --- views/bootstrap/class.ApprovalSummary.php | 17 +++++++++++++---- views/bootstrap/class.ReviewSummary.php | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index f3f0d809c..bff1f59dc 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -36,6 +36,13 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + 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')); + + $this->printDeleteDocumentButtonJs(); + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -46,6 +53,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); + $this->htmlAddHeader(''."\n", 'js'); + $this->htmlStartPage(getMLText("approval_summary")); $this->globalNavigation(); $this->contentStart(); @@ -84,10 +93,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { } $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); - print ""; + echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); print "".getApprovalStatusText($st['status'])."
      ".$st["date"]."
      ". htmlspecialchars($moduser->getFullName()) ."      "; - print "\n"; + echo $this->documentListRowEnd($document); } if ($st["status"]!=-2) { $iRev[] = $st["documentID"]; @@ -126,10 +135,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { } $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); - print ""; + echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); print "".getApprovalStatusText($st["status"])."
      ".$st["date"]."
      ". htmlspecialchars($moduser->getFullName()) ."      "; - print "\n"; + echo $this->documentListRowEnd($document); } } if (!$printheader) { diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index 56a94973c..19e23496b 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -36,6 +36,13 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + 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')); + + $this->printDeleteDocumentButtonJs(); + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -46,6 +53,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); + $this->htmlAddHeader(''."\n", 'js'); + $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); $this->contentStart(); @@ -87,10 +96,10 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { } $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); - print ""; + echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); print "".getReviewStatusText($st['status'])."
      ".$st["date"]."
      ". htmlspecialchars($moduser->getFullName()) ."      "; - print "\n"; + echo $this->documentListRowEnd($document); } if ($st["status"]!=-2) { $iRev[] = $st["documentID"]; @@ -130,7 +139,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { } $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); - print ""; +// print ""; + echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); print "".getReviewStatusText($st['status'])."
      ".$st["date"]."
      ". htmlspecialchars($moduser->getFullName()) ."      "; print "\n"; From 19f599008048bb7e7135f9a3443195e7c3d20858 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:43:34 +0200 Subject: [PATCH 122/467] add div.statusbar-container, remove old code, make drag&drop work --- views/bootstrap/class.Bootstrap.php | 51 +++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 792e8960d..1eb5703c7 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -128,6 +128,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $this->params['session']->clearSplashMsg(); echo "
      ".$flashmsg['msg']."
      \n"; } + echo "

      ".getMLText('recent_uploads')."

      \n"; foreach($hookObjs as $hookObj) { if (method_exists($hookObj, 'startBody')) { $hookObj->startBody($this); @@ -398,7 +399,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; for ($i = 0; $i < count($path); $i++) { $txtpath .= "
    • "; if ($i +1 < count($path)) { - $txtpath .= "getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" formtoken=\"".createFormKey('movefolder')."\">". + $txtpath .= "getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">". htmlspecialchars($path[$i]->getName()).""; } else { @@ -1675,7 +1676,7 @@ $(function() { onCreateLi: function(node, $li) { // Add 'icon' span before title if(node.is_folder) - $li.find('.jqtree-title').before(' ').attr('rel', 'folder_' + node.id).attr('formtoken', '').attr('data-uploadformtoken', ''); + $li.find('.jqtree-title').before(' ').attr('rel', 'folder_' + node.id).attr('formtoken', '').attr('data-uploadformtoken', ''); else $li.find('.jqtree-title').before(' '); } @@ -2174,9 +2175,15 @@ $(document).ready( function() { "; } /* }}} */ - function documentListRowStart($document) { /* {{{ */ + /** + * Start the row for a folder in list of documents and folders + * + * For a detailed description see + * {@link SeedDMS_Bootstrap_Style::folderListRowStart()} + */ + function documentListRowStart($document, $class='') { /* {{{ */ $docID = $document->getID(); - return ""; + return ""; } /* }}} */ function documentListRowEnd($document) { /* {{{ */ @@ -2316,8 +2323,40 @@ $(document).ready( function() { return $content; } /* }}} */ - function folderListRowStart($folder) { /* {{{ */ - return "getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('adddocument')."\" formtoken=\"".createFormKey('movefolder')."\">"; + /** + * Start the row for a folder in list of documents and folders + * + * This method creates the starting tr tag for a new table row containing + * a folder list entry. The tr tag contains various attributes which are + * used for removing the table line and to make drap&drop work. + * + * id=table-row-folder- : used for identifying the row when removing the table + * row after deletion of the folder by clicking on the delete button in that table + * row. + * data-droptarget=folder_ : identifies the folder represented by this row + * when it used as a target of the drag&drop operation. + * If an element (either a file or a dragged item) is dropped on this row, the + * data-droptarget will be evaluated to identify the underlying dms object. + * Dropping a file on a folder will upload that file into the folder. Droping + * an item (which is currently either a document or a folder) from the page will + * move that item into the folder. + * rel=folder_ : This data is put into drag data when a drag starts. When the + * item is dropped on some other item this data will identify the source object. + * The attributes data-droptarget and rel are usually equal. At least there is + * currently no scenario where they are different. + * formtoken= : token made of key 'movefolder' + * formtoken is also placed in the drag data just like the value of attibute 'rel'. + * This is always set to a value made of 'movefolder'. + * data-uploadformtoken= : token made of key 'adddocument' + * class=table-row-folder : The class must have a class named 'table-row-folder' in + * order to be draggable and to extract the drag data from the attributes 'rel' and + * 'formtoken' + * + * @param object $folder + * @return string starting tr tag for a table + */ + function folderListRowStart($folder, $class='') { /* {{{ */ + return "getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget".($class ? ' '.$class : '')."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">"; } /* }}} */ function folderListRowEnd($folder) { /* {{{ */ From 08ecb9829e6fd5eaab62322209a8c28dd5806ffb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:44:23 +0200 Subject: [PATCH 123/467] make drag&drop work --- views/bootstrap/class.Clipboard.php | 4 +- views/bootstrap/class.Search.php | 139 ---------------------------- 2 files changed, 2 insertions(+), 141 deletions(-) diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php index 13dafe1fa..136431e21 100644 --- a/views/bootstrap/class.Clipboard.php +++ b/views/bootstrap/class.Clipboard.php @@ -57,11 +57,11 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style { $content .= "
        \n"; foreach($clipboard['folders'] as $folderid) { if($folder = $this->params['dms']->getFolder($folderid)) - $content .= "
      • getID()."\"> ".htmlspecialchars($folder->getName())."
        • \n"; + $content .= "
      • getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"> ".htmlspecialchars($folder->getName())."
        • \n"; } foreach($clipboard['docs'] as $docid) { if($document = $this->params['dms']->getDocument($docid)) - $content .= "
      • getID()."\"> ".htmlspecialchars($document->getName())."
        • \n"; + $content .= "
      • getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\"> ".htmlspecialchars($document->getName())."
        • \n"; } $content .= "
      • \n"; if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) { diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 73415eaea..c5e1e4e2f 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -532,87 +532,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { if($attrstr) $extracontent['bottom_title'] = '
        '.$this->printPopupBox(''.getMLText('attributes').'', $attrstr, true); print $this->documentListRow($document, $previewer, false, 0, $extracontent); - - if(0) { - print "getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">"; - if (in_array(2, $searchin)) { - $docName = $this->markQuery(htmlspecialchars($document->getName()), "i"); - } else { - $docName = htmlspecialchars($document->getName()); - } - print "getID()."\">"; - if($previewer->hasPreview($lc)) { - print "getID()."&version=".$lc->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; - } else { - print "getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; - } - print ""; - print "getID()."\">"; - print $docName; - print ""; - print "
        ".getMLText('in_folder').": /"; - $folder = $document->getFolder(); - $path = $folder->getPath(); - for ($i = 1; $i < count($path); $i++) { - print htmlspecialchars($path[$i]->getName())."/"; - } - print ""; - print "
        ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $document->getDate()).", ".getMLText('version')." ".$version." - ".date('Y-m-d', $lc->getDate()).""; - if($comment) { - print "
        ".htmlspecialchars($comment).""; - } - print ""; - - print ""; - print "
          \n"; - $lcattributes = $lc->getAttributes(); - if($lcattributes) { - foreach($lcattributes as $lcattribute) { - $attrdef = $lcattribute->getAttributeDefinition(); - print "
        • ".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $lcattribute->getValueAsArray()))."
          • \n"; - } - } - print "
        \n"; - print "
          \n"; - $docttributes = $document->getAttributes(); - if($docttributes) { - foreach($docttributes as $docttribute) { - $attrdef = $docttribute->getAttributeDefinition(); - print "
        • ".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $docttribute->getValueAsArray()))."
          • \n"; - } - } - print "
        \n"; - print ""; - - $display_status=$lc->getStatus(); - print "".getOverallStatusText($display_status["status"]). ""; - print ""; - print "
        "; - if($document->getAccessMode($user) >= M_ALL) { - $this->printDeleteDocumentButton($document, 'splash_rm_document'); - } else { - ?> - - getAccessMode($user) >= M_READWRITE) { - ?> - - - - - getID(); ?>" msg="" _href="../op/op.AddToClipboard.php?documentid=getID(); ?>&type=document&id=getID(); ?>&refferer=params['refferer']); ?>" title=""> -"; - print ""; - print "\n"; - } } } elseif(get_class($entry) == $dms->getClassname('folder')) { $folder = $entry; @@ -638,64 +557,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { if($attrstr) $extracontent['bottom_title'] = '
        '.$this->printPopupBox(''.getMLText('attributes').'', $attrstr, true); print $this->folderListRow($folder, $extracontent); - if(0) { - print "getID()."\" draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; - print "getID()."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>"; - print "getID()."\">"; - print $folderName; - print ""; - print "
        ".getMLText('in_folder').": /"; - $path = $folder->getPath(); - for ($i = 1; $i < count($path)-1; $i++) { - print htmlspecialchars($path[$i]->getName())."/"; - } - print ""; - print "
        ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $folder->getDate()).""; - if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($folder->getComment())); - else $comment = htmlspecialchars($folder->getComment()); - if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "..."; - if($comment) { - print "
        ".htmlspecialchars($comment).""; - } - print ""; - print ""; - print "
          \n"; - $folderattributes = $folder->getAttributes(); - if($folderattributes) { - foreach($folderattributes as $folderattribute) { - $attrdef = $folderattribute->getAttributeDefinition(); - print "
        • ".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $folderattribute->getValueAsArray()))."
          • \n"; - } - } - print ""; - print ""; - print ""; - print "
          "; - if($folder->getAccessMode($user) >= M_ALL) { - $this->printDeleteFolderButton($folder, 'splash_rm_folder'); - } else { -?> - -getAccessMode($user) >= M_READWRITE) { -?> - - - - - getID(); ?>" msg="" _href="../op/op.AddToClipboard.php?folderid=getID(); ?>&type=folder&id=getID(); ?>&refferer=params['refferer']); ?>" title=""> -"; - print ""; - print "\n"; - } } } print "\n"; From ee732551c681e790e90eaa6d0680d6c72fd1f67f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:44:44 +0200 Subject: [PATCH 124/467] make drag&drop work --- views/bootstrap/class.Tasks.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php index 4f54348fe..4a8572366 100644 --- a/views/bootstrap/class.Tasks.php +++ b/views/bootstrap/class.Tasks.php @@ -159,7 +159,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $content .= " \n"; $content .= " \n"; @@ -170,7 +170,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $content .= " \n"; $content .= " \n"; @@ -181,7 +181,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $content .= " \n"; $content .= " \n"; @@ -258,7 +258,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { if($folder = $dms->getFolder($folderid)) { $comment = $folder->getComment(); if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; - $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; +// $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; + $content .= $this->folderListRowStart($folder); $content .= "getID()."&showtree=".showtree()."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>\n"; $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . ""; if($comment) { @@ -268,7 +269,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $content .= "\n"; $content .= "
          params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\">
          "; $content .= "\n"; - $content .= "\n"; + //$content .= "\n"; + $content .= $this->folderListRowEnd($folder); $foldercount++; } } From 3471835d0af2cb7d7fd75eddbddf51e8e24fa63d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:45:28 +0200 Subject: [PATCH 125/467] do not check for named formtoken in op/op.Ajax.php anymore, use new statusbox-container for last file uploads --- op/op.Ajax.php | 10 +++++----- styles/bootstrap/application.js | 7 ++++--- views/bootstrap/class.ViewFolder.php | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 7146fe78e..80f51ea37 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -265,7 +265,7 @@ switch($command) { case 'movefolder': /* {{{ */ if($user) { - if(!checkFormKey('movefolder', 'GET')) { + if(!checkFormKey('', 'GET')) { header('Content-Type: application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>'')); } else { @@ -304,7 +304,7 @@ switch($command) { case 'movedocument': /* {{{ */ if($user) { - if(!checkFormKey('movedocument', 'GET')) { + if(!checkFormKey('', 'GET')) { header('Content-Type: application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>'')); } else { @@ -343,7 +343,7 @@ switch($command) { case 'transfercontent': /* {{{ */ if($user) { - if(!checkFormKey('movedocument', 'GET')) { + if(!checkFormKey('', 'GET')) { header('Content-Type: application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>'')); } else { @@ -394,7 +394,7 @@ switch($command) { case 'linkdocument': /* {{{ */ if($user) { - if(!checkFormKey('movedocument', 'GET')) { + if(!checkFormKey('', 'GET')) { header('Content-Type: application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>'')); } else { @@ -607,7 +607,7 @@ switch($command) { case 'uploaddocument': /* {{{ */ if($user) { - if(checkFormKey('adddocument')) { + if(checkFormKey('')) { if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) { header('Content-Type: application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id"))); diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index d1b5f96df..5d22b958a 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -661,6 +661,7 @@ function onAddClipboard(ev) { /* {{{ */ fd.append('command', 'uploaddocument'); // fd.append('path', files[i].webkitRelativePath); + statusbar.parent().show(); var status = new createStatusbar(statusbar); status.setFileNameSize(files[i].name,files[i].size); sendFileToServer(fd,status); @@ -725,7 +726,7 @@ $(document).ready(function() { /* {{{ */ var files = e.originalEvent.dataTransfer.files; //We need to send dropped files to Server - SeedDMSUpload.handleFileUpload(files,obj,obj); + SeedDMSUpload.handleFileUpload(files,obj, obj); }); $(document).on('dragenter', '.droptarget', function (e) { @@ -753,7 +754,7 @@ $(document).ready(function() { /* {{{ */ var files = e.originalEvent.dataTransfer.files; if(files.length > 0) { console.log('Drop '+files.length+' files on '+target_type+' '+target_id); - SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span")); + SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/); } else { var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); source_type = source_info.type; @@ -848,7 +849,7 @@ $(document).ready(function() { /* {{{ */ var files = e.originalEvent.dataTransfer.files; if(files.length > 0) { console.log('Drop '+files.length+' files on '+target_type+' '+target_id); - SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span")); + SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/); } else { var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); source_type = source_info.type; diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index cb9b409f3..c9d93165e 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -390,7 +390,7 @@ $('#loadmore').click(function(e) { // $this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");"); // $this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');"); ?> -
          +
          "; echo "
          "; From 2e78e446f16c68b0f1f1dae46d149f35296178f3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 16:47:20 +0200 Subject: [PATCH 126/467] new key recent_uploads --- languages/ar_EG/lang.inc | 1 + languages/bg_BG/lang.inc | 1 + languages/ca_ES/lang.inc | 1 + languages/cs_CZ/lang.inc | 1 + languages/de_DE/lang.inc | 3 ++- languages/el_GR/lang.inc | 1 + languages/en_GB/lang.inc | 3 ++- languages/es_ES/lang.inc | 1 + languages/fr_FR/lang.inc | 1 + languages/hr_HR/lang.inc | 1 + languages/hu_HU/lang.inc | 1 + languages/it_IT/lang.inc | 1 + languages/ko_KR/lang.inc | 1 + languages/lo_LA/lang.inc | 1 + languages/nl_NL/lang.inc | 1 + languages/pl_PL/lang.inc | 1 + languages/pt_BR/lang.inc | 1 + languages/ro_RO/lang.inc | 1 + languages/ru_RU/lang.inc | 1 + languages/sk_SK/lang.inc | 1 + languages/sv_SE/lang.inc | 1 + languages/tr_TR/lang.inc | 1 + languages/uk_UA/lang.inc | 1 + languages/zh_CN/lang.inc | 1 + languages/zh_TW/lang.inc | 1 + 25 files changed, 27 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index fcc544ef2..7087609a4 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -924,6 +924,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index bce522960..a4e24c16e 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -823,6 +823,7 @@ $text = array( 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 7408761fe..c7d318204 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -828,6 +828,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 1c8c0b91c..f04091398 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -977,6 +977,7 @@ URL: [url]', 'receipt_status' => 'Status', 'receipt_summary' => 'Souhrn přijetí', 'receipt_update_failed' => 'Potvrzení že přijetí se nezdařilo', +'recent_uploads' => '', 'reception' => 'Přijetí', 'reception_acknowleged' => 'Přijetí potvrzeno', 'reception_noaction' => 'Žádná akce', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 72afed2d7..395deb3e1 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2694), dgrutsch (22) +// Translators: Admin (2695), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -979,6 +979,7 @@ URL: [url]', 'receipt_status' => 'Status', 'receipt_summary' => 'Übersicht Bestätigungen', 'receipt_update_failed' => 'Setzen der Empfangsbestätigung fehlgeschlagen', +'recent_uploads' => 'Letzte Uploads', 'reception' => 'Empfangsbestätigung', 'reception_acknowleged' => 'Empfang bestätigt', 'reception_noaction' => 'Keine Aktion', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 91e74cb03..126ec6c4d 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -834,6 +834,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e03f8dbff..1e513287d 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1786), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1787), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -981,6 +981,7 @@ URL: [url]', 'receipt_status' => 'Status', 'receipt_summary' => 'Receipt summary', 'receipt_update_failed' => 'Acknowledging reception failed', +'recent_uploads' => 'Recent Uploads', 'reception' => 'Reception', 'reception_acknowleged' => 'Reception acknowledged', 'reception_noaction' => 'No action', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index aef6cca48..7d2368c00 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -939,6 +939,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 8fbefcd99..70f818ab9 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -979,6 +979,7 @@ URL : [url]', 'receipt_status' => 'Statut', 'receipt_summary' => 'Vue d’ensemble réception', 'receipt_update_failed' => 'La confirmation de réception a échoué', +'recent_uploads' => '', 'reception' => 'Réception', 'reception_acknowleged' => 'Réception confirmée', 'reception_noaction' => 'Aucune action', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 44a8362c3..125a66c62 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -943,6 +943,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'receipt_status' => '', 'receipt_summary' => 'Sažetak prijema', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index d310578fd..2f080ed58 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -939,6 +939,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 228260ea4..164cc2663 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -950,6 +950,7 @@ URL: [url]', 'receipt_status' => 'Status', 'receipt_summary' => 'Sommario ricezione', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index f515ed3f6..e70270c90 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -937,6 +937,7 @@ URL : [url]', 'receipt_status' => '', 'receipt_summary' => '접수증 요약', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 0e881a928..5796aba51 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -960,6 +960,7 @@ URL: [url]', 'receipt_status' => 'ສະຖານະ', 'receipt_summary' => 'ສະຫຼູບໃບບິນ', 'receipt_update_failed' => 'ການຍອມຮັບສັນຍານບໍ່ສຳເລັດ', +'recent_uploads' => '', 'reception' => 'ພະແນກຕ້ອນຮັບ', 'reception_acknowleged' => 'ຄວາມຮັບຮູ້ກ່ຽວກັບການຕ້ອນຮັບ', 'reception_noaction' => 'ບໍ່ມີການຕອບສະຫນອງ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index d7cfb6de7..0a58e0506 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -955,6 +955,7 @@ URL: [url]', 'receipt_status' => 'Status ontvangst', 'receipt_summary' => 'Samenvatting', 'receipt_update_failed' => 'Update ontvangst mislukt', +'recent_uploads' => '', 'reception' => 'bestemming', 'reception_acknowleged' => 'bestemming OK', 'reception_noaction' => 'Geen actie', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index ae4184483..4716d5be8 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -932,6 +932,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 07729ae35..790e080b6 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -980,6 +980,7 @@ URL: [url]', 'receipt_status' => 'Estado', 'receipt_summary' => 'Resumo da entrada', 'receipt_update_failed' => 'Confirmação de entrada falhou', +'recent_uploads' => '', 'reception' => 'Entrada', 'reception_acknowleged' => 'Entrada reconhecida', 'reception_noaction' => 'Nenhuma ação', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index cac87904d..fab5e2718 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -944,6 +944,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 49917e420..164a90bb5 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -946,6 +946,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => 'Сводка по получению', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 741df4153..652190545 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -981,6 +981,7 @@ URL: [url]', 'receipt_status' => 'Stav', 'receipt_summary' => 'Receipt summary', 'receipt_update_failed' => 'Acknowledging reception failed', +'recent_uploads' => '', 'reception' => 'Reception', 'reception_acknowleged' => 'Reception acknowledged', 'reception_noaction' => 'Žiadna akcia', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 542705239..1607dd21f 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -954,6 +954,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.', 'receipt_status' => 'Status', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => 'Ingen åtgärd', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 669122685..fa3a9b4ca 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -940,6 +940,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index ccc5a7c0e..1379c1e32 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -946,6 +946,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => 'Підсумки отримання', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 06fe3aa4b..e688f1a7f 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -945,6 +945,7 @@ URL: [url]', 'receipt_status' => '状态', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 1decac6ff..207cfce69 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -827,6 +827,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', +'recent_uploads' => '', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', From b7417b4ea4a4c420452b5e201375eaa729e02543 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Jul 2019 17:12:12 +0200 Subject: [PATCH 127/467] add scrollbar to statusbar-container --- styles/bootstrap/application.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index 4740d89f9..d24cab1bd 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -163,7 +163,22 @@ div.statusbar-container { border: 1px solid #E0E0E0; border-radius: 4px; z-index: 10; + overflow-y: scroll; + max-height: calc(100% - 100px); } +div.statusbar-container::-webkit-scrollbar { + width: 5px; +} +div.statusbar-container::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + border-radius: 10px; +} + +div.statusbar-container::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); +} + div.statusbar-container h1 { font-size: 21px; line-height: 40px; From e71c9c2e4e26e4064e9498477f8afd04b1fd97be Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 16 Jul 2019 20:16:50 +0200 Subject: [PATCH 128/467] fix sql statement for searching when setting a limit --- SeedDMS_Core/Core/inc.ClassDMS.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 5a8ca52c0..0538a4231 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1441,9 +1441,6 @@ class SeedDMS_Core_DMS { // Prepare the complete search query, including the LIMIT clause. $searchQuery = "SELECT DISTINCT `tblFolders`.`id` ".$searchQuery." GROUP BY `tblFolders`.`id`"; - if($limit) { - $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; - } switch($orderby) { case 'dd': $searchQuery .= " ORDER BY `tblFolders`.`date` DESC"; @@ -1459,6 +1456,10 @@ class SeedDMS_Core_DMS { default: $searchQuery .= " ORDER BY `tblFolders`.`name`"; break; + } + + if($limit) { + $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; } // Send the complete search query to the database. @@ -1713,11 +1714,12 @@ class SeedDMS_Core_DMS { $offset -= $totalFolders; else $offset = 0; - if($limit) - $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; $searchQuery .= $orderbyQuery; + if($limit) + $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; + // Send the complete search query to the database. $resArr = $this->db->getResultArray($searchQuery); if($resArr === false) From 4271c40e91a50122e1be7f3a0bff3a07d0816c55 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 16 Jul 2019 20:17:23 +0200 Subject: [PATCH 129/467] expand tabs --- restapi/index.php | 68 +++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/restapi/index.php b/restapi/index.php index 7efc667bc..51d57a90c 100644 --- a/restapi/index.php +++ b/restapi/index.php @@ -390,17 +390,17 @@ function createFolder($request, $response, $args) { /* {{{ */ $params = $request->getParsedBody(); if(!empty($params['name'])) { $comment = isset($params['comment']) ? $params['comment'] : ''; - if(isset($params['sequence'])) { - $sequence = str_replace(',', '.', $params["sequence"]); - if (!is_numeric($sequence)) - return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400); - } else { - $dd = $parent->getSubFolders('s'); - if(count($dd) > 1) - $sequence = $dd[count($dd)-1]->getSequence() + 1; - else - $sequence = 1.0; - } + if(isset($params['sequence'])) { + $sequence = str_replace(',', '.', $params["sequence"]); + if (!is_numeric($sequence)) + return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400); + } else { + $dd = $parent->getSubFolders('s'); + if(count($dd) > 1) + $sequence = $dd[count($dd)-1]->getSequence() + 1; + else + $sequence = 1.0; + } $newattrs = array(); if(!empty($params['attributes'])) { foreach($params['attributes'] as $attrname=>$attrvalue) { @@ -410,12 +410,12 @@ function createFolder($request, $response, $args) { /* {{{ */ } } } - /* Check if name already exists in the folder */ - if(!$settings->_enableDuplicateSubFolderNames) { - if($folder->hasSubFolderByName($params['name'])) { - return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400); - } - } + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateSubFolderNames) { + if($folder->hasSubFolderByName($params['name'])) { + return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400); + } + } if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) { $rec = __getFolderData($folder); @@ -577,12 +577,12 @@ function uploadDocument($request, $response, $args) { /* {{{ */ $origfilename = $file_info->getClientFilename(); if (trim($docname) == '') $docname = $origfilename; - /* Check if name already exists in the folder */ - if(!$settings->_enableDuplicateDocNames) { - if($mfolder->hasDocumentByName($docname)) { - return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); - } - } + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateDocNames) { + if($mfolder->hasDocumentByName($docname)) { + return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); + } + } $temp = $file_info->file; $finfo = finfo_open(FILEINFO_MIME_TYPE); $userfiletype = finfo_file($finfo, $temp); @@ -699,12 +699,12 @@ function uploadDocumentPut($request, $response, $args) { /* {{{ */ $userfiletype = finfo_file($finfo, $temp); $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION); finfo_close($finfo); - /* Check if name already exists in the folder */ - if(!$settings->_enableDuplicateDocNames) { - if($mfolder->hasDocumentByName($docname)) { + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateDocNames) { + if($mfolder->hasDocumentByName($docname)) { return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); - } - } + } + } $res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0); unlink($temp); if($res) { @@ -796,13 +796,13 @@ function addDocumentLink($request, $response, $args) { /* {{{ */ $targetdoc = $dms->getDocument($args['documentid']); if($sourcedoc && $targetdoc) { if($sourcedoc->getAccessMode($userobj, 'addDocumentLink') >= M_READ) { - $params = $request->getParsedBody(); - $public = !isset($params['public']) ? true : false; - if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){ + $params = $request->getParsedBody(); + $public = !isset($params['public']) ? true : false; + if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){ return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 201); - } else { - return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500); - } + } else { + return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500); + } } else { return $response->withJson(array('success'=>false, 'message'=>'No access on source document', 'data'=>''), 403); } From ba9f4ba7493aae4c14f22bbf696f042f1ec0fade Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 17 Jul 2019 10:50:52 +0200 Subject: [PATCH 130/467] rename SeedDMS_Core_Folder::empty to emptyFolder --- SeedDMS_Core/Core/inc.ClassFolder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index a95856ea9..f0e1608a9 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -1112,7 +1112,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { * * @return boolean true on success, false in case of an error */ - function empty() { /* {{{ */ + function emptyFolder() { /* {{{ */ /** @noinspection PhpUnusedLocalVariableInspection */ $db = $this->_dms->getDB(); From 111a2beec6a68aa5953541b8676d72de39f72e0d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 17 Jul 2019 10:51:12 +0200 Subject: [PATCH 131/467] SeedDMS_Core_Folder::empty is now emptyFolder --- controllers/class.EmptyFolder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/class.EmptyFolder.php b/controllers/class.EmptyFolder.php index f31f64209..529fa9a74 100644 --- a/controllers/class.EmptyFolder.php +++ b/controllers/class.EmptyFolder.php @@ -58,7 +58,7 @@ class SeedDMS_Controller_EmptyFolder extends SeedDMS_Controller_Common { if($index) $dms->setCallback('onPreEmptyDocument', 'removeFromIndex', array($index, $indexconf)); - if (!$folder->empty()) { + if (!$folder->emptyFolder()) { $this->errormsg = 'error_occured'; return false; } From b83ef1dd661d0acecb844c61faaee3a7338d1712 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 19 Jul 2019 12:52:33 +0200 Subject: [PATCH 132/467] cancel drag&drop if source document equals target document --- styles/bootstrap/application.js | 136 ++++++++++++++++---------------- 1 file changed, 69 insertions(+), 67 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 5d22b958a..58a74605a 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -857,73 +857,75 @@ $(document).ready(function() { /* {{{ */ formtoken = source_info.formtoken; console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id); if(source_type == 'document') { - bootbox.dialog(trans.confirm_transfer_link_document, [{ - "label" : " "+trans.transfer_content, - "class" : "btn-danger", - "callback": function() { - $.get('../op/op.Ajax.php', - { command: 'transfercontent', docid: source_id, targetdocumentid: target_id, formtoken: formtoken }, - function(data) { - if(data.success) { - $('#table-row-document-'+source_id).hide('slow'); - noty({ - text: data.message, - 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, - }); - } - }, - 'json' - ); - } - }, { - "label" : trans.link_document, - "class" : "btn-danger", - "callback": function() { - $.get('../op/op.Ajax.php', - { command: 'linkdocument', docid: source_id, targetdocumentid: target_id, formtoken: formtoken }, - function(data) { - if(data.success) { - noty({ - text: data.message, - 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, - }); - } - }, - 'json' - ); - } - }, { - "label" : trans.cancel, - "class" : "btn-cancel", - "callback": function() { - } - }]); + if(source_id != target_id) { + bootbox.dialog(trans.confirm_transfer_link_document, [{ + "label" : " "+trans.transfer_content, + "class" : "btn-danger", + "callback": function() { + $.get('../op/op.Ajax.php', + { command: 'transfercontent', docid: source_id, targetdocumentid: target_id, formtoken: formtoken }, + function(data) { + if(data.success) { + $('#table-row-document-'+source_id).hide('slow'); + noty({ + text: data.message, + 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, + }); + } + }, + 'json' + ); + } + }, { + "label" : trans.link_document, + "class" : "btn-danger", + "callback": function() { + $.get('../op/op.Ajax.php', + { command: 'linkdocument', docid: source_id, targetdocumentid: target_id, formtoken: formtoken }, + function(data) { + if(data.success) { + noty({ + text: data.message, + 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, + }); + } + }, + 'json' + ); + } + }, { + "label" : trans.cancel, + "class" : "btn-cancel", + "callback": function() { + } + }]); + } url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id; // document.location = url; From 1de9ed37d514c9ab0a72386973dc71fbd7a40d41 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 30 Jul 2019 06:33:18 +0200 Subject: [PATCH 133/467] =?UTF-8?q?allow=20serveral=20instance=D1=95=20of?= =?UTF-8?q?=20drop=20folder=20chooser=20on=20one=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/bootstrap/class.AddDocument.php | 4 ++-- views/bootstrap/class.Bootstrap.php | 14 ++++++++------ views/bootstrap/class.DropFolderChooser.php | 16 +++++++++------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index e740e9651..7d4c25ee9 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -199,7 +199,7 @@ $(document).ready(function() { 'type'=>'text', 'id'=>'name', 'name'=>'name', - 'required'=>true + 'required'=>false ) ); $this->formField( @@ -310,7 +310,7 @@ $(document).ready(function() { ); $this->formField( getMLText("local_file"), - $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', false).($enablemultiupload ? '' : '') + $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '' : '') ); if($dropfolderdir) { $this->formField( diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 1eb5703c7..4f3f07054 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1039,7 +1039,7 @@ $(document).ready(function() {
          - '.getMLText("browse").'… + '.getMLText("browse").'…
        @@ -1422,7 +1422,7 @@ $(document).ready(function() { $content = "
        \n"; $content .= ""; $content .= ""; - $content .= "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; + $content .= "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; $content .= "
        \n"; $content .= '
      \n"; echo "
      "; - if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) { + if ($folder!=null && is_object($folder) && $folder->isType('folder')) { echo " getID()."\" />"; } echo " "; @@ -478,7 +478,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; private function folderNavigationBar($folder) { /* {{{ */ $dms = $this->params['dms']; - if (!is_object($folder) || strcasecmp(get_class($folder), $dms->getClassname('folder'))) { + if (!is_object($folder) || !$folder->isType('folder')) { echo "
        \n"; echo "
      \n"; return; @@ -1570,7 +1570,8 @@ $(document).ready(function() { } /* }}} */ function printNewTreeNavigationHtml($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */ - echo "
      \n"; + //echo "
      \n"; + echo "
      \n"; } /* }}} */ /** @@ -1731,6 +1732,39 @@ $(function() { params['dms']; + $user = $this->params['user']; + + $folder = $dms->getFolder($folderid); + if (!is_object($folder)) return ''; + + $subfolders = $folder->getSubFolders($orderby); + $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, M_READ); + $tree = array(); + foreach($subfolders as $subfolder) { + $loadondemand = $subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs); + $level = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>$loadondemand, 'is_folder'=>true); + if(!$subfolder->hasSubFolders()) + $level['children'] = array(); + $tree[] = $level; + } + if($showdocs) { + $documents = $folder->getDocuments($orderby); + $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); + foreach($documents as $document) { + $level = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); + $tree[] = $level; + } + } + + header('Content-Type: application/json'); + echo json_encode($tree); + } /* }}} */ + function printTreeNavigation($folderid, $showtree){ /* {{{ */ if ($showtree==1){ $this->contentHeading("", true); diff --git a/views/bootstrap/class.DocumentChooser.php b/views/bootstrap/class.DocumentChooser.php index 0887c5c8d..a84fea876 100644 --- a/views/bootstrap/class.DocumentChooser.php +++ b/views/bootstrap/class.DocumentChooser.php @@ -31,6 +31,14 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style { + public function subtree() { /* {{{ */ + $user = $this->params['user']; + $node = $this->params['node']; + $orderby = $this->params['orderby']; + + $this->printNewTreeNavigationSubtree($node->getID(), 1, $orderby); + } /* }}} */ + function js() { /* {{{ */ $folder = $this->params['folder']; $form = $this->params['form']; diff --git a/views/bootstrap/class.FolderChooser.php b/views/bootstrap/class.FolderChooser.php index baf8778cc..73beaf5c4 100644 --- a/views/bootstrap/class.FolderChooser.php +++ b/views/bootstrap/class.FolderChooser.php @@ -31,6 +31,14 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style { + public function subtree() { /* {{{ */ + $user = $this->params['user']; + $node = $this->params['node']; + $orderby = $this->params['orderby']; + + $this->printNewTreeNavigationSubtree($node->getID(), 0, $orderby); + } /* }}} */ + function js() { /* {{{ */ $rootfolderid = $this->params['rootfolderid']; $form = $this->params['form']; diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index c9d93165e..0909e7f87 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -83,7 +83,15 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { } } /* }}} */ - function js() { /* {{{ */ + public function subtree() { /* {{{ */ + $user = $this->params['user']; + $node = $this->params['node']; + $orderby = $this->params['orderby']; + + $this->printNewTreeNavigationSubtree($node->getID(), 0, $orderby); + } /* }}} */ + + public function js() { /* {{{ */ $user = $this->params['user']; $folder = $this->params['folder']; $orderby = $this->params['orderby']; From 4767bf69d0d010f78fd771302c1a939491d8e12f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 8 Aug 2019 09:37:33 +0200 Subject: [PATCH 160/467] new version 5.1.13 --- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- inc/inc.Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 0a15100b9..5692511d3 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -383,7 +383,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '5.1.12'; + $this->version = '5.1.13'; } /* }}} */ /** diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 9e1caf3d3..868cb1499 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.1.12"; + public $_number = "5.1.13"; private $_string = "SeedDMS"; function __construct() { From f378aeb013a49de19eefb82c0a59d8e8960fe9cc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 8 Aug 2019 15:49:08 +0200 Subject: [PATCH 161/467] add new file class.Decorator.php --- SeedDMS_Core/package.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index f1ac24838..9b86dfc1b 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -78,6 +78,9 @@ + + +
      • From 5fc0d5667f0c67e1fa51e7ca54458e6ad9f7c5e8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 12 Aug 2019 08:09:53 +0200 Subject: [PATCH 162/467] do not send notification to owner other operations on documents don't do neither --- op/op.MoveFolder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index 72afcf7bf..8a3c44d57 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -93,8 +93,8 @@ if ($folder->setParent($targetFolder)) { $notifier->toGroup($user, $grp, $subject, $message, $params); } // if user is not owner send notification to owner - if ($user->getID() != $folder->getOwner()->getID()) - $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); + //if ($user->getID() != $folder->getOwner()->getID()) + // $notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params); } } else { From 269fa309369847697db1f3a3abc13f61ffa8db04 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 12 Aug 2019 08:10:40 +0200 Subject: [PATCH 163/467] remove extra containerStart --- views/bootstrap/class.FolderNotify.php | 1 - 1 file changed, 1 deletion(-) diff --git a/views/bootstrap/class.FolderNotify.php b/views/bootstrap/class.FolderNotify.php index 2ac72d76b..de62b5b7a 100644 --- a/views/bootstrap/class.FolderNotify.php +++ b/views/bootstrap/class.FolderNotify.php @@ -79,7 +79,6 @@ $(document).ready(function() { $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); $this->contentHeading(getMLText("edit_existing_notify")); - $this->contentContainerStart(); $userNotifyIDs = array(); foreach ($notifyList["users"] as $userNotify) { From 65703c18629efef3dd0f8cb0433d44ecc1da9dfa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 12 Aug 2019 08:11:12 +0200 Subject: [PATCH 164/467] add url to notification mail --- op/op.RemoveDocument.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php index cb9463b64..05cda0d28 100644 --- a/op/op.RemoveDocument.php +++ b/op/op.RemoveDocument.php @@ -106,6 +106,7 @@ if ($notifier){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); From 4b2b536fdbf04fab855c8e566ce42174e5736e08 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 17 Aug 2019 08:00:06 +0200 Subject: [PATCH 165/467] allow status override if the new status is 'obsoleted' --- op/op.OverrideContentStatus.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index 46745bbb7..afee7561a 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -59,7 +59,8 @@ if (!isset($_POST["overrideStatus"]) || !is_numeric($_POST["overrideStatus"]) || $overallStatus = $content->getStatus(); -// status change control +// status change control, setting a status to obsolete is alwasy allowed +if(intval($_POST["overrideStatus"]) != S_OBSOLETE) if ($overallStatus["status"] == S_REJECTED || $overallStatus["status"] == S_EXPIRED || $overallStatus["status"] == S_DRAFT_REV || $overallStatus["status"] == S_DRAFT_APP || $overallStatus["status"] == S_IN_WORKFLOW) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_change_final_states")); } From e571fe38a5009b3efc8408da93241be5227c0fa3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 22 Aug 2019 07:47:04 +0200 Subject: [PATCH 166/467] send notifications, check for duplicate folder/document names if configured --- webdav/index.php | 29 +++- webdav/webdav.php | 343 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 351 insertions(+), 21 deletions(-) diff --git a/webdav/index.php b/webdav/index.php index 8d1cf3e92..7c3bac0ed 100644 --- a/webdav/index.php +++ b/webdav/index.php @@ -1,5 +1,7 @@ _logFileEnable) { if ($settings->_logFileRotation=="h") $logname=date("YmdH", time()); else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time()); @@ -17,16 +20,38 @@ if($settings->_logFileEnable) { @mkdir($settings->_contentDir.'log'); if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log')) { $log = Log::factory('file', $logname); - $log->setMask(Log::MAX(PEAR_LOG_INFO)); + $log->setMask(Log::MAX(PEAR_LOG_DEBUG)); } else $log = null; } else { $log = null; } +$notifier = new SeedDMS_NotificationService(); + +if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) { + foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) { + if(method_exists($notificationObj, 'preAddService')) { + $notificationObj->preAddService($dms, $notifier); + } + } +} + +if($settings->_enableEmail) { + $notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword)); +} + +if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) { + foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) { + if(method_exists($notificationObj, 'postAddService')) { + $notificationObj->postAddService($dms, $notifier); + } + } +} + include("webdav.php"); $server = new HTTP_WebDAV_Server_SeedDMS(); -$server->ServeRequest($dms, $log); +$server->ServeRequest($dms, $log, $notifier); //$files = array(); //$options = array('path'=>'/Test1/subdir', 'depth'=>1); //echo $server->MKCOL(&$options); diff --git a/webdav/webdav.php b/webdav/webdav.php index 12dab5244..ff08f71ee 100644 --- a/webdav/webdav.php +++ b/webdav/webdav.php @@ -31,6 +31,16 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server */ var $logger = null; + /** + * A reference to a notifier + * + * This is set by ServeRequest + * + * @access private + * @var object + */ + var $notifier = null; + /** * Currently logged in user * @@ -53,7 +63,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server * @access public * @param object $dms reference to DMS */ - function ServeRequest($dms = null, $logger = null) /* {{{ */ + function ServeRequest($dms = null, $logger = null, $notifier = null) /* {{{ */ { // set root directory, defaults to webserver document root if not set if ($dms) { @@ -65,6 +75,9 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server // set logger $this->logger = $logger; + // set notifier + $this->notifier = $notifier; + // special treatment for litmus compliance test // reply on its identifier header // not needed for the test itself but eases debugging @@ -93,6 +106,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server if($this->logger) { switch($methode) { case 'MOVE': + case 'COPY': $msg = $methode.': '.$options['path'].' -> '.$options['dest']; break; default: @@ -601,7 +615,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $document = $this->dms->getDocumentByName($name, $folder); if($document) { if($this->logger) - $this->logger->log('PUT: replacing document id='.$document->getID(), PEAR_LOG_INFO); + $this->logger->log('PUT: saving document id='.$document->getID(), PEAR_LOG_INFO); if ($document->getAccessMode($this->user, 'updateDocument') < M_READWRITE) { if($this->logger) $this->logger->log('PUT: no access on document', PEAR_LOG_ERR); @@ -633,13 +647,63 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server } else { if($this->logger) $this->logger->log('PUT: adding new version', PEAR_LOG_INFO); - if(!$document->addContent('', $this->user, $tmpFile, $name, $fileType, $mimetype, array(), array(), 0)) { + + if($settings->_enableFullSearch) { + $index = $indexconf['Indexer']::open($settings->_luceneDir); + $indexconf['Indexer']::init($settings->_stopWordsFile); + } else { + $index = null; + $indexconf = null; + } + + $controller = Controller::factory('UpdateDocument'); + $controller->setParam('dms', $this->dms); + $controller->setParam('user', $this->user); + $controller->setParam('documentsource', 'webdav'); + $controller->setParam('folder', $document->getFolder()); + $controller->setParam('document', $document); + $controller->setParam('index', $index); + $controller->setParam('indexconf', $indexconf); + $controller->setParam('comment', ''); + $controller->setParam('userfiletmp', $tmpFile); + $controller->setParam('userfilename', $name); + $controller->setParam('filetype', $fileType); + $controller->setParam('userfiletype', $mimetype); + $controller->setParam('reviewers', array()); + $controller->setParam('approvers', array()); + $controller->setParam('attributes', array()); + $controller->setParam('workflow', null); + + if(!$content = $controller->run()) { +// if(!$document->addContent('', $this->user, $tmpFile, $name, $fileType, $mimetype, array(), array(), 0)) { if($this->logger) $this->logger->log('PUT: error adding new version', PEAR_LOG_ERR); unlink($tmpFile); return "409 Conflict"; } } + if($this->notifier) { + if($this->logger) + $this->logger->log('PUT: Sending Notifications', PEAR_LOG_INFO); + $notifyList = $document->getNotifyList(); + $folder = $document->getFolder(); + + $subject = "document_updated_email_subject"; + $message = "document_updated_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['comment'] = $document->getComment(); + $params['version_comment'] = $content->getComment(); + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $this->notifier->toList($this->user, $notifyList["users"], $subject, $message, $params); + foreach ($notifyList["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } } } } else { @@ -651,6 +715,16 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server unlink($tmpFile); return "403 Forbidden"; } + + /* Check if name already exists in the folder */ + /* + if(!$settings->_enableDuplicateDocNames) { + if($folder->hasDocumentByName($name)) { + return "403 Forbidden"; + } + } + */ + if($settings->_enableFullSearch) { $index = $indexconf['Indexer']::open($settings->_luceneDir); $indexconf['Indexer']::init($settings->_stopWordsFile); @@ -699,6 +773,33 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $this->logger->log('PUT: error adding object: '.$controller->getErrorMsg(), PEAR_LOG_ERR); return "409 Conflict ".$controller->getErrorMsg(); } + if($this->notifier) { + if($this->logger) + $this->logger->log('PUT: Sending Notifications', PEAR_LOG_INFO); + $fnl = $folder->getNotifyList(); + $dnl = $document->getNotifyList(); + $nl = array( + 'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR), + 'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR) + ); + + $subject = "new_document_email_subject"; + $message = "new_document_email_body"; + $params = array(); + $params['name'] = $name; + $params['folder_name'] = $folder->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['comment'] = ''; + $params['version_comment'] = ''; + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } } unlink($tmpFile); @@ -713,7 +814,9 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server * @return bool true on success */ function MKCOL($options) /* {{{ */ - { + { + global $settings; + $this->log_options('MKCOL', $options); $path = $options["path"]; @@ -774,6 +877,33 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server return "409 Conflict ".$controller->getErrorMsg(); } + if($this->notifier) { + if($this->logger) + $this->logger->log('MKCOL: Sending Notifications', PEAR_LOG_INFO); + $fnl = $folder->getNotifyList(); + $snl = $subFolder->getNotifyList(); + $nl = array( + 'users'=>array_unique(array_merge($snl['users'], $fnl['users']), SORT_REGULAR), + 'groups'=>array_unique(array_merge($snl['groups'], $fnl['groups']), SORT_REGULAR) + ); + + $subject = "new_subfolder_email_subject"; + $message = "new_subfolder_email_body"; + $params = array(); + $params['name'] = $subFolder->getName(); + $params['folder_name'] = $folder->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['comment'] = ''; + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } + return ("201 Created"); } /* }}} */ @@ -820,6 +950,16 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $this->logger->log('DELETE: cannot delete, folder has children', PEAR_LOG_ERR); return "409 Conflict"; } + + $parent = $obj->getParent(); + $fnl = $obj->getNotifyList(); + $pnl = $parent->getNotifyList(); + $nl = array( + 'users'=>array_unique(array_merge($fnl['users'], $pnl['users']), SORT_REGULAR), + 'groups'=>array_unique(array_merge($fnl['groups'], $pnl['groups']), SORT_REGULAR) + ); + $foldername = $obj->getName(); + $controller = Controller::factory('RemoveFolder'); $controller->setParam('dms', $this->dms); $controller->setParam('user', $this->user); @@ -827,10 +967,39 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $controller->setParam('index', $index); $controller->setParam('indexconf', $indexconf); if(!$controller->run()) { -// if(!$obj->remove()) { return "409 Conflict ".$controller->getErrorMsg(); } + + if($this->notifier) { + if($this->logger) + $this->logger->log('DELETE: Sending Notifications', PEAR_LOG_INFO); + $subject = "folder_deleted_email_subject"; + $message = "folder_deleted_email_body"; + $params = array(); + $params['name'] = $foldername; + $params['folder_path'] = $parent->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); + $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } } else { + /* Get the notify list before removing the document + * Also inform the users/groups of the parent folder + */ + $folder = $obj->getFolder(); + $dnl = $obj->getNotifyList(); + $fnl = $folder->getNotifyList(); + $nl = array( + 'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR), + 'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR) + ); + $docname = $obj->getName(); + $controller = Controller::factory('RemoveDocument'); $controller->setParam('dms', $this->dms); $controller->setParam('user', $this->user); @@ -838,9 +1007,26 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $controller->setParam('index', $index); $controller->setParam('indexconf', $indexconf); if(!$controller->run()) { -// if(!$obj->remove()) { return "409 Conflict ".$controller->getErrorMsg(); } + + if($this->notifier){ + if($this->logger) + $this->logger->log('DELETE: Sending Notifications', PEAR_LOG_INFO); + $subject = "document_deleted_email_subject"; + $message = "document_deleted_email_body"; + $params = array(); + $params['name'] = $docname; + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } } return "204 No Content"; @@ -855,6 +1041,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server */ function MOVE($options) /* {{{ */ { + global $settings; + $this->log_options('MOVE', $options); // no copying to different WebDAV Servers yet @@ -908,13 +1096,13 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $fspath = $this->dms->contentDir.'/'.$content->getPath(); /* save the content as a new version in the destination document */ - if(!$objdest->addContent('', $this->user, $fspath, $content->getOriginalFileName(), $content->getFileType(), $content->getMimeType, array(), array(), 0)) { + if(!$objdest->addContent('', $this->user, $fspath, $content->getOriginalFileName(), $content->getFileType(), $content->getMimeType(), array(), array(), 0)) { unlink($tmpFile); return "409 Conflict"; } /* change the name of the destination object */ - $objdest->setName($objsource->getName()); + // $objdest->setName($objsource->getName()); /* delete the source object */ $objsource->remove(); @@ -922,11 +1110,84 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server return "204 No Content"; } elseif(get_class($objdest) == $this->dms->getClassname('folder')) { /* Set the new Folder of the source object */ - if(get_class($objsource) == $this->dms->getClassname('document')) - $objsource->setFolder($objdest); - elseif(get_class($objsource) == $this->dms->getClassname('folder')) - $objsource->setParent($objdest); - else + if(get_class($objsource) == $this->dms->getClassname('document')) { + /* Check if name already exists in the folder */ + /* + if(!$settings->_enableDuplicateDocNames) { + if($objdest->hasDocumentByName($objsource->getName())) { + return "403 Forbidden"; + } + } + */ + + $oldFolder = $objsource->getFolder(); + if($objsource->setFolder($objdest)) { + if($this->notifier) { + if($this->logger) + $this->logger->log('MOVE: Sending Notifications', PEAR_LOG_INFO); + $nl1 = $oldFolder->getNotifyList(); + $nl2 = $objsource->getNotifyList(); + $nl3 = $objdest->getNotifyList(); + $nl = array( + 'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR), + 'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR) + ); + $subject = "document_moved_email_subject"; + $message = "document_moved_email_body"; + $params = array(); + $params['name'] = $objsource->getName(); + $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); + $params['new_folder_path'] = $objdest->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$objsource->getID(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } + } else { + return "500 Internal server error"; + } + } elseif(get_class($objsource) == $this->dms->getClassname('folder')) { + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateSubFolderNames) { + if($objdest->hasSubFolderByName($objsource->getName())) { + return "403 Forbidden"; + } + } + $oldFolder = $objsource->getParent(); + if($objsource->setParent($objdest)) { + if($this->notifier) { + if($this->logger) + $this->logger->log('MOVE: Sending Notifications', PEAR_LOG_INFO); + $nl1 = $oldFolder->getNotifyList(); + $nl2 = $objsource->getNotifyList(); + $nl3 = $objdest->getNotifyList(); + $nl = array( + 'users'=>array_unique(array_merge($nl1['users'], $nl2['users'], $nl3['users']), SORT_REGULAR), + 'groups'=>array_unique(array_merge($nl1['groups'], $nl2['groups'], $nl3['groups']), SORT_REGULAR) + ); + $subject = "folder_moved_email_subject"; + $message = "folder_moved_email_body"; + $params = array(); + $params['name'] = $objsource->getName(); + $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); + $params['new_folder_path'] = $objdest->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } + } else { + return "500 Internal server error"; + } + } else return "500 Internal server error"; if($newdocname) $objsource->setName($newdocname); @@ -940,12 +1201,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server * @param array general parameter passing array * @return bool true on success */ - function COPY($options, $del=false) /* {{{ */ + function COPY($options) /* {{{ */ { global $settings, $indexconf; - if(!$del) - $this->log_options('COPY', $options); + $this->log_options('COPY', $options); // TODO Property updates still broken (Litmus should detect this?) @@ -974,6 +1234,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server // get dest folder or document $objdest = $this->reverseLookup($options["dest"]); + // If the destination doesn't exists, then check if the parent folder exists + // and set $newdocname, which is later used to create a new document $newdocname = ''; if(!$objdest) { /* check if at least the dest directory exists */ @@ -995,7 +1257,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server return "403 Forbidden"; } - /* If destination object is a document it must be overwritten */ + /* If destination object is a document the source document will create a new version */ if(get_class($objdest) == $this->dms->getClassname('document')) { if (!$options["overwrite"]) { return "412 precondition failed"; @@ -1009,13 +1271,19 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $content = $objsource->getLatestContent(); $fspath = $this->dms->contentDir.'/'.$content->getPath(); + /* If the checksum of source and destination are equal, then do not copy */ + if($content->getChecksum() == $objdest->getLatestContent()->getChecksum()) { + return "204 No Content"; + } + /* save the content as a new version in the destination document */ - if(!$objdest->addContent('', $this->user, $fspath, $content->getOriginalFileName(), $content->getFileType(), $content->getMimeType, array(), array(), 0)) { + if(!$objdest->addContent('', $this->user, $fspath, $content->getOriginalFileName(), $content->getFileType(), $content->getMimeType(), array(), array(), 0)) { unlink($tmpFile); return "409 Conflict"; } - $objdest->setName($objsource->getName()); + /* Since 5.1.13 do not overwrite the name anymore + $objdest->setName($objsource->getName()); */ return "204 No Content"; } elseif(get_class($objdest) == $this->dms->getClassname('folder')) { @@ -1033,6 +1301,15 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server if(!$newdocname) $newdocname = $objsource->getName(); + /* Check if name already exists in the folder */ + /* + if(!$settings->_enableDuplicateDocNames) { + if($objdest->hasDocumentByName($newdocname)) { + return "403 Forbidden"; + } + } + */ + /* get the latest content of the source object */ $content = $objsource->getLatestContent(); $fspath = $this->dms->contentDir.'/'.$content->getPath(); @@ -1084,6 +1361,34 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $this->logger->log('COPY: error copying object', PEAR_LOG_ERR); return "409 Conflict"; } + + if($this->notifier) { + if($this->logger) + $this->logger->log('COPY: Sending Notifications', PEAR_LOG_INFO); + $fnl = $objdest->getNotifyList(); + $dnl = $document->getNotifyList(); + $nl = array( + 'users'=>array_unique(array_merge($dnl['users'], $fnl['users']), SORT_REGULAR), + 'groups'=>array_unique(array_merge($dnl['groups'], $fnl['groups']), SORT_REGULAR) + ); + + $subject = "new_document_email_subject"; + $message = "new_document_email_body"; + $params = array(); + $params['name'] = $name; + $params['folder_name'] = $objdest->getName(); + $params['folder_path'] = $objdest->getFolderPathPlain(); + $params['username'] = $this->user->getFullName(); + $params['comment'] = ''; + $params['version_comment'] = ''; + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$objdest->getID(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); + foreach ($nl["groups"] as $grp) { + $this->notifier->toGroup($this->user, $grp, $subject, $message, $params); + } + } return "201 Created"; } } /* }}} */ From 712a504d9b50c6d6657ec2057f397a1bd3b869af Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 27 Aug 2019 14:13:03 +0200 Subject: [PATCH 167/467] remove debug output --- SeedDMS_Core/Core/inc.ClassDocument.php | 1 - 1 file changed, 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 1cd285cb0..fddc19954 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -1488,7 +1488,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $db->rollbackTransaction(); return false; } - echo $tmpFile; if($this->_dms->forceRename) $err = SeedDMS_Core_File::renameFile($tmpFile, $this->_dms->contentDir . $dir . $version . $fileType); else From aed406b167f94bfe6e72cc7ef192e023e975f853 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 27 Aug 2019 14:13:26 +0200 Subject: [PATCH 168/467] check for data-no-spinner, make drag&drop work if loaded by ajax --- styles/bootstrap/application.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 58a74605a..294679d58 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -405,7 +405,8 @@ $(document).ready( function() { } else { url += "&"+param1; } - element.prepend('
      '); + if(!element.data('no-spinner')) + element.prepend('
      '); $.get(url, function(data) { element.html(data); $(".chzn-select").select2({ @@ -571,7 +572,7 @@ function onAddClipboard(ev) { /* {{{ */ processData: false, cache: false, data: formData, - success: function(data){ + success: function(data, textStatus) { status.setProgress(100); if(data.success) { noty({ @@ -707,26 +708,25 @@ function onAddClipboard(ev) { /* {{{ */ }( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery )); /* }}} */ $(document).ready(function() { /* {{{ */ - var obj = $("#dragandrophandler"); - obj.on('dragenter', function (e) { + $(document).on('dragenter', "#dragandrophandler", function (e) { e.stopPropagation(); e.preventDefault(); $(this).css('border', '2px dashed #0B85A1'); }); - obj.on('dragleave', function (e) { + $(document).on('dragleave', "#dragandrophandler", function (e) { $(this).css('border', '0px solid white'); }); - obj.on('dragover', function (e) { + $(document).on('dragover', "#dragandrophandler", function (e) { e.stopPropagation(); e.preventDefault(); }); - obj.on('drop', function (e) { + $(document).on('drop', "#dragandrophandler", function (e) { $(this).css('border', '0px dotted #0B85A1'); e.preventDefault(); var files = e.originalEvent.dataTransfer.files; //We need to send dropped files to Server - SeedDMSUpload.handleFileUpload(files,obj, obj); + SeedDMSUpload.handleFileUpload(files, $(this), $(this)); }); $(document).on('dragenter', '.droptarget', function (e) { From bd99b078ca9de620e2f948687ca21ec72d74ccf5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 27 Aug 2019 14:35:22 +0200 Subject: [PATCH 169/467] split page into seperate views, click in tree just updates the views a page reload isn't needed anymore --- views/bootstrap/class.Bootstrap.php | 20 +- views/bootstrap/class.ViewFolder.php | 413 +++++++++++++++------------ 2 files changed, 245 insertions(+), 188 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 526ee5ebc..2c6f85dd2 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1593,11 +1593,11 @@ $(document).ready(function() { if($path || $expandtree>=$level) { if($path) $pathfolder = array_shift($path); + $children = array(); $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); - $children = array(); foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true); if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { @@ -1617,7 +1617,7 @@ $(document).ready(function() { $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true); $children[] = $node; } return $children; @@ -1636,7 +1636,7 @@ $(document).ready(function() { $node['load_on_demand'] = false; $node['children'] = array(); } else { - $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0); + $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 0 /*$expandtree*/, $orderby, 0); if($showdocs) { $documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode); @@ -1656,14 +1656,14 @@ $(document).ready(function() { } else { $root = $this->params['dms']->getFolder($this->params['rootfolderid']); - $tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>true, 'is_folder'=>true)); + $tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>false, 'is_folder'=>true)); } - ?> var data = ; $(function() { $('#jqtree').tree({ // saveState: true, + selectable: false, data: data, saveState: 'jqtree', openedIcon: $(''), @@ -1687,17 +1687,19 @@ $(function() { // Unfold node for currently selected folder $('#jqtree').tree('openNode', $('#jqtree').tree('getNodeById', ), false); $('#jqtree').on( - 'tree.select', + 'tree.click', function(event) { var node = event.node; + if(!node) + return; $('#jqtree').tree('openNode', node); // event.preventDefault(); if(node.is_folder) { if(typeof node.fetched == 'undefined') { node.fetched = true; $(this).tree('loadDataFromUrl', node, function () { - $(this).tree('openNode', node);} - ); + $(this).tree('openNode', node); + }); } folderSelected(node.id, node.name); } else diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 0909e7f87..27b8bf985 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -105,7 +105,9 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { 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')); ?> function folderSelected(id, name) { - window.location = '../out/out.ViewFolder.php?folderid=' + id; +// window.location = '../out/out.ViewFolder.php?folderid=' + id; +console.log(id); + $('div.ajax').trigger('update', {folderid: id}); } function loadMoreObjects(element, limit) { @@ -159,6 +161,221 @@ $('#loadmore').click(function(e) { $this->printDeleteDocumentButtonJs(); } /* }}} */ + function folderInfos() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + + $txt = $this->callHook('folderInfo', $folder); + if(is_string($txt)) + echo $txt; + else { + + $owner = $folder->getOwner(); + $this->contentHeading(getMLText("folder_infos")); + $this->contentContainerStart(); + echo "\n"; + if($user->isAdmin()) { + echo ""; + echo "\n"; + echo "\n"; + echo ""; + } + echo ""; + echo "\n"; + echo "\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + if($folder->getComment()) { + echo ""; + echo "\n"; + echo "\n"; + echo ""; + } + + if($user->isAdmin()) { + echo ""; + echo ""; + echo ""; + echo ""; + if($folder->inheritsAccess()) { + echo ""; + echo "\n"; + echo ""; + } else { + echo ""; + echo ""; + echo ""; + echo ""; + } + } + $attributes = $folder->getAttributes(); + if($attributes) { + foreach($attributes as $attribute) { + $arr = $this->callHook('showFolderAttribute', $folder, $attribute); + if(is_array($arr)) { + echo $txt; + echo ""; + echo ""; + echo ""; + echo ""; + } else { + $attrdef = $attribute->getAttributeDefinition(); + ?> + + + + +\n"; + $this->contentContainerEnd(); + } + } /* }}} */ + + function folderList() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $folderid = $folder->getId(); + $orderby = $this->params['orderby']; + $orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc'); + $cachedir = $this->params['cachedir']; + $maxItemsPerPage = $this->params['maxItemsPerPage']; + $incItemsPerPage = $this->params['incItemsPerPage']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewConverters']; + $timeout = $this->params['timeout']; + $xsendfile = $this->params['xsendfile']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); + $previewer->setConverters($previewconverters); + + $txt = $this->callHook('listHeader', $folder); + if(is_string($txt)) + echo $txt; + else + $this->contentHeading(getMLText("folder_contents")); + + $subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby[0], $orderdir); + if($subFolders === null) + $subFolders = $folder->getSubFolders($orderby[0], $orderdir); + $subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ); + $documents = $this->callHook('folderGetDocuments', $folder, $orderby[0], $orderdir); + if($documents === null) + $documents = $folder->getDocuments($orderby[0], $orderdir); + $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); + + $txt = $this->callHook('folderListPreContent', $folder, $subFolders, $documents); + if(is_string($txt)) + echo $txt; + $i = 0; + if ((count($subFolders) > 0)||(count($documents) > 0)){ + $txt = $this->callHook('folderListHeader', $folder, $orderby, $orderdir); + if(is_string($txt)) + echo $txt; + else { + print "
      ".getMLText("id").":".htmlspecialchars($folder->getID())."
      ".getMLText("owner").":getEmail())."\">".htmlspecialchars($owner->getFullName())."
      ".getMLText("creation_date").":".getLongReadableDate($folder->getDate())."
      ".getMLText("comment").":".htmlspecialchars($folder->getComment())."
      ".getMLText('default_access').":".$this->getAccessModeText($folder->getDefaultAccess())."
      ".getMLText("access_mode").":"; + echo getMLText("inherited")."
      "; + $this->printAccessList($folder); + echo "
      ".getMLText('access_mode').":"; + $this->printAccessList($folder); + echo "
      ".$arr[0].":".$arr[1].":
      getName()); ?>:getValueAsArray())); ?>
      "; + print "\n\n"; + print "\n"; + print "\n"; + // print "\n"; + print "\n"; + // print "\n"; + print "\n"; + print "\n\n\n"; + } + + foreach($subFolders as $subFolder) { + if(!$maxItemsPerPage || $i < $maxItemsPerPage) { + $txt = $this->callHook('folderListItem', $subFolder, 'viewfolder'); + if(is_string($txt)) + echo $txt; + else { + echo $this->folderListRow($subFolder); + } + } + $i++; + } + + if($subFolders && $documents) { + if(!$maxItemsPerPage || $maxItemsPerPage > count($subFolders)) { + $txt = $this->callHook('folderListSeparator', $folder); + if(is_string($txt)) + echo $txt; + } + } + + foreach($documents as $document) { + if(!$maxItemsPerPage || $i < $maxItemsPerPage) { + $document->verifyLastestContentExpriry(); + $txt = $this->callHook('documentListItem', $document, $previewer, false, 'viewfolder'); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer); + } + } + $i++; + } + + $txt = $this->callHook('folderListFooter', $folder); + if(is_string($txt)) + echo $txt; + else + echo "\n
      ".getMLText("name"); + print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; + print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; + print " ".($orderby=="d"||$orderby=="da"?' ':($orderby=="dd"?' ':' ')).""; + print "".getMLText("owner")."".getMLText("status")."".getMLText("version")."".getMLText("action")."
      \n"; + + if($maxItemsPerPage && $i > $maxItemsPerPage) + echo ""; + } + else printMLText("empty_folder_list"); + + $txt = $this->callHook('folderListPostContent', $folder, $subFolders, $documents); + if(is_string($txt)) + echo $txt; + + } /* }}} */ + + function navigation() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + + $txt = $this->callHook('folderMenu', $folder); + if(is_string($txt)) + echo $txt; + else { + $this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder); + } + + echo $this->callHook('preContent'); + } /* }}} */ + + function dropUpload() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + + $this->contentHeading(getMLText("dropupload"), true); +?> +
      +params['dms']; $user = $this->params['user']; @@ -254,25 +471,20 @@ $('#loadmore').click(function(e) { $xsendfile = $this->params['xsendfile']; $folderid = $folder->getId(); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); + $previewer->setConverters($previewconverters); $this->htmlAddHeader(''."\n", 'js'); echo $this->callHook('startPage'); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); - $this->globalNavigation($folder); $this->contentStart(); - $txt = $this->callHook('folderMenu', $folder); - if(is_string($txt)) - echo $txt; - else { - $this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder); - } - $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); - $previewer->setConverters($previewconverters); - - echo $this->callHook('preContent'); +// $this->navigation(); +?> +
      getID()."\"" : "") ?>>
      +\n"; @@ -313,184 +525,27 @@ $('#loadmore').click(function(e) { echo "
      "; echo "
      "; } - $txt = $this->callHook('folderInfo', $folder); - if(is_string($txt)) - echo $txt; - else { - $owner = $folder->getOwner(); - $this->contentHeading(getMLText("folder_infos")); - $this->contentContainerStart(); - echo "\n"; - if($user->isAdmin()) { - echo ""; - echo "\n"; - echo "\n"; - echo ""; - } - echo ""; - echo "\n"; - echo "\n"; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - if($folder->getComment()) { - echo ""; - echo "\n"; - echo "\n"; - echo ""; - } - - if($user->isAdmin()) { - echo ""; - echo ""; - echo ""; - echo ""; - if($folder->inheritsAccess()) { - echo ""; - echo "\n"; - echo ""; - } else { - echo ""; - echo ""; - echo ""; - echo ""; - } - } - $attributes = $folder->getAttributes(); - if($attributes) { - foreach($attributes as $attribute) { - $arr = $this->callHook('showFolderAttribute', $folder, $attribute); - if(is_array($arr)) { - echo $txt; - echo ""; - echo ""; - echo ""; - echo ""; - } else { - $attrdef = $attribute->getAttributeDefinition(); - ?> - - - - +// $this->folderInfos(); +?> +
      getID()."\"" : "") ?>>
      \n"; - $this->contentContainerEnd(); - } if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) { echo ""; echo "
      "; - $this->contentHeading(getMLText("dropupload"), true); -// $this->addFooterJS("SeedDMSUpload.setUrl('../op/op.Ajax.php');"); -// $this->addFooterJS("SeedDMSUpload.setAbortBtnLabel('".getMLText("cancel")."');"); -// $this->addFooterJS("SeedDMSUpload.setEditBtnLabel('".getMLText("edit_document_props")."');"); -// $this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");"); -// $this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');"); +// $this->dropUpload(); ?> -
      +
      getID()."\"" : "") ?>>
      "; echo "
      "; } - $txt = $this->callHook('listHeader', $folder); - if(is_string($txt)) - echo $txt; - else - $this->contentHeading(getMLText("folder_contents")); - - $subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby[0], $orderdir); - if($subFolders === null) - $subFolders = $folder->getSubFolders($orderby[0], $orderdir); - $subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ); - $documents = $this->callHook('folderGetDocuments', $folder, $orderby[0], $orderdir); - if($documents === null) - $documents = $folder->getDocuments($orderby[0], $orderdir); - $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); - - $txt = $this->callHook('folderListPreContent', $folder, $subFolders, $documents); - if(is_string($txt)) - echo $txt; - $i = 0; - if ((count($subFolders) > 0)||(count($documents) > 0)){ - $txt = $this->callHook('folderListHeader', $folder, $orderby, $orderdir); - if(is_string($txt)) - echo $txt; - else { - print "
      ".getMLText("id").":".htmlspecialchars($folder->getID())."
      ".getMLText("owner").":getEmail())."\">".htmlspecialchars($owner->getFullName())."
      ".getMLText("creation_date").":".getLongReadableDate($folder->getDate())."
      ".getMLText("comment").":".htmlspecialchars($folder->getComment())."
      ".getMLText('default_access').":".$this->getAccessModeText($folder->getDefaultAccess())."
      ".getMLText("access_mode").":"; - echo getMLText("inherited")."
      "; - $this->printAccessList($folder); - echo "
      ".getMLText('access_mode').":"; - $this->printAccessList($folder); - echo "
      ".$arr[0].":".$arr[1].":
      getName()); ?>:getValueAsArray())); ?>
      "; - print "\n\n"; - print "\n"; - print "\n"; - // print "\n"; - print "\n"; - // print "\n"; - print "\n"; - print "\n\n\n"; - } - - foreach($subFolders as $subFolder) { - if(!$maxItemsPerPage || $i < $maxItemsPerPage) { - $txt = $this->callHook('folderListItem', $subFolder, 'viewfolder'); - if(is_string($txt)) - echo $txt; - else { - echo $this->folderListRow($subFolder); - } - } - $i++; - } - - if($subFolders && $documents) { - if(!$maxItemsPerPage || $maxItemsPerPage > count($subFolders)) { - $txt = $this->callHook('folderListSeparator', $folder); - if(is_string($txt)) - echo $txt; - } - } - - foreach($documents as $document) { - if(!$maxItemsPerPage || $i < $maxItemsPerPage) { - $document->verifyLastestContentExpriry(); - $txt = $this->callHook('documentListItem', $document, $previewer, false, 'viewfolder'); - if(is_string($txt)) - echo $txt; - else { - echo $this->documentListRow($document, $previewer); - } - } - $i++; - } - - $txt = $this->callHook('folderListFooter', $folder); - if(is_string($txt)) - echo $txt; - else - echo "\n
      ".getMLText("name"); - print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; - print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; - print " ".($orderby=="d"||$orderby=="da"?' ':($orderby=="dd"?' ':' ')).""; - print "".getMLText("owner")."".getMLText("status")."".getMLText("version")."".getMLText("action")."
      \n"; - - if($maxItemsPerPage && $i > $maxItemsPerPage) - echo ""; - } - else printMLText("empty_folder_list"); - - $txt = $this->callHook('folderListPostContent', $folder, $subFolders, $documents); - if(is_string($txt)) - echo $txt; - +// $this->folderList(); +?> +
      getID()."\"" : "") ?>>
      +\n"; // End of right column div echo "
      \n"; // End of div around left and right column From 4a22ed2ce7182e1740a8361ea4ee5faaff97a2d6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 27 Aug 2019 21:46:19 +0200 Subject: [PATCH 170/467] pass on orderby to ajax calls --- views/bootstrap/class.ViewFolder.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 27b8bf985..b9e18fb4b 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -106,8 +106,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { ?> function folderSelected(id, name) { // window.location = '../out/out.ViewFolder.php?folderid=' + id; -console.log(id); - $('div.ajax').trigger('update', {folderid: id}); + $('div.ajax').trigger('update', {folderid: id, orderby: ''}); } function loadMoreObjects(element, limit) { @@ -544,7 +543,7 @@ $('#loadmore').click(function(e) { // $this->folderList(); ?> -
      getID()."\"" : "") ?>>
      +
      getID()."&orderby=".$orderby."\"" : "") ?>>
      \n"; // End of right column div echo "
      \n"; // End of div around left and right column From 140926be96a0bfc2164317bbb9ba751b8ede2480 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 27 Aug 2019 21:46:40 +0200 Subject: [PATCH 171/467] log creation of preview files --- controllers/class.Preview.php | 2 ++ op/op.Preview.php | 1 + 2 files changed, 3 insertions(+) diff --git a/controllers/class.Preview.php b/controllers/class.Preview.php index 985d45dab..861668b08 100644 --- a/controllers/class.Preview.php +++ b/controllers/class.Preview.php @@ -57,7 +57,9 @@ class SeedDMS_Controller_Preview extends SeedDMS_Controller_Common { $previewer->setConverters($settings->_converters['preview']); $previewer->setXsendfile($settings->_enableXsendfile); if(!$previewer->hasPreview($content)) { + add_log_line(""); if(!$previewer->createPreview($content)) { + add_log_line("", PEAR_LOG_ERR); } } if(!$previewer->hasPreview($content)) { diff --git a/op/op.Preview.php b/op/op.Preview.php index ee6a3adf1..3b0903b84 100644 --- a/op/op.Preview.php +++ b/op/op.Preview.php @@ -85,6 +85,7 @@ else $previewer->setConverters($settings->_converters['preview']); $previewer->setXsendfile($settings->_enableXsendfile); if(!$previewer->hasPreview($object)) { + add_log_line(""); if(!$previewer->createPreview($object)) { } } From 4145b67dd6e18a71af64da2419c14fd089b80ca7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 27 Aug 2019 21:47:05 +0200 Subject: [PATCH 172/467] fix for determine fileType didn't work if the file didn't have a file extension but the path contains a dot. --- op/op.ImportFS.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php index 3f1b81ee9..de5f402c9 100644 --- a/op/op.ImportFS.php +++ b/op/op.ImportFS.php @@ -118,9 +118,9 @@ function import_folder($dirname, $folder, $setfiledate, $setfolderdate, $metadat $finfo = finfo_open(FILEINFO_MIME_TYPE); $mimetype = finfo_file($finfo, $path); - $lastDotIndex = strrpos($path, "."); + $lastDotIndex = strrpos($name, "."); if (is_bool($lastDotIndex) && !$lastDotIndex) $filetype = "."; - else $filetype = substr($path, $lastDotIndex); + else $filetype = substr($name, $lastDotIndex); // echo $mimetype." - ".$filetype." - ".$path."\n"; if($res = $folder->addDocument($name, $comment, $expires, $user, $keywords, From 177e3c571a9a5a1b4fd0caaec8e257e8b67ca684 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Sep 2019 08:34:11 +0200 Subject: [PATCH 173/467] fix php error when removing versions of a document --- op/op.RemoveVersion.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index 95917380a..e8fb5f596 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -104,7 +104,7 @@ else { * be informed about the removal. */ $emailUserList = array(); - $emailUserList[] = $version->_userID; + $emailUserList[] = $version->getUser()->getID(); $emailGroupList = array(); $status = $version->getReviewStatus(); foreach ($status as $st) { @@ -150,12 +150,12 @@ else { $nl=$document->getNotifyList(); $userrecipients = array(); foreach ($emailUserList as $eID) { - $eU = $version->_document->_dms->getUser($eID); + $eU = $version->getDMS()->getUser($eID); $userrecipients[] = $eU; } $grouprecipients = array(); foreach ($emailGroupList as $eID) { - $eU = $version->_document->_dms->getGroup($eID); + $eU = $version->getDMS()->getGroup($eID); $grouprecipients[] = $eU; } From 4215eda96629381664775d176a15c7105661039e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Sep 2019 12:53:45 +0200 Subject: [PATCH 174/467] remember current folder id on page, update drop folder list regulary --- CHANGELOG | 2 ++ controllers/class.Preview.php | 1 + styles/bootstrap/application.js | 6 ++++++ views/bootstrap/class.Bootstrap.php | 11 +++++++---- views/bootstrap/class.ViewFolder.php | 15 ++++++++++++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b312d151e..d603823ca 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,8 @@ - Import from filesystem can read a file with metadata - drop folder chooser can be put multiple times on a page - add section in README.Install.md on how to secure the configuration +- fix php error when removing a version of a document +- major rework of ViewFolder page, most parts of the page are now loaded by ajax -------------------------------------------------------------------------------- Changes in version 5.1.12 diff --git a/controllers/class.Preview.php b/controllers/class.Preview.php index 861668b08..4ddd7b5cc 100644 --- a/controllers/class.Preview.php +++ b/controllers/class.Preview.php @@ -23,6 +23,7 @@ class SeedDMS_Controller_Preview extends SeedDMS_Controller_Common { public function run() { + global $theme; $dms = $this->params['dms']; $type = $this->params['type']; $settings = $this->params['settings']; diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 294679d58..9990acc73 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -1147,3 +1147,9 @@ $(document).ready(function() { /* {{{ */ timeOutId = setTimeout(checkTasks, 30000); } + var updateDropFolder = function() { + $('#menu-dropfolder > div.ajax').trigger('update', {folderid: seeddms_folder}); + console.log(seeddms_folder); + timeOutId = setTimeout(updateDropFolder, 60000); + } + diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 2c6f85dd2..cada9ac6c 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -166,6 +166,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo ''."\n"; if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) { $this->addFooterJS('checkTasks();'); + $this->addFooterJS('updateDropFolder();'); } if($this->footerjs) { $jscode = "$(document).ready(function () {\n"; @@ -196,6 +197,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; header('Content-Type: application/javascript'); echo "var seeddms_absbaseprefix=\"".$this->params['absbaseprefix']."\";\n"; echo "var seeddms_webroot=\"".$this->params['settings']->_httpRoot."\";\n"; + echo "var seeddms_folder=1;\n"; } /* }}} */ function footerjs() { /* {{{ */ @@ -1597,7 +1599,7 @@ $(document).ready(function() { $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { @@ -1617,7 +1619,7 @@ $(document).ready(function() { $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $children = array(); foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); $children[] = $node; } return $children; @@ -1633,7 +1635,7 @@ $(document).ready(function() { $folder = array_shift($path); $node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>false, 'is_folder'=>true); if(!$folder->hasSubFolders()) { - $node['load_on_demand'] = false; + $node['load_on_demand'] = true; $node['children'] = array(); } else { $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 0 /*$expandtree*/, $orderby, 0); @@ -1661,7 +1663,8 @@ $(document).ready(function() { ?> var data = ; $(function() { - $('#jqtree').tree({ + const $tree = $('#jqtree'); + $tree.tree({ // saveState: true, selectable: false, data: data, diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index b9e18fb4b..fc6122ddc 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -104,8 +104,10 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_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')); ?> +seeddms_folder = getID() ?>; function folderSelected(id, name) { // window.location = '../out/out.ViewFolder.php?folderid=' + id; + seeddms_folder = id; $('div.ajax').trigger('update', {folderid: id, orderby: ''}); } @@ -143,7 +145,17 @@ $(window).scroll(function() { $('#loadmore').click(function(e) { loadMoreObjects($(this), $(this).data('all')); }); + +/* +$('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { + attr_id = $(ev.currentTarget).attr('id').split('-')[3]; + folderSelected(attr_id, ''); + $([document.documentElement, document.body]).animate({ + scrollTop: 200 + }, 200); +}); +*/ printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', ($expandFolderTree == 1) ? -1 : 3, $orderby); @@ -274,6 +286,7 @@ $('#loadmore').click(function(e) { if($documents === null) $documents = $folder->getDocuments($orderby[0], $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); + $parent = null; //$folder->getParent(); $txt = $this->callHook('folderListPreContent', $folder, $subFolders, $documents); if(is_string($txt)) @@ -286,7 +299,7 @@ $('#loadmore').click(function(e) { else { print ""; print "\n\n"; - print "\n"; + print "\n"; print "
      ".($parent ? '' : '')."".getMLText("name"); print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; From 88168d005ee9a7619c8853894223fcac7e9c4891 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 6 Sep 2019 14:32:14 +0200 Subject: [PATCH 175/467] take over some changes from 5.1.x --- CHANGELOG | 16 +- inc/inc.ClassAccessOperation.php | 36 ++--- inc/inc.ClassViewCommon.php | 17 +- inc/inc.Extension.php | 14 +- op/op.CreateDump.php | 9 +- op/op.CreateFolderArchive.php | 12 +- op/op.Download.php | 22 ++- out/out.DocumentChooser.php | 28 +++- views/bootstrap/class.BackupTools.php | 220 +++++++++++++------------- views/bootstrap/class.Bootstrap.php | 87 ++++++---- 10 files changed, 264 insertions(+), 197 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4364a5903..91201f6d8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -116,6 +116,18 @@ - add document list which can be exported as an archive - search results can be exported +-------------------------------------------------------------------------------- + Changes in version 5.1.13 +-------------------------------------------------------------------------------- +- make use of backup dir, do not allow backup if backup dir is not set +- the referer parameter in op/op.Settings.php is turned into an url before used + for redirect +- Import from filesystem can read a file with metadata +- drop folder chooser can be put multiple times on a page +- add section in README.Install.md on how to secure the configuration +- fix php error when removing a version of a document +- major rework of ViewFolder page, most parts of the page are now loaded by ajax + -------------------------------------------------------------------------------- Changes in version 5.1.12 -------------------------------------------------------------------------------- @@ -145,10 +157,10 @@ -------------------------------------------------------------------------------- - fix for CVE-2019-12744 (Remote Command Execution through unvalidated file upload), add .htaccess file to data directory, better documentation - for installing seeddms + for installing seeddms - fix for CVE-2019-12745 (Persistent or Stored XSS in UsrMgr) and CVE-2019-12801 (Persistent or Stored XSS in GroupMgr), propperly escape - strings used in Select2 js library used by UsrMgr and GroupMgr + strings used in Select2 js library used by UsrMgr and GroupMgr - do not show attributes in search results in extra column anymore - fix setting language during login (Closes #437) - fix indexing documents even if no preIndexDocument hook is set (Closes #437) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index 492be5f20..230a7ae74 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -27,7 +27,7 @@ class SeedDMS_AccessOperation { * @var object $dms reference to dms * @access protected */ - protected $dms; + private $dms; /** * @var object $user user requesting the access @@ -63,7 +63,7 @@ class SeedDMS_AccessOperation { * even if is disallowed in the settings. */ function mayEditVersion($document, $vno=0) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($vno) $version = $document->getContentByVersion($vno); else @@ -87,7 +87,7 @@ class SeedDMS_AccessOperation { * even if is disallowed in the settings. */ function mayRemoveVersion($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { $versions = $document->getContent(); if ((($this->settings->_enableVersionDeletion && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() ) && (count($versions) > 1)) { return true; @@ -107,7 +107,7 @@ class SeedDMS_AccessOperation { * even if is disallowed in the settings. */ function mayOverrideStatus($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_REJECTED || $status["status"]==S_OBSOLETE || $status["status"]==S_NEEDS_CORRECTION)) { @@ -130,7 +130,7 @@ class SeedDMS_AccessOperation { * explicitly allows it. */ function maySetReviewersApprovers($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); $reviewstatus = $latestContent->getReviewStatus(); @@ -163,7 +163,7 @@ class SeedDMS_AccessOperation { * settings. */ function maySetRecipients($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if (($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) { @@ -184,7 +184,7 @@ class SeedDMS_AccessOperation { * settings. */ function maySetRevisors($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) { @@ -205,7 +205,7 @@ class SeedDMS_AccessOperation { * settings. */ function maySetWorkflow($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $workflow = $latestContent->getWorkflow(); if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) { @@ -223,7 +223,7 @@ class SeedDMS_AccessOperation { * expiration date is only allowed if the document has not been obsoleted. */ function maySetExpires($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if ((($document->getAccessMode($this->user) >= M_READWRITE) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) { @@ -244,7 +244,7 @@ class SeedDMS_AccessOperation { * disallowed in the settings. */ function mayEditComment($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($document->isLocked()) { $lockingUser = $document->getLockingUser(); if (($lockingUser->getID() != $this->user->getID()) && ($document->getAccessMode($this->user) != M_ALL)) { @@ -271,7 +271,7 @@ class SeedDMS_AccessOperation { * disallowed in the settings. */ function mayEditAttributes($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); $workflow = $latestContent->getWorkflow(); @@ -291,7 +291,7 @@ class SeedDMS_AccessOperation { * account here. */ function mayReview($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_DRAFT_REV) { @@ -309,7 +309,7 @@ class SeedDMS_AccessOperation { * review and if it is allowed in the settings */ function mayUpdateReview($document, $updateUser) { /* {{{ */ - if(get_class($document) == 'SeedDMS_Core_Document') { + if($this->obj->isType('document')) { if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) { return true; } @@ -324,7 +324,7 @@ class SeedDMS_AccessOperation { * approval and if it is allowed in the settings */ function mayUpdateApproval($document, $updateUser) { /* {{{ */ - if(get_class($document) == 'SeedDMS_Core_Document') { + if($this->obj->isType('document')) { if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) { return true; } @@ -342,7 +342,7 @@ class SeedDMS_AccessOperation { * account here. */ function mayApprove($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_DRAFT_APP) { @@ -361,7 +361,7 @@ class SeedDMS_AccessOperation { * account here. */ function mayReceipt($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_RELEASED) { @@ -379,7 +379,7 @@ class SeedDMS_AccessOperation { * review and if it is allowed in the settings */ function mayUpdateReceipt($document, $updateUser) { /* {{{ */ - if(get_class($document) == 'SeedDMS_Core_Document') { + if($this->obj->isType('document')) { if($this->settings->_enableUpdateReceipt && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) { return true; } @@ -395,7 +395,7 @@ class SeedDMS_AccessOperation { * account here. */ function mayRevise($document) { /* {{{ */ - if(get_class($document) == $this->dms->getClassname('document')) { + if($this->obj->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); if ($document->getAccessMode($this->user) >= M_READ && $status["status"]!=S_OBSOLETE) { diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php index faf097541..73203d106 100644 --- a/inc/inc.ClassViewCommon.php +++ b/inc/inc.ClassViewCommon.php @@ -43,6 +43,7 @@ class SeedDMS_View_Common { } public function __invoke($get=array()) { + $this->callHook('preRun', isset($get['action']) ? $get['action'] : 'show'); if(isset($get['action']) && $get['action']) { if(method_exists($this, $get['action'])) { $this->{$get['action']}(); @@ -51,6 +52,7 @@ class SeedDMS_View_Common { } } else $this->show(); + $this->callHook('postRun', isset($get['action']) ? $get['action'] : 'show'); } public function setParams($params) { @@ -97,10 +99,17 @@ class SeedDMS_View_Common { * function returns */ public function callHook($hook) { /* {{{ */ + $tmps = array(); $tmp = explode('_', get_class($this)); + $tmps[] = $tmp[2]; + $tmp = explode('_', get_parent_class($this)); + $tmps[] = $tmp[2]; + /* Run array_unique() in case the parent class has the same suffix */ + $tmps = array_unique($tmps); $ret = null; - if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])])) { - foreach($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])] as $hookObj) { + foreach($tmps as $tmp) + if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)])) { + foreach($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)] as $hookObj) { if (method_exists($hookObj, $hook)) { switch(func_num_args()) { case 1: @@ -252,12 +261,12 @@ class SeedDMS_View_Common { return $tag; } /* }}} */ - public function jsTranslations($keys) { + public function jsTranslations($keys) { /* {{{ */ echo "var trans = {\n"; foreach($keys as $key) { echo " '".$key."': '".str_replace("'", "\\\'", getMLText($key))."',\n"; } echo "};\n"; - } + } /* }}} */ } ?> diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index b0e915333..f6fcc23f0 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -32,12 +32,14 @@ foreach($EXT_CONF as $extname=>$extconf) { } } if(!isset($extconf['disable']) || $extconf['disable'] == false) { - $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; - if(file_exists($classfile)) { - include($classfile); - $obj = new $extconf['class']['name']; - if(method_exists($obj, 'init')) - $obj->init(isset($settings->_extensions[$extname]) ? $settings->_extensions[$extname] : null); + if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { + $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; + if(file_exists($classfile)) { + include($classfile); + $obj = new $extconf['class']['name']; + if(method_exists($obj, 'init')) + $obj->init(isset($settings->_extensions[$extname]) ? $settings->_extensions[$extname] : null); + } } if(isset($extconf['language']['file'])) { $langfile = $settings->_rootDir."/ext/".$extname."/".$extconf['language']['file']; diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php index 4859d7f18..f96fe84af 100644 --- a/op/op.CreateDump.php +++ b/op/op.CreateDump.php @@ -31,13 +31,12 @@ if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } -if($settings->_backupDir && file_exists($settings->_backupDir)) - $basedir = $settings->_backupDir; -else - $basedir = $settings->_contentDir; +if (!$settings->_backupDir) { + UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir")); +} $v = new SeedDMS_Version; -$dump_name = $basedir.date('Y-m-d\TH-i-s')."_".$v->_number.".sql"; +$dump_name = addDirSep($settings->_backupDir).date('Y-m-d\TH-i-s')."_".$v->_number.".sql"; if(!$dms->createDump($dump_name)) UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); diff --git a/op/op.CreateFolderArchive.php b/op/op.CreateFolderArchive.php index 4877738ad..07c1cb112 100644 --- a/op/op.CreateFolderArchive.php +++ b/op/op.CreateFolderArchive.php @@ -167,14 +167,14 @@ if (!is_object($folder)) { UI::exitError(getMLText("admin_tools"),getMLText("invalid_folder_id")); } +if (!$settings->_backupDir) { + UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir")); +} + $human_readable = (isset($_GET["human_readable"]) && $_GET["human_readable"]==1 ? true : false); -if($settings->_backupDir && file_exists($settings->_backupDir)) - $basedir = $settings->_backupDir; -else - $basedir = $settings->_contentDir; -if ($human_readable)$ark_name = $basedir.time()."_".$folderid."_HR.tar"; -else $ark_name = $basedir.time()."_".$folderid.".tar"; +if ($human_readable)$ark_name = addDirSep($settings->_backupDir).time()."_".$folderid."_HR.tar"; +else $ark_name = addDirSep($settings->_backupDir).time()."_".$folderid.".tar"; $ark = fopen($ark_name,"w"); diff --git a/op/op.Download.php b/op/op.Download.php index 9124536c0..8451136e3 100644 --- a/op/op.Download.php +++ b/op/op.Download.php @@ -119,16 +119,12 @@ elseif (isset($_GET["arkname"])) { /* {{{ */ UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); } - if($settings->_backupDir && file_exists($settings->_backupDir)) - $basedir = $settings->_backupDir; - else - $basedir = $settings->_contentDir; - - if (!file_exists($basedir.$filename) ) { + $backupdir = addDirSep($settings->_backupDir); + if (!file_exists($backupdir.$filename) ) { UI::exitError(getMLText("admin_tools"),getMLText("missing_file")); } - $controller->setParam('basedir', $basedir); + $controller->setParam('basedir', $backupdir); $controller->setParam('file', $filename); $controller->archive(); } /* }}} */ @@ -192,16 +188,16 @@ elseif (isset($_GET["dumpname"])) { /* {{{ */ UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); } - if($settings->_backupDir && file_exists($settings->_backupDir)) - $basedir = $settings->_backupDir; - else - $basedir = $settings->_contentDir; + $backupdir = addDirSep($settings->_backupDir); + if (!$backupdir) { + UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir")); + } - if (!file_exists($basedir.$filename) ) { + if (!file_exists($backupdir.$filename) ) { UI::exitError(getMLText("admin_tools"),getMLText("missing_file")); } - $controller->setParam('basedir', $basedir); + $controller->setParam('basedir', $backupdir); $controller->setParam('file', $filename); $controller->sqldump(); } /* }}} */ diff --git a/out/out.DocumentChooser.php b/out/out.DocumentChooser.php index fe14f1042..ba9174ed5 100644 --- a/out/out.DocumentChooser.php +++ b/out/out.DocumentChooser.php @@ -29,19 +29,33 @@ require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); require_once("inc/inc.Authentication.php"); -$folderid = intval($_GET["folderid"]); -$form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]); +if(isset($_GET['action']) && $_GET['action'] == 'subtree') { + if (!isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) { + $nodeid = $settings->_rootFolderID; + } else { + $nodeid = intval($_GET["node"]); + } -if(isset($_GET['partialtree'])) { - $partialtree = intval($_GET['partialtree']); + $node = $dms->getFolder($nodeid); + if (!is_object($node)) { + UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))), getMLText("invalid_folder_id")); + } } else { - $partialtree = 0; + $folderid = intval($_GET["folderid"]); + $folder = $dms->getFolder($folderid); + $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]); } -$folder = $dms->getFolder($folderid); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'form'=>$form, 'partialtree'=>$partialtree)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + if(isset($_GET['action']) && $_GET['action'] == 'subtree') { + $view->setParam('node', $node); + $view->setParam('orderby', $settings->_sortFoldersDefault); + } else { + $view->setParam('folder', $folder); + $view->setParam('form', $form); + } $view($_GET); exit; } diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php index 2d28b42b0..62a31761c 100644 --- a/views/bootstrap/class.BackupTools.php +++ b/views/bootstrap/class.BackupTools.php @@ -75,124 +75,128 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style { // archive creation //////////////////////////////////////////////////////////// - $this->contentHeading(getMLText("archive_creation")); - print "

      ".getMLText("archive_creation_warning")."

      \n"; - $this->contentContainerStart(); - if($accessop->check_controller_access('CreateFolderArchive', array('action'=>'run'))) { - print ""; - $this->printFolderChooserHtml("form2",M_READWRITE); - print ""; - print ""; - print "\n"; - } - - // list backup files - - $handle = opendir($backupdir); - $entries = array(); - while ($e = readdir($handle)){ - if (is_dir($backupdir.$e)) continue; - if (strpos($e,".tar.gz")==FALSE) continue; - $entries[] = $e; - } - closedir($handle); - - sort($entries); - $entries = array_reverse($entries); - - if($entries) { - $this->contentSubHeading(getMLText("backup_list")); - print "\n"; - print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n\n\n"; - - foreach ($entries as $entry){ - - $folderid=substr($entry,strpos($entry,"_")+1); - $folder=$dms->getFolder((int)$folderid); - - print "\n"; - print "\n"; - if (is_object($folder)) print "\n"; - else print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + if($this->params['hasbackupdir']) { + $this->contentHeading(getMLText("archive_creation")); + print "

      ".getMLText("archive_creation_warning")."

      \n"; + $this->contentContainerStart(); + if($accessop->check_controller_access('CreateFolderArchive', array('action'=>'run'))) { + print ""; + $this->printFolderChooserHtml("form2",M_READWRITE); + print ""; + print ""; + print "\n"; } - print "
      ".getMLText("folder")."".getMLText("creation_date")."".getMLText("file_size")."
      "; - if($accessop->check_controller_access('Download', array('action'=>'archive'))) - print "".$entry.""; - else - print $entry; - print "".htmlspecialchars($folder->getName())."".getMLText("unknown_id")."".getLongReadableDate(filectime($backupdir.$entry))."".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry)).""; - if($accessop->check_controller_access('RemoveArchive', array('action'=>'run'))) - print " ".getMLText("backup_remove").""; - print "
      \n"; - } - $this->contentContainerEnd(); + // list backup files - // dump creation /////////////////////////////////////////////////////////////// + $handle = opendir($backupdir); + $entries = array(); + while ($e = readdir($handle)){ + if (is_dir($backupdir.$e)) continue; + if (strpos($e,".tar.gz")==FALSE) continue; + $entries[] = $e; + } + closedir($handle); - $this->contentHeading(getMLText("dump_creation")); - print "

      ".getMLText("dump_creation_warning")."

      \n"; - $this->contentContainerStart(); + sort($entries); + $entries = array_reverse($entries); - if($accessop->check_controller_access('CreateDump', array('action'=>'run'))) { + if($entries) { + $this->contentSubHeading(getMLText("backup_list")); + print "\n"; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n\n\n"; + + foreach ($entries as $entry){ + + $folderid=substr($entry,strpos($entry,"_")+1); + $folder=$dms->getFolder((int)$folderid); + + print "\n"; + print "\n"; + if (is_object($folder)) print "\n"; + else print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + } + print "
      ".getMLText("folder")."".getMLText("creation_date")."".getMLText("file_size")."
      "; + if($accessop->check_controller_access('Download', array('action'=>'archive'))) + print "".$entry.""; + else + print $entry; + print "".htmlspecialchars($folder->getName())."".getMLText("unknown_id")."".getLongReadableDate(filectime($backupdir.$entry))."".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry)).""; + if($accessop->check_controller_access('RemoveArchive', array('action'=>'run'))) + print " ".getMLText("backup_remove").""; + print "
      \n"; + } + + $this->contentContainerEnd(); + + // dump creation /////////////////////////////////////////////////////////////// + + $this->contentHeading(getMLText("dump_creation")); + print "

      ".getMLText("dump_creation_warning")."

      \n"; + $this->contentContainerStart(); + + if($accessop->check_controller_access('CreateDump', array('action'=>'run'))) { print "
      "; print ""; print "
      \n"; - } - - // list backup files - $handle = opendir($backupdir); - $entries = array(); - while ($e = readdir($handle)){ - if (is_dir($backupdir.$e)) continue; - if (strpos($e,".sql.gz")==FALSE) continue; - $entries[] = $e; - } - closedir($handle); - - sort($entries); - $entries = array_reverse($entries); - - if($entries) { - $this->contentSubHeading(getMLText("dump_list")); - print "\n"; - print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n\n\n"; - - foreach ($entries as $entry){ - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; } - print "
      ".getMLText("creation_date")."".getMLText("file_size")."
      "; - if($accessop->check_controller_access('Download', array('action'=>'sqldump'))) - print "".$entry.""; - else - print $entry; - print "".getLongReadableDate(filectime($backupdir.$entry))."".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry)).""; - if($accessop->check_controller_access('RemoveDump', array('action'=>'run'))) - print " ".getMLText("dump_remove").""; - print "
      \n"; - } - $this->contentContainerEnd(); + // list backup files + $handle = opendir($backupdir); + $entries = array(); + while ($e = readdir($handle)){ + if (is_dir($backupdir.$e)) continue; + if (strpos($e,".sql.gz")==FALSE) continue; + $entries[] = $e; + } + closedir($handle); + + sort($entries); + $entries = array_reverse($entries); + + if($entries) { + $this->contentSubHeading(getMLText("dump_list")); + print "\n"; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n\n\n"; + + foreach ($entries as $entry){ + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + } + print "
      ".getMLText("creation_date")."".getMLText("file_size")."
      "; + if($accessop->check_controller_access('Download', array('action'=>'sqldump'))) + print "".$entry.""; + else + print $entry; + print "".getLongReadableDate(filectime($backupdir.$entry))."".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry)).""; + if($accessop->check_controller_access('RemoveDump', array('action'=>'run'))) + print " ".getMLText("dump_remove").""; + print "
      \n"; + } + + $this->contentContainerEnd(); + } else { + $this->warningMsg(getMLText('no_backup_dir')); + } // files deletion ////////////////////////////////////////////////////////////// /* diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 328f1e6f2..458d169ad 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -168,6 +168,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo ''."\n"; if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) { $this->addFooterJS('checkTasks();'); + $this->addFooterJS('updateDropFolder();'); } if($this->footerjs) { $jscode = "$(document).ready(function () {\n"; @@ -198,6 +199,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; header('Content-Type: application/javascript'); echo "var seeddms_absbaseprefix=\"".$this->params['absbaseprefix']."\";\n"; echo "var seeddms_webroot=\"".$this->params['settings']->_httpRoot."\";\n"; + echo "var seeddms_folder=1;\n"; } /* }}} */ function footerjs() { /* {{{ */ @@ -431,7 +433,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if($this->params['dropfolderdir'] && $this->params['enabledropfolderlist']) { echo "
      "; echo "
      getClassname('folder'))) + if ($folder!=null && is_object($folder) && $folder->isType('folder')) echo " data-query=\"folderid=".$folder->getID()."\""; echo ">
      "; echo "
      "; @@ -458,7 +460,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } echo " \n"; echo "
      "; - if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) { + if ($folder!=null && is_object($folder) && $folder->isType('folder')) { echo " getID()."\" />"; } echo " "; @@ -563,7 +565,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; private function folderNavigationBar($folder) { /* {{{ */ $dms = $this->params['dms']; - if (!is_object($folder) || strcasecmp(get_class($folder), $dms->getClassname('folder'))) { + if (!is_object($folder) || !$folder->isType('folder')) { echo "
        \n"; echo "
      \n"; return; @@ -1190,7 +1192,7 @@ $(document).ready(function() {
      - '.getMLText("browse").'… + '.getMLText("browse").'…
      @@ -1580,7 +1582,7 @@ $(document).ready(function() { $content = "
      \n"; $content .= ""; $content .= ""; - $content .= "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; + $content .= "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; $content .= "
      \n"; $content .= '
      "; // $this->contentContainerEnd(); - print "
      "; + print "
      "; + } print "
      "; // $this->contentContainerStart(); print "".getMLText('approvers').""; From 875dea57082cdac4f4ea59d97a4bd521453af594 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Sep 2019 17:43:32 +0200 Subject: [PATCH 181/467] do not set mandatory reviewer if workflow is traditional_no_review --- op/op.Ajax.php | 70 +++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 21744e8ab..1f87a0728 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -683,46 +683,52 @@ switch($command) { $approvers["i"] = array(); $approvers["g"] = array(); - // add mandatory reviewers/approvers - $docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp); - $res=$user->getMandatoryReviewers(); - foreach ($res as $r){ + if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') { + // add mandatory reviewers/approvers + $docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp); + if($settings->_workflowMode == 'traditional') { + $res=$user->getMandatoryReviewers(); + foreach ($res as $r){ - if ($r['reviewerUserID']!=0){ - foreach ($docAccess["users"] as $usr) - if ($usr->getID()==$r['reviewerUserID']){ - $reviewers["i"][] = $r['reviewerUserID']; - break; + if ($r['reviewerUserID']!=0){ + foreach ($docAccess["users"] as $usr) + if ($usr->getID()==$r['reviewerUserID']){ + $reviewers["i"][] = $r['reviewerUserID']; + break; + } } - } - else if ($r['reviewerGroupID']!=0){ - foreach ($docAccess["groups"] as $grp) - if ($grp->getID()==$r['reviewerGroupID']){ - $reviewers["g"][] = $r['reviewerGroupID']; - break; + else if ($r['reviewerGroupID']!=0){ + foreach ($docAccess["groups"] as $grp) + if ($grp->getID()==$r['reviewerGroupID']){ + $reviewers["g"][] = $r['reviewerGroupID']; + break; + } } + } } - } - $res=$user->getMandatoryApprovers(); - foreach ($res as $r){ + $res=$user->getMandatoryApprovers(); + foreach ($res as $r){ - if ($r['approverUserID']!=0){ - foreach ($docAccess["users"] as $usr) - if ($usr->getID()==$r['approverUserID']){ - $approvers["i"][] = $r['approverUserID']; - break; - } - } - else if ($r['approverGroupID']!=0){ - foreach ($docAccess["groups"] as $grp) - if ($grp->getID()==$r['approverGroupID']){ - $approvers["g"][] = $r['approverGroupID']; - break; - } + if ($r['approverUserID']!=0){ + foreach ($docAccess["users"] as $usr) + if ($usr->getID()==$r['approverUserID']){ + $approvers["i"][] = $r['approverUserID']; + break; + } + } + else if ($r['approverGroupID']!=0){ + foreach ($docAccess["groups"] as $grp) + if ($grp->getID()==$r['approverGroupID']){ + $approvers["g"][] = $r['approverGroupID']; + break; + } + } } + + } elseif($settings->_workflowMode == 'advanced') { + $workflow = $user->getMandatoryWorkflow(); } - $workflow = $user->getMandatoryWorkflow(); $expires = false; if($settings->_presetExpirationDate) { From d1691190f20decabe5c21361bf64a3ea688948a3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Sep 2019 17:40:38 +0200 Subject: [PATCH 182/467] pass parameter 'onepage' to view used to enable/disable new behaviour with ajax request to update page --- out/out.ViewFolder.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index 5fd88ca72..c7d2a4853 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -96,6 +96,7 @@ if($view) { $view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage); $view->setParam('offset', $offset); $view->setParam('limit', $limit); + $view->setParam('onepage', true); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } From 7a76470c072ec7844e37810b0b567973ea54ac76 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Sep 2019 17:41:45 +0200 Subject: [PATCH 183/467] take out var_dump --- SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php index 1116616a6..7ca9663a3 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php @@ -99,6 +99,7 @@ class SeedDMS_SQLiteFTS_Indexer { $sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".time().")"; $res = $this->_conn->exec($sql); if($res === false) { + return false; var_dump($this->_conn->errorInfo()); } return $res; From 679fb1a349c69a70f91d8b3f0b387256720b0ed2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Sep 2019 17:42:14 +0200 Subject: [PATCH 184/467] callback can be passed to sendFileToServer() --- styles/bootstrap/application.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 9990acc73..d07b8dd2c 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -545,7 +545,7 @@ function onAddClipboard(ev) { /* {{{ */ maxFileSizeMsg = msg; } - function sendFileToServer(formData,status) { + function sendFileToServer(formData,status,callback) { var uploadURL = ajaxurl; //Upload URL var extraData ={}; //Extra Data. var jqXHR=$.ajax({ @@ -584,6 +584,9 @@ function onAddClipboard(ev) { /* {{{ */ timeout: 1500, }); status.statusbar.after($('' + editBtnLabel + '')); + if(callback) { + callback(); + } } else { noty({ text: data.message, @@ -665,7 +668,10 @@ function onAddClipboard(ev) { /* {{{ */ statusbar.parent().show(); var status = new createStatusbar(statusbar); status.setFileNameSize(files[i].name,files[i].size); - sendFileToServer(fd,status); + sendFileToServer(fd,status,function(){ + if(target_id == seeddms_folder) + $("div.ajax[data-action='folderList']").trigger('update', {folderid: seeddms_folder}); + }); } else { noty({ text: maxFileSizeMsg + '
      ' + files[i].name + ' (' + files[i].size + ' Bytes)', @@ -1149,7 +1155,6 @@ $(document).ready(function() { /* {{{ */ var updateDropFolder = function() { $('#menu-dropfolder > div.ajax').trigger('update', {folderid: seeddms_folder}); - console.log(seeddms_folder); timeOutId = setTimeout(updateDropFolder, 60000); } From 39217037b8c9e6f44d325e3278c633f9da708229 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Sep 2019 17:43:50 +0200 Subject: [PATCH 185/467] fix tree behaviour, do not load all sub nodes --- views/bootstrap/class.Bootstrap.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 62217b86f..a5d3b4951 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1593,15 +1593,19 @@ $(document).ready(function() { function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='', $partialtree=false) { /* {{{ */ function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { $orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc'); - if($path || $expandtree>=$level) { + if($path/* || $expandtree>=$level*/) { if($path) $pathfolder = array_shift($path); $children = array(); - $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir); - $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); + if($expandtree) { + $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir); + $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); + } else { + $subfolders = array($pathfolder); + } foreach($subfolders as $subfolder) { $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); - if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { + if(/*$expandtree>=$level ||*/ $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { $documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir); @@ -1669,7 +1673,7 @@ $(function() { const $tree = $('#jqtree'); $tree.tree({ // saveState: true, - selectable: false, + selectable: true, data: data, saveState: 'jqtree', openedIcon: $(''), @@ -1680,7 +1684,7 @@ $(function() { } else documentSelected(node.id, node.name); }, - autoOpen: true, + autoOpen: false, drapAndDrop: true, onCreateLi: function(node, $li) { // Add 'icon' span before title From 49f29d007b75aed4b5ce55426d5c6a629fad9aae Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Sep 2019 17:44:40 +0200 Subject: [PATCH 186/467] new onepage mode can be turned off --- views/bootstrap/class.ViewFolder.php | 29 ++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index fc6122ddc..66fda3279 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -100,15 +100,19 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $enableDropUpload = $this->params['enableDropUpload']; $maxItemsPerPage = $this->params['maxItemsPerPage']; $showtree = $this->params['showtree']; + $onepage = $this->params['onepage']; 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')); ?> seeddms_folder = getID() ?>; function folderSelected(id, name) { -// window.location = '../out/out.ViewFolder.php?folderid=' + id; + + window.location = '../out/out.ViewFolder.php?folderid=' + id; + seeddms_folder = id; $('div.ajax').trigger('update', {folderid: id, orderby: ''}); + } function loadMoreObjects(element, limit) { @@ -147,7 +151,9 @@ $('#loadmore').click(function(e) { }); -/* + $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { attr_id = $(ev.currentTarget).attr('id').split('-')[3]; folderSelected(attr_id, ''); @@ -155,7 +161,13 @@ $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { scrollTop: 200 }, 200); }); -*/ +$('body').on('click', '.order-btn', function(ev) { + ev.preventDefault(); + var element = $(this); + var orderby = element.data('orderby'); + $("div.ajax[data-action='folderList']").trigger('update', {folderid: seeddms_folder, orderby: orderby}); +}); + printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', ($expandFolderTree == 1) ? -1 : 3, $orderby); @@ -268,6 +280,7 @@ $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { $previewconverters = $this->params['previewConverters']; $timeout = $this->params['timeout']; $xsendfile = $this->params['xsendfile']; + $onepage = $this->params['onepage']; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); $previewer->setConverters($previewconverters); @@ -286,7 +299,7 @@ $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { if($documents === null) $documents = $folder->getDocuments($orderby[0], $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); - $parent = null; //$folder->getParent(); + $parent = $onepage ? $folder->getParent() : null; $txt = $this->callHook('folderListPreContent', $folder, $subFolders, $documents); if(is_string($txt)) @@ -301,9 +314,9 @@ $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { print "\n\n"; print "".($parent ? '' : '')."\n"; print "".getMLText("name"); - print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; - print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; - print " ".($orderby=="d"||$orderby=="da"?' ':($orderby=="dd"?' ':' ')).""; + print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; + print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; + print " ".($orderby=="d"||$orderby=="da"?' ':($orderby=="dd"?' ':' ')).""; print "\n"; // print "".getMLText("owner")."\n"; print "".getMLText("status")."\n"; @@ -547,7 +560,7 @@ $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { echo "
      "; // $this->dropUpload(); ?> -
      getID()."\"" : "") ?>>
      +
      getID()."\"" : "") ?>>
      "; From dfe50ca85b9d66e1811e88cae8e896d7a8fb4d5a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Sep 2019 17:45:08 +0200 Subject: [PATCH 187/467] add changes for 5.1.13 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d603823ca..77e460ae1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,8 @@ - add section in README.Install.md on how to secure the configuration - fix php error when removing a version of a document - major rework of ViewFolder page, most parts of the page are now loaded by ajax +- do not set mandatory reviewer when document is uploaded and workflow mode is + set to 'traditional without review'. -------------------------------------------------------------------------------- Changes in version 5.1.12 From 721aaed1c11a20fbdc90cd5c89b2d97200428c42 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Sep 2019 08:32:50 +0200 Subject: [PATCH 188/467] init variable $workflow to prevent php warning --- op/op.Ajax.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 1f87a0728..727d0516e 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -682,6 +682,7 @@ switch($command) { $reviewers["g"] = array(); $approvers["i"] = array(); $approvers["g"] = array(); + $workflow = null; if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') { // add mandatory reviewers/approvers From ae4a65e8bc5d9f3d4d4c43115ca1780966b1e6cd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 1 Oct 2019 14:05:29 +0200 Subject: [PATCH 189/467] discard fileType if just '.' --- SeedDMS_Core/Core/inc.ClassDocument.php | 16 +++++++++++++++- SeedDMS_Core/package.xml | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index fddc19954..96e9290c3 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -1470,6 +1470,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $version = $resArr[0]['m']+1; } + if($fileType == '.') + $fileType = ''; $filesize = SeedDMS_Core_File::fileSize($tmpFile); $checksum = SeedDMS_Core_File::checksum($tmpFile); @@ -1639,6 +1641,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if(!$content) return false; + if($fileType == '.') + $fileType = ''; + /* Check if $user, $orgFileName, $fileType and $mimetype are the same */ if($user->getID() != $content->getUser()->getID()) { return false; @@ -2858,7 +2863,16 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return $this->_user; } /* }}} */ - function getPath() { return $this->_document->getDir() . $this->_version . $this->_fileType; } + /** + * Return path of file on disk relative to the content directory + * + * Since version 5.1.13 a single '.' in the fileType will be skipped. + * On Windows a file named 'name.' will be saved as 'name' but the fileType + * will contain the a single '.'. + * + * @return string path of file on disc + */ + function getPath() { return $this->_document->getDir() . $this->_version . ($this->_fileType != '.' ? $this->_fileType : ''); } function setDate($date = false) { /* {{{ */ $db = $this->_document->_dms->getDB(); diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 9b86dfc1b..2b4af3015 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -26,6 +26,7 @@ - add decorators - add new methods SeedDMS_Core_Document::isType(), SeedDMS_Core_Folder::isType(), SeedDMS_Core_DocumentContent::isType(). Use them instead of checking the class name. +- skip a fileType with just a '.' From 31697278d15c9c9b68d3d05c97f52c9077c61ef0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 1 Oct 2019 14:06:00 +0200 Subject: [PATCH 190/467] check for hook attached to parent class in hasHook() --- inc/inc.ClassViewCommon.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php index 95f3e5d09..8ec9f69bf 100644 --- a/inc/inc.ClassViewCommon.php +++ b/inc/inc.ClassViewCommon.php @@ -181,11 +181,20 @@ class SeedDMS_View_Common { * null if no hook was called */ public function hasHook($hook) { /* {{{ */ + $tmps = array(); $tmp = explode('_', get_class($this)); - if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])])) { - foreach($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])] as $hookObj) { - if (method_exists($hookObj, $hook)) { - return true; + $tmps[] = $tmp[2]; + $tmp = explode('_', get_parent_class($this)); + $tmps[] = $tmp[2]; + /* Run array_unique() in case the parent class has the same suffix */ + $tmps = array_unique($tmps); + $ret = null; + foreach($tmps as $tmp) { + if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)])) { + foreach($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)] as $hookObj) { + if (method_exists($hookObj, $hook)) { + return true; + } } } } From 1a23c659fefae2629cb83d9c96e9cebb35b34a8c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 1 Oct 2019 14:06:46 +0200 Subject: [PATCH 191/467] add hook pageNavigationBar, pass date format to getDateChooser() --- views/bootstrap/class.Bootstrap.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index a5d3b4951..30c362f47 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -449,6 +449,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);; case "calendar"; $this->calendarNavigationBar($extra); break; + default: + if($this->hasHook('pageNavigationBar')) { + $menubar = $this->callHook('pageNavigationBar', $pageType, $extra); + if(is_string($menubar)) + echo $menubar; + } } echo "
      \n"; echo "
      \n"; @@ -1054,14 +1060,14 @@ $(document).ready(function() { echo self::getFileChooserHtml($varname, $multiple, $accept); } /* }}} */ - function printDateChooser($defDate = '', $varName) { /* {{{ */ - echo self::getDateChooser($defDate, $varName); + function printDateChooser($defDate = '', $varName, $lang='', $dateformat='yyyy-mm-dd') { /* {{{ */ + echo self::getDateChooser($defDate, $varName, $lang, $dateformat); } /* }}} */ - function getDateChooser($defDate = '', $varName, $lang='') { /* {{{ */ + function getDateChooser($defDate = '', $varName, $lang='', $dateformat='yyyy-mm-dd') { /* {{{ */ $content = ' - - + + '; return $content; From ec9ad497918edd32ff1fab69186109fbc156d059 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 1 Oct 2019 14:07:39 +0200 Subject: [PATCH 192/467] changes in 5.1.13 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 77e460ae1..40fe3b4ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,8 @@ - major rework of ViewFolder page, most parts of the page are now loaded by ajax - do not set mandatory reviewer when document is uploaded and workflow mode is set to 'traditional without review'. +- turn off auto complete for date fields +- new hook pageNavigationBar -------------------------------------------------------------------------------- Changes in version 5.1.12 From 459883748e114892520398b059a9ea64acd75d1c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 11 Oct 2019 16:29:53 +0200 Subject: [PATCH 193/467] remove left overs from last installation, check if renaming succeeded --- inc/inc.ClassExtensionMgr.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index 6a4b56ac7..4a1a65f58 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -348,6 +348,10 @@ class SeedDMS_Extension_Mgr { public function updateExtension($file) { /* {{{ */ /* unzip the extension in a temporary directory */ $newdir = $this->cachedir ."/ext.new"; + /* First remove a left over from a previous extension */ + if(file_exists($newdir)) { + self::rrmdir($newdir); + } if(!mkdir($newdir, 0755)) { $this->errmsgs[] = "Cannot create temp. extension directory"; return false; @@ -375,7 +379,10 @@ class SeedDMS_Extension_Mgr { $this->rrmdir($this->extdir ."/". $extname); } /* Move the temp. created ext directory to the final location */ - rename($newdir, $this->extdir ."/". $extname); + if(!rename($newdir, $this->extdir ."/". $extname)) { + $this->rrmdir($this->extdir ."/". $extname); + return false; + } return true; } /* }}} */ From 0faef9cd18827c152b6d0aa657f21e082ef81514 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 11 Oct 2019 16:30:31 +0200 Subject: [PATCH 194/467] call new hook additionalTypes() --- views/bootstrap/class.AttributeMgr.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php index f6b37d321..25b8f95ce 100644 --- a/views/bootstrap/class.AttributeMgr.php +++ b/views/bootstrap/class.AttributeMgr.php @@ -213,7 +213,22 @@ $(document).ready( function() {
      - +
      Date: Fri, 11 Oct 2019 16:30:53 +0200 Subject: [PATCH 195/467] remove unneeded echo --- views/bootstrap/class.ViewFolder.php | 1 - 1 file changed, 1 deletion(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 66fda3279..e9f999905 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -245,7 +245,6 @@ $('body').on('click', '.order-btn', function(ev) { foreach($attributes as $attribute) { $arr = $this->callHook('showFolderAttribute', $folder, $attribute); if(is_array($arr)) { - echo $txt; echo ""; echo "".$arr[0].":"; echo "".$arr[1].":"; From 297d5d139137f1428d11d6370d141bfcc12f454d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Oct 2019 09:50:54 +0200 Subject: [PATCH 196/467] clicking on document table row will load document page, update browser history --- views/bootstrap/class.Bootstrap.php | 14 +++++++++++--- views/bootstrap/class.ViewFolder.php | 13 +++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 30c362f47..f1917c3f9 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2258,6 +2258,7 @@ $(document).ready( function() { $workflowmode = $this->params['workflowmode']; $previewwidth = $this->params['previewWidthList']; $enableClipboard = $this->params['enableclipboard']; + $onepage = $this->params['onepage']; $content = ''; @@ -2316,8 +2317,11 @@ $(document).ready( function() { $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; $content .= ""; - $content .= ""; - $content .= "" . htmlspecialchars($document->getName()) . ""; + $content .= ""; + if($onepage) + $content .= "".htmlspecialchars($document->getName()) . ""; + else + $content .= "" . htmlspecialchars($document->getName()) . ""; if(isset($extracontent['below_title'])) $content .= $extracontent['below_title']; $content .= "
      ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $document->getDate()).", ".getMLText('version')." ".$version." - ".date('Y-m-d', $latestContent->getDate())."".($document->expires() ? ", ".getMLText('expires').": ".getReadableDate($document->getExpires())."" : "").""; @@ -2425,6 +2429,7 @@ $(document).ready( function() { $enableRecursiveCount = $this->params['enableRecursiveCount']; $maxRecursiveCount = $this->params['maxRecursiveCount']; $enableClipboard = $this->params['enableclipboard']; + $onepage = $this->params['onepage']; $owner = $subFolder->getOwner(); $comment = $subFolder->getComment(); @@ -2433,7 +2438,10 @@ $(document).ready( function() { $content = ''; $content .= $this->folderListRowStart($subFolder); $content .= "getID()."&showtree=".$showtree."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>\n"; - $content .= "getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; + if($onepage) + $content .= "" . "".htmlspecialchars($subFolder->getName()).""; + else + $content .= "getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; $content .= "
      ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; if($comment) { $content .= "
      ".htmlspecialchars($comment).""; diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index e9f999905..e1181202f 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -101,6 +101,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $maxItemsPerPage = $this->params['maxItemsPerPage']; $showtree = $this->params['showtree']; $onepage = $this->params['onepage']; + $sitename = trim(strip_tags($this->params['sitename'])); 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')); @@ -111,7 +112,10 @@ function folderSelected(id, name) { window.location = '../out/out.ViewFolder.php?folderid=' + id; seeddms_folder = id; + title_prefix = "0 ? $sitename : "SeedDMS") ?>"; $('div.ajax').trigger('update', {folderid: id, orderby: ''}); + document.title = title_prefix+": "+name; + window.history.pushState({"html":"","pageTitle":title_prefix+": "+name},"", '../out/out.ViewFolder.php?folderid=' + id); } @@ -154,6 +158,11 @@ $('#loadmore').click(function(e) { +window.onpopstate = function(event) { +console.log("location: " + document.location + ", state: " + JSON.stringify(event.state)); +console.log(JSON.stringify(event.state)); + window.location = document.location; +}; $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { attr_id = $(ev.currentTarget).attr('id').split('-')[3]; folderSelected(attr_id, ''); @@ -161,6 +170,10 @@ $('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { scrollTop: 200 }, 200); }); +$('body').on('click', '[id^=\"table-row-document\"]', function(ev) { + attr_id = $(ev.currentTarget).attr('id').split('-')[3]; + window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; +}); $('body').on('click', '.order-btn', function(ev) { ev.preventDefault(); var element = $(this); From a6ef05b22b42c4f8d399e5aaf22167c7398876fd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Oct 2019 17:57:56 +0200 Subject: [PATCH 197/467] stop event propagation when clicking the delete doc/folder button in the list view --- views/bootstrap/class.Bootstrap.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index f1917c3f9..ef79b702a 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1849,6 +1849,7 @@ $(function() { $(document).ready(function () { // $('.delete-document-btn').click(function(ev) { $('body').on('click', 'a.delete-document-btn', function(ev){ + ev.stopPropagation(); id = $(ev.currentTarget).attr('rel'); confirmmsg = $(ev.currentTarget).attr('confirmmsg'); msg = $(ev.currentTarget).attr('msg'); @@ -1922,6 +1923,7 @@ $(function() { $(document).ready(function () { // $('.delete-folder-btn').click(function(ev) { $('body').on('click', 'a.delete-folder-btn', function(ev){ + ev.stopPropagation(); id = $(ev.currentTarget).attr('rel'); confirmmsg = $(ev.currentTarget).attr('confirmmsg'); msg = $(ev.currentTarget).attr('msg'); From 4ac3dc005275df4efdd74bd3736e9b04cc419388 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Oct 2019 17:58:52 +0200 Subject: [PATCH 198/467] stop event propagation after clicking on addtoclipboard button --- styles/bootstrap/application.js | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index d07b8dd2c..217d1c3a7 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -157,6 +157,7 @@ $(document).ready( function() { $('body').on('click', 'a.addtoclipboard', function(ev) { /* {{{ */ ev.preventDefault(); + ev.stopPropagation(); attr_rel = $(ev.currentTarget).attr('rel'); attr_msg = $(ev.currentTarget).attr('msg'); type = attr_rel.substring(0, 1) == 'F' ? 'folder' : 'document'; From 6ae87d4fe06c7f87f03a9d257cc3f46d3f7525f4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Oct 2019 17:59:43 +0200 Subject: [PATCH 199/467] changing folder/document will require a click on the second child of a row --- views/bootstrap/class.ViewFolder.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index e1181202f..1e57d85c4 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -163,15 +163,15 @@ console.log("location: " + document.location + ", state: " + JSON.stringify(even console.log(JSON.stringify(event.state)); window.location = document.location; }; -$('body').on('click', '[id^=\"table-row-folder\"]', function(ev) { - attr_id = $(ev.currentTarget).attr('id').split('-')[3]; +$('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) { + attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; folderSelected(attr_id, ''); $([document.documentElement, document.body]).animate({ scrollTop: 200 }, 200); }); -$('body').on('click', '[id^=\"table-row-document\"]', function(ev) { - attr_id = $(ev.currentTarget).attr('id').split('-')[3]; +$('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { + attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; }); $('body').on('click', '.order-btn', function(ev) { From f2e7063a564466281890f38900c29a4cf83bf9cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 17 Oct 2019 07:09:08 +0200 Subject: [PATCH 200/467] better documentation of SeedDMS_Core_DocumentContent::verifyStatus --- SeedDMS_Core/Core/inc.ClassDocument.php | 26 +++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 96e9290c3..382de8d61 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2752,20 +2752,31 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ /** * Recalculate the status of a document + * * The methods checks the review and approval status and sets the * status of the document accordingly. - * If status is S_RELEASED and version has workflow set status - * to S_IN_WORKFLOW - * If status is S_RELEASED and there are reviewers set status S_DRAFT_REV - * If status is S_RELEASED or S_DRAFT_REV and there are approvers set + * + * If status is S_RELEASED and the version has a workflow, then set + * the status to S_IN_WORKFLOW + * If status is S_RELEASED and there are reviewers => set status S_DRAFT_REV + * If status is S_RELEASED or S_DRAFT_REV and there are approvers => set * status S_DRAFT_APP - * If status is draft and there are no approver and no reviewers set + * If status is draft and there are no approver and no reviewers => set * status to S_RELEASED * The status of a document with the current status S_OBSOLETE, S_REJECTED, * or S_EXPIRED will not be changed unless the parameter * $ignorecurrentstatus is set to true. + * + * This method may not be called after a negative approval or review to + * recalculated the status, because + * it doesn't take a defeating approval or review into account. It will + * just check for a pending workflow, approval or review and set the status + * accordingly, e.g. after the list of reviewers or appovers has been + * modified. If there is not pending workflow, approval or review the + * status will be set to S_RELEASED. + * * This method will call {@see SeedDMS_Core_DocumentContent::setStatus()} - * which checks if the state has actually changed. This is, why this + * which checks if the status has actually changed. This is, why this * function can be called at any time without harm to the status log. * * @param boolean $ignorecurrentstatus ignore the current status and @@ -2806,8 +2817,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } } - unset($this->_workflow); // force to be reloaded from DB - if ($this->getWorkflow()) $this->setStatus(S_IN_WORKFLOW,$msg,$user); + if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user); elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); else $this->setStatus(S_RELEASED,$msg,$user); From d1a8546f1f560eb0cd3d8a488e74ba01be4f9ef7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 17 Oct 2019 07:18:51 +0200 Subject: [PATCH 201/467] fix comment --- SeedDMS_Core/Core/inc.ClassDocument.php | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 382de8d61..95be4c001 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2817,6 +2817,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } } + /* First check for a running workflow, review, approval. */ if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user); elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); From c06ec0de2efa4abcf739bb833c7aab936f80a487 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 17 Oct 2019 07:40:01 +0200 Subject: [PATCH 202/467] more documentation in SeedDMS_Core_DocumentContent::verifyStatus() --- SeedDMS_Core/Core/inc.ClassDocument.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 95be4c001..f09510b61 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2794,6 +2794,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ unset($this->_workflow); // force to be reloaded from DB $hasworkflow = $this->getWorkflow() ? true : false; + /* $pendingReview will be set when there are still open reviews */ $pendingReview=false; unset($this->_reviewStatus); // force to be reloaded from DB $reviewStatus=$this->getReviewStatus(); @@ -2805,6 +2806,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } } } + + /* $pendingApproval will be set when there are still open approvals */ $pendingApproval=false; unset($this->_approvalStatus); // force to be reloaded from DB $approvalStatus=$this->getApprovalStatus(); @@ -2817,7 +2820,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } } - /* First check for a running workflow, review, approval. */ + /* First check for a running workflow or open reviews or approvals. */ if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user); elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); From 95aede5c2b9c2ad101662a4de80b2b97b7ade212 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 07:19:51 +0200 Subject: [PATCH 203/467] =?UTF-8?q?fix=20SeedDMS=5FCore=5FDocumentContent:?= =?UTF-8?q?:verify=D0=85tatus()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the method can now handle revisions with status==-1. Status will not change if status is already S_NEEDS_CORRECTION --- SeedDMS_Core/Core/inc.ClassDocument.php | 44 ++++++++++++++++++++----- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 183e7b872..799d3f243 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -3163,12 +3163,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * If status is draft and there are no approver and no reviewers => set * status to S_RELEASED * The status of a document with the current status S_OBSOLETE, S_REJECTED, - * or S_EXPIRED will not be changed unless the parameter + * S_NEEDS_CORRECTION or S_EXPIRED will not be changed unless the parameter * $ignorecurrentstatus is set to true. * * This method may not be called after a negative approval or review to * recalculated the status, because - * it doesn't take a defeating approval or review into account. It will + * it doesn't take a defeating approval or review into account. This method + * does not set the status to S_REJECTED! It will * just check for a pending workflow, approval or review and set the status * accordingly, e.g. after the list of reviewers or appovers has been * modified. If there is not pending workflow, approval or review the @@ -3192,15 +3193,19 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $st=$this->getStatus(); /* Documents already obsoleted, rejected or expired will not change - * its status anymore, unless explicitly requested. + * its status anymore, unless explicitly requested. Be aware, that + * this method has an unsufficient check for negative reviews and + * approvals. A document in status S_REJECTED may become S_RELEASED + * if there is at least one positive review or approval. */ - if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return; + if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED || $st["status"]==S_NEEDS_CORRECTION)) return; unset($this->_workflow); // force to be reloaded from DB $hasworkflow = $this->getWorkflow() ? true : false; /* $pendingReview will be set when there are still open reviews */ $pendingReview=false; + /* $hasReview will be set if there is at least one positiv review */ $hasReview=false; unset($this->_reviewStatus); // force to be reloaded from DB $reviewStatus=$this->getReviewStatus(); @@ -3217,6 +3222,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ /* $pendingApproval will be set when there are still open approvals */ $pendingApproval=false; + /* $hasApproval will be set if there is at least one positiv review */ $hasApproval=false; unset($this->_approvalStatus); // force to be reloaded from DB $approvalStatus=$this->getApprovalStatus(); @@ -3232,6 +3238,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } $pendingRevision=false; $hasRevision=false; + $needsCorrection=false; unset($this->_revisionStatus); // force to be reloaded from DB $revsisionStatus=$this->getRevisionStatus(); if (is_array($revsisionStatus) && count($revsisionStatus)>0) { @@ -3241,6 +3248,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ break; } elseif($a["status"]==1){ $hasRevision=true; + } elseif($a["status"]==-1){ + $needsCorrection=true; } } } @@ -3250,16 +3259,33 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user); - /* Finally decide what to do if either no review, approval, revision was - * ever done or if one of them has been done. In the first case it will - * go to the initial status, in the second case, it will be released. + /* This point will only be reached if there is no pending workflow, review, + * approval or revision but the current status is one of S_DRAFT_REV, + * S_DRAFT_APP or S_IN_REVISION. This can happen if formely set reviewers, + * approvers, revisors are completly removed. In case of S_DRAFT_REV and + * S_DRAFT_APP the document will go back into its initial status. If a + * positive review or approval was found the document will be released. + * Be aware that negative reviews or approvals are not taken into account, + * because in that case the document must have been rejected before calling + * this function. FIXME: this is a problem if the parameter $ignorecurrentstatus + * was set, because an already rejected document may be released with just + * one positive review or approval disregarding any negative reviews or + * approvals. + * A document in status S_IN_REVISION will be treated differently. + * It takes negative revisions into account! + * * A document in status S_DRAFT will never go into S_RELEASED and document * already released will never go back at this point into the given * initial status, which can only by S_DRAFT or S_RELEASED */ elseif ($st["status"]!=S_DRAFT && $st["status"]!=S_RELEASED ) { - if($hasReview || $hasApproval || $hasRevision) $this->setStatus(S_RELEASED,$msg,$user); - else $this->setStatus($initialstatus,$msg,$user); + if($st["status"]==S_DRAFT_REV || $st["status"]==S_DRAFT_APP) { + if($hasReview || $hasApproval) $this->setStatus(S_RELEASED,$msg,$user); + else $this->setStatus($initialstatus,$msg,$user); + } elseif($st["status"]==S_IN_REVISION) { + if($needsCorrection) $this->setStatus(S_NEEDS_CORRECTION,$msg,$user); + else $this->setStatus(S_RELEASED,$msg,$user); + } } } /* }}} */ From 7e3f490b57c5006dac938ad4447cddf34fcdd34d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 07:23:20 +0200 Subject: [PATCH 204/467] fix getting view parameter 'onevotereject' --- controllers/class.ReviseDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php index ccee171e5..94f085d6d 100644 --- a/controllers/class.ReviseDocument.php +++ b/controllers/class.ReviseDocument.php @@ -38,7 +38,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common { * if one has rejected it. So in the very end the doc is rejected, but * doc remainѕ in S_IN_REVISION until all have revised the doc */ - $onevotereject = $this->param['onevotereject']; + $onevotereject = $this->params['onevotereject']; /* Get the document id and name before removing the document */ $docname = $document->getName(); From 40ddfd3ea6c7be093294ef224dd07f20daa122f9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 07:24:33 +0200 Subject: [PATCH 205/467] allow to set status S_NEEDS_CORRECTION --- op/op.OverrideContentStatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index 172ab9e0f..2b21e45ca 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -59,7 +59,7 @@ if (!is_object($content)) { } if (!isset($_POST["overrideStatus"]) || !is_numeric($_POST["overrideStatus"]) || - (intval($_POST["overrideStatus"]) != S_RELEASED && intval($_POST["overrideStatus"]) != S_OBSOLETE && intval($_POST["overrideStatus"]) != S_DRAFT)) { + (intval($_POST["overrideStatus"]) != S_RELEASED && intval($_POST["overrideStatus"]) != S_OBSOLETE && intval($_POST["overrideStatus"]) != S_DRAFT && intval($_POST["overrideStatus"]) != S_NEEDS_CORRECTION)) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_status")); } From ffcc53408fbb882ead3352bb4214fde8da76dce3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 07:24:58 +0200 Subject: [PATCH 206/467] fix typo in enableRevisionOnVoteReject (must be 'One') --- inc/inc.ClassSettings.php | 6 +++--- op/op.ReviseDocument.php | 2 +- views/bootstrap/class.Settings.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 908868998..3f3f8c11a 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -193,7 +193,7 @@ class Settings { /* {{{ */ // enable/disable revision workflow var $_enableRevisionWorkflow = true; // enable/disable revision on vote reject - var $_enableRevisionOnVoteReject = true; + var $_enableRevisionOneVoteReject = true; // Allow to set just a reviewer in tradional workflow var $_allowReviewerOnly = true; // Allow to change reviewer/approver after review/approval has started @@ -708,7 +708,7 @@ class Settings { /* {{{ */ $this->_enableReceiptWorkflow = Settings::boolval($tab["enableReceiptWorkflow"]); $this->_enableReceiptReject = Settings::boolval($tab["enableReceiptReject"]); $this->_enableRevisionWorkflow = Settings::boolval($tab["enableRevisionWorkflow"]); - $this->_enableRevisionOnVoteReject = Settings::boolval($tab["enableRevisionOnVoteReject"]); + $this->_enableRevisionOneVoteReject = Settings::boolval($tab["enableRevisionOneVoteReject"]); $this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]); $this->_allowChangeRevAppInProcess = Settings::boolval($tab["allowChangeRevAppInProcess"]); $this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]); @@ -1040,7 +1040,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow); $this->setXMLAttributValue($node, "enableReceiptReject", $this->_enableReceiptReject); $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow); - $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject); + $this->setXMLAttributValue($node, "enableRevisionOneVoteReject", $this->_enableRevisionOneVoteReject); $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly); $this->setXMLAttributValue($node, "allowChangeRevAppInProcess", $this->_allowChangeRevAppInProcess); $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion); diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php index 773da2979..d3fb84d2c 100644 --- a/op/op.ReviseDocument.php +++ b/op/op.ReviseDocument.php @@ -92,7 +92,7 @@ if ($_POST["revisionType"] == "grp") { } $controller->setParam('group', $group); $controller->setParam('comment', $_POST["comment"]); -$controller->setParam('onevotereject', $settings->_enableRevisionOnVoteReject); +$controller->setParam('onevotereject', $settings->_enableRevisionOneVoteReject); if(!$controller->run()) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg())); } diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 3c81166a0..3ccc53e2d 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -433,7 +433,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?> showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?> showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?> -showConfigCheckbox('settings_enableRevisionOnVoteReject', 'enableRevisionOnVoteReject'); ?> +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); ?> From 937f8a5678a52b4fe0acdfb002ed1e8fc68f4e3c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 11:06:42 +0200 Subject: [PATCH 207/467] add hooks preContent, postContent --- views/bootstrap/class.ViewDocument.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 062556b80..06a2d4cff 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -447,6 +447,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $this->contentStart(); $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); + echo $this->callHook('preContent'); if ($document->isLocked()) { $lockingUser = $document->getLockingUser(); $txt = $this->callHook('documentIsLocked', $document, $lockingUser); @@ -1504,6 +1505,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { callHook('postContent'); $this->contentEnd(); $this->htmlEndPage(); } /* }}} */ From 1144ee4500fa2d83382d8157a495ff92314dde93 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 11:07:52 +0200 Subject: [PATCH 208/467] add entry for 5.1.13 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 40fe3b4ea..b9d21eb00 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,7 +12,7 @@ - do not set mandatory reviewer when document is uploaded and workflow mode is set to 'traditional without review'. - turn off auto complete for date fields -- new hook pageNavigationBar +- new hook pageNavigationBar in bootstrap, preContent, postContent in ViewDocument -------------------------------------------------------------------------------- Changes in version 5.1.12 From a53cd4b0cd036dcf90a77169df6ee3889386d216 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 12:21:40 +0200 Subject: [PATCH 209/467] add method successMsg() --- views/bootstrap/class.Bootstrap.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index ef79b702a..c933ea73d 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1524,6 +1524,12 @@ $(document).ready(function() { echo "\n"; } /* }}} */ + function successMsg($msg) { /* {{{ */ + echo "
      \n"; + echo $msg; + echo "
      \n"; + } /* }}} */ + function ___exitError($pagetitle, $error, $noexit=false, $plain=false) { /* {{{ */ /* This is just a hack to prevent creation of js files in an error From 0205e8a08e9338689a04aef1534a64f9ede308cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 12:55:03 +0200 Subject: [PATCH 210/467] create AccessOperation object --- out/out.AttributeMgr.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php index a455e6199..ef7960d13 100644 --- a/out/out.AttributeMgr.php +++ b/out/out.AttributeMgr.php @@ -27,6 +27,7 @@ require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); @@ -35,6 +36,8 @@ if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + $attrdefs = $dms->getAllAttributeDefinitions(); if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { @@ -44,6 +47,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { } if($view) { + $view->setParam('accessobject', $accessop); $view->setParam('attrdefs', $attrdefs); $view->setParam('selattrdef', $selattrdef); $view->setParam('showtree', showtree()); From b8447b7d390b86c2d73e0fa7dfc6ca6219c68b65 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:16:43 +0200 Subject: [PATCH 211/467] add more hooks (still incomplete) --- doc/README.Hooks | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/doc/README.Hooks b/doc/README.Hooks index 361a8e8c9..91f8de0a5 100644 --- a/doc/README.Hooks +++ b/doc/README.Hooks @@ -59,6 +59,22 @@ AddDocument::preIndexDocument are the document and the indexed document. Returning false will prevent the document from being indexed. +EditDocument::editDocumentAttribute + Called for each custom document attribute + + This hook will be called for each custom attribute to ouput the form entry. + The parameters passed are the document and the attribute definition. + Returning an empty array will prevent the attribute from being show. + Returning an array with two elements will pass those element to the formField + method. A returned string will be output as is. + +EditDocument::addDocumentAttributes + Called after all custom document attributes has been output + + This hook will be called right after the document attributes have been shown. + The return value is either an array with two elements or a string. + The string will be output as is, the array will be passed to the method formField. + UpdateDocument::preUpdateDocument Called before a new document will be updated @@ -70,10 +86,10 @@ UpdateDocument::preUpdateDocument UpdateDocument::updateDocument Called when the document is to be updated - This hook can be used to replace the code for updating a document. In - that case it must return a document content or false. If - the hook returns null, the original code for adding the - document will be executed. + This hook can be used to replace the code for updating a document. In + that case it must return a document content or false. If + the hook returns null, the original code for adding the + document will be executed. UpdateDocument::postUpdateDocument Called after a new document has been updated From dfa2d03cf9f942fb13fbe975747a2989a66d11fd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:18:06 +0200 Subject: [PATCH 212/467] new and modified hooks add hook addDocumentContentAttributes, addDocumentContentAttributes and editDocumentContentAttribute can also return a string --- views/bootstrap/class.EditAttributes.php | 28 ++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php index 1fa26e300..7401be445 100644 --- a/views/bootstrap/class.EditAttributes.php +++ b/views/bootstrap/class.EditAttributes.php @@ -53,18 +53,28 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style { callHook('editDocumentContentAttribute', $version, $attrdef); - if(is_array($arr)) { - if($arr) { - $this->formField($arr[0], $arr[1]); - } - } else { - $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $version->getAttribute($attrdef))); + if($attrdefs) { + foreach($attrdefs as $attrdef) { + $arr = $this->callHook('editDocumentContentAttribute', $version, $attrdef); + if(is_array($arr)) { + if($arr) { + $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; + } else { + $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $version->getAttribute($attrdef))); } } + } + $arrs = $this->callHook('addDocumentContentAttributes', $version); + if(is_array($arrs)) { + foreach($arrs as $arr) { + $this->formField($arr[0], $arr[1]); + } + } elseif(is_string($arr) { + echo $arr; + } $this->formSubmit(" ".getMLText('save')); ?> From 070af52849304fc185ce35790f7cd1ab4f6d9738 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:19:09 +0200 Subject: [PATCH 213/467] add new hook addFolderAttributes, editFolderAttribute may return a string --- views/bootstrap/class.EditFolder.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index 3168a08be..89bb50d4b 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -117,11 +117,21 @@ $(document).ready(function() { if($arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $folder->getAttribute($attrdef))); } } } + $arrs = $this->callHook('addFolderAttributes', $folder); + if(is_array($arrs)) { + foreach($arrs as $arr) { + $this->formField($arr[0], $arr[1]); + } + } elseif(is_string($arr) { + echo $arr; + } $this->formSubmit(" ".getMLText('save')); ?> From 0208d544094910988d80d944e4eb48693a9e7fb1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:19:51 +0200 Subject: [PATCH 214/467] fix parameter for addDocumentAttributes, editDocumentAttributes may return a string --- views/bootstrap/class.EditDocument.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index 8e1ef93ae..c3fbbd1af 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -162,16 +162,20 @@ $(document).ready( function() { if($arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef))); } } } - $arrs = $this->callHook('addDocumentAttributes', $folder); + $arrs = $this->callHook('addDocumentAttributes', $document); if(is_array($arrs)) { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; } $this->formSubmit(" ".getMLText('save')); ?> From da5fed35915e56b0adeb2f5524a440206926e9c4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:27:38 +0200 Subject: [PATCH 215/467] fix syntax error --- views/bootstrap/class.EditAttributes.php | 4 ++-- views/bootstrap/class.EditDocument.php | 4 ++-- views/bootstrap/class.EditFolder.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php index 7401be445..ca64c9b98 100644 --- a/views/bootstrap/class.EditAttributes.php +++ b/views/bootstrap/class.EditAttributes.php @@ -60,7 +60,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style { if($arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $version->getAttribute($attrdef))); @@ -72,7 +72,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } $this->formSubmit(" ".getMLText('save')); diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index c3fbbd1af..937245c4b 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -162,7 +162,7 @@ $(document).ready( function() { if($arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef))); @@ -174,7 +174,7 @@ $(document).ready( function() { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } $this->formSubmit(" ".getMLText('save')); diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index 89bb50d4b..e7bc756df 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -117,7 +117,7 @@ $(document).ready(function() { if($arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $folder->getAttribute($attrdef))); @@ -129,7 +129,7 @@ $(document).ready(function() { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } $this->formSubmit(" ".getMLText('save')); From 8c73f36151d9ce434343a3cfa0a84e5b8ba7488f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 09:17:49 +0200 Subject: [PATCH 216/467] show[Document|Folder]Attribute may return a string --- views/bootstrap/class.ViewDocument.php | 2 ++ views/bootstrap/class.ViewFolder.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 06a2d4cff..ffb59411b 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -314,6 +314,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { echo "".$arr[0].":"; echo "".$arr[1].""; echo ""; + } elseif(is_string($arr)) { + echo $arr; } else { $this->printAttribute($attribute); } diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 1e57d85c4..b45acfff2 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -262,6 +262,8 @@ $('body').on('click', '.order-btn', function(ev) { echo "".$arr[0].":"; echo "".$arr[1].":"; echo ""; + } elseif(is_string($arr)) { + echo $arr; } else { $attrdef = $attribute->getAttributeDefinition(); ?> From e9b896ecf10e3296dbc7bc2669916cbec9e01c38 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 21 Oct 2019 09:32:07 +0200 Subject: [PATCH 217/467] fix errors related to new onepage mode --- out/out.AttributeMgr.php | 1 + out/out.Calendar.php | 5 +++++ out/out.Search.php | 4 ++++ out/out.Timeline.php | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php index ef7960d13..445a69d60 100644 --- a/out/out.AttributeMgr.php +++ b/out/out.AttributeMgr.php @@ -48,6 +48,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { if($view) { $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('attrdefs', $attrdefs); $view->setParam('selattrdef', $selattrdef); $view->setParam('showtree', showtree()); diff --git a/out/out.Calendar.php b/out/out.Calendar.php index 2622b4958..e8f1ad8e0 100644 --- a/out/out.Calendar.php +++ b/out/out.Calendar.php @@ -26,6 +26,7 @@ require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); @@ -44,6 +45,8 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume } else $document = null; +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + $calendar = new SeedDMS_Calendar($dms->getDB(), $user); if(isset($_GET['eventid']) && $_GET['eventid'] && is_numeric($_GET['eventid'])) { @@ -62,6 +65,8 @@ if(isset($_GET['eventtype']) && $_GET['eventtype']) { $eventtype = 'regular'; if($view) { + $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('calendar', $calendar); $view->setParam('start', $start); $view->setParam('end', $end); diff --git a/out/out.Search.php b/out/out.Search.php index 1dac3b46a..1a47098bf 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -58,6 +58,8 @@ if (isset($_GET["navBar"])) { */ } +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) { // Search in Fulltext {{{ if (isset($_GET["query"]) && is_string($_GET["query"])) { @@ -435,6 +437,8 @@ if($settings->_showSingleSearchHit && count($entries) == 1) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'query'=>$query, 'searchhits'=>$entries, 'totalpages'=>$totalPages, 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'cachedir'=>$settings->_cacheDir)); if($view) { + $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('showtree', showtree()); $view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount); $view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount); diff --git a/out/out.Timeline.php b/out/out.Timeline.php index e124ab13b..0bbbca5eb 100644 --- a/out/out.Timeline.php +++ b/out/out.Timeline.php @@ -26,6 +26,7 @@ require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); @@ -40,6 +41,8 @@ if(isset($_GET['skip'])) else $skip = array(); +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + $document = null; $content = null; if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['documentid'])) { @@ -53,6 +56,8 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume if($view) { $view->setParam('dms', $dms); $view->setParam('user', $user); + $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('showtree', showtree()); $view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : ''); $view->setParam('todate', isset($_GET['todate']) ? $_GET['todate'] : ''); From badf336542fa8c9b0f3d08dd882b6f3481e6dd1c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 22 Oct 2019 06:45:23 +0200 Subject: [PATCH 218/467] translation updates, major rework of italian --- languages/ar_EG/lang.inc | 3 + languages/bg_BG/lang.inc | 7 +- languages/ca_ES/lang.inc | 3 + languages/cs_CZ/lang.inc | 11 +- languages/de_DE/lang.inc | 9 +- languages/el_GR/lang.inc | 3 + languages/en_GB/lang.inc | 13 +- languages/es_ES/lang.inc | 15 +- languages/fr_FR/lang.inc | 11 +- languages/hr_HR/lang.inc | 7 +- languages/hu_HU/lang.inc | 7 +- languages/it_IT/lang.inc | 813 ++++++++++++++++++++------------------- languages/ko_KR/lang.inc | 3 + languages/lo_LA/lang.inc | 3 + languages/nl_NL/lang.inc | 7 +- languages/pl_PL/lang.inc | 7 +- languages/pt_BR/lang.inc | 11 +- languages/ro_RO/lang.inc | 7 +- languages/ru_RU/lang.inc | 9 +- languages/sk_SK/lang.inc | 9 +- languages/sv_SE/lang.inc | 7 +- languages/tr_TR/lang.inc | 7 +- languages/uk_UA/lang.inc | 7 +- languages/zh_CN/lang.inc | 7 +- languages/zh_TW/lang.inc | 7 +- 25 files changed, 545 insertions(+), 448 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 7087609a4..f0919a9e9 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -822,6 +822,7 @@ URL: [url]', 'no_action' => 'لايوجد اجراء مطلوب', 'no_approval_needed' => 'لايوجد موافقات منتظره', 'no_attached_files' => 'لا يوجد مرفقات', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'لايوجد كلمات بحثية متاحة', 'no_docs_checked_out' => '', @@ -1276,6 +1277,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index a4e24c16e..7cfe1f6ca 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (861) +// Translators: Admin (862) $text = array( '2_factor_auth' => '', @@ -727,6 +727,7 @@ $text = array( 'no_action' => 'Действие не е нужно', 'no_approval_needed' => 'Утвърждение не е нужно', 'no_attached_files' => 'Няма прикрачени файлове', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'Няма ключови думи', 'no_docs_checked_out' => '', @@ -823,7 +824,7 @@ $text = array( 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Последно Качени', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1139,6 +1140,8 @@ $text = array( 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index c7d318204..0c8622a4b 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -732,6 +732,7 @@ URL: [url]', 'no_action' => 'No és necessària cap acció', 'no_approval_needed' => 'No hi ha aprovacions pendents.', 'no_attached_files' => 'No hi ha fitxers adjunts', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'No hi ha mots clau disponibles', 'no_docs_checked_out' => '', @@ -1144,6 +1145,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index f04091398..87cb4ae30 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1525), kreml (579) +// Translators: Admin (1527), kreml (579) $text = array( '2_factor_auth' => 'dvoufaktorové ověření', @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'Nic se nevykoná', 'no_approval_needed' => 'Nic nečeká na schválení.', 'no_attached_files' => 'Žádné přiložené soubory', +'no_backup_dir' => '', 'no_current_version' => 'Používáte starou verzi SeedDMS. Nejnovější dostupná verze je [latestversion].', 'no_default_keywords' => 'Nejsou dostupná žádná klíčová slova.', 'no_docs_checked_out' => 'Nebyly odbaveny žádné dokumenty', @@ -977,7 +978,7 @@ URL: [url]', 'receipt_status' => 'Status', 'receipt_summary' => 'Souhrn přijetí', 'receipt_update_failed' => 'Potvrzení že přijetí se nezdařilo', -'recent_uploads' => '', +'recent_uploads' => 'Naposledy nahráno', 'reception' => 'Přijetí', 'reception_acknowleged' => 'Přijetí potvrzeno', 'reception_noaction' => 'Žádná akce', @@ -1355,8 +1356,10 @@ Jméno: [username] 'settings_enableReceiptWorkflow_desc' => 'Povolte, pro spuštění workflow při potvrzení příjmu dokumentu.', 'settings_enableRecursiveCount' => 'Povolit rekurzivní počítání dokumentů / složek', 'settings_enableRecursiveCount_desc' => 'Při zapnutí je počet dokumentů a složek v zobrazení složek určen počítáním všech objektů při rekurzivním zpracování složek a počítáním těch dokumentů a složek, ke kterým má uživatel přístup.', -'settings_enableRevisionOnVoteReject' => 'Odmítnutí jedním revizorem', -'settings_enableRevisionOnVoteReject_desc' => 'Pokud je nastaveno, tak dokument bude odmítnut, pokud jen jeden revizor odmítne dokument.', +'settings_enableRevisionOneVoteReject' => 'Odmítnutí jedním revizorem', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Povolit revizi dokumentů', 'settings_enableRevisionWorkflow_desc' => 'Povolit, aby bylo možné spustit workflow pro revidování dokumentu po uplynutí dané doby.', 'settings_enableSelfReceipt' => 'Povolit příjem dokumentů pro přihlášeného uživatele', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 395deb3e1..21dcce1ca 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2695), dgrutsch (22) +// Translators: Admin (2697), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -858,6 +858,7 @@ URL: [url]', 'no_action' => 'Keine Aktion erforderlich.', 'no_approval_needed' => 'Keine offenen Freigaben.', 'no_attached_files' => 'Keine angehängten Dokumente', +'no_backup_dir' => 'Das Backup-Verzeichnis ist nicht gesetzt', 'no_current_version' => 'Sie verwenden eine ältere Version als die zur Zeit verfügbare Version [latestversion].', 'no_default_keywords' => 'Keine Vorlagen vorhanden', 'no_docs_checked_out' => 'Keine Dokumente ausgecheckt', @@ -1365,8 +1366,10 @@ Name: [username] 'settings_enableReceiptWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten', 'settings_enableRecursiveCount' => 'Rekursive Dokumenten-/Ordner-Zählung', 'settings_enableRecursiveCount_desc' => 'Wenn diese Option eingeschaltet ist, wird die Anzahl der Dokumente und Ordner in der Ordner-Ansicht rekursiv, unter Berücksichtigung der Zugriffsrechte ermittelt.', -'settings_enableRevisionOnVoteReject' => 'Ablehnung durch einen Wiederholungsprüfer', -'settings_enableRevisionOnVoteReject_desc' => 'Diese Einstellung setzen, wenn die Ablehnung einer Wiederholungsprüfung zur Ablehnung des Dokuments führen soll und nicht den Status \'Korrektur erforderlich\' setzt.', +'settings_enableRevisionOneVoteReject' => 'Ablehnung durch einen Wiederholungsprüfer', +'settings_enableRevisionOneVoteReject_desc' => 'Diese Einstellung setzen, wenn die Ablehnung einer Wiederholungsprüfung durch einen einzelnen Prüfer den Status \'Korrektur erforderlich\' setzt und nicht erst alle Prüfungen abgewartet werden, bevor ein Statuswechsel vollzogen wird.', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Ermögliche Wiederholungsprüfung von Dokumenten', 'settings_enableRevisionWorkflow_desc' => 'Anwählen, um den Workflow der Wiederholungsprüfung von Dokumenten nach einer einstellbaren Zeit zu ermöglichen.', 'settings_enableSelfReceipt' => 'Erlaube Empfangsbestätigung durch angemeldeten Benutzer', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 126ec6c4d..c72b6c47e 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -738,6 +738,7 @@ URL: [url]', 'no_action' => '', 'no_approval_needed' => '', 'no_attached_files' => '', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => '', 'no_docs_checked_out' => '', @@ -1150,6 +1151,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 1e513287d..c2c459f38 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1787), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1791), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -421,7 +421,7 @@ New owner: [newuser] Parent folder: [folder_path] User: [username] URL: [url]', -'document_transfered_email_subject' => '[sitename]: [name] - Transfer Dokument', +'document_transfered_email_subject' => '[sitename]: [name] - Transfer Document', 'document_updated_email' => 'Document updated', 'document_updated_email_body' => 'Document updated Document: [name] @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'No action required', 'no_approval_needed' => 'No approval pending.', 'no_attached_files' => 'No attached files', +'no_backup_dir' => 'Backup directory is not set.', 'no_current_version' => 'You are running an old version of SeedDMS. The latest available version is [latestversion].', 'no_default_keywords' => 'No keywords available', 'no_docs_checked_out' => 'No documents checked out', @@ -1360,8 +1361,10 @@ Name: [username] 'settings_enableReceiptWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableRecursiveCount' => 'Enable recursive document/folder count', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', -'settings_enableRevisionOnVoteReject' => 'Reject by one revisor', -'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be rejected if one revisor rejects the document.', +'settings_enableRevisionOneVoteReject' => 'Reject by one revisor', +'settings_enableRevisionOneVoteReject_desc' => 'If enabled, the document status will be set to \'needs correction\' once the first revisor rejects the document. If disabled, the document status will not change until all revisors have finished their revision.', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Enable revision of documents', 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.', 'settings_enableSelfReceipt' => 'Allow reception of documents for logged in user', @@ -1620,7 +1623,7 @@ Name: [username] 'splash_error_rm_download_link' => 'Error when removing download link', 'splash_error_send_download_link' => 'Error while sending download link', 'splash_extension_getlist' => 'Updated list of extensions from repository', -'splash_extension_import' => 'Extensition installed', +'splash_extension_import' => 'Extension installed', 'splash_extension_refresh' => 'Refreshed list of extensions', 'splash_extension_upload' => 'Extension installed', 'splash_folder_edited' => 'Save folder changes', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 7d2368c00..bc2d627d9 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (1118), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (1124), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', @@ -829,6 +829,7 @@ URL: [url]', 'no_action' => 'No es necesaria ninguna acción', 'no_approval_needed' => 'No hay aprobaciones pendientes.', 'no_attached_files' => 'No hay ficheros adjuntos', +'no_backup_dir' => '', 'no_current_version' => 'Está utilizando una versión desactualizada de este producto. La última versión disponible es [latestversion].', 'no_default_keywords' => 'No hay palabras clave disponibles', 'no_docs_checked_out' => '', @@ -939,7 +940,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Subidas recientes', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1249,8 +1250,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Habilite/Deshabilite el área de drop en la pagina \'\'Ver folder\' para subir archivos por Drag&Drop', 'settings_enableDuplicateDocNames' => 'Permite tener nombres de documento duplicados', 'settings_enableDuplicateDocNames_desc' => 'Permite tener un nombre de documento duplicado en una carpeta.', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Permitir nombres de subcarpetas duplicados', +'settings_enableDuplicateSubFolderNames_desc' => 'Permite tener nombres duplicados de subcarpetas dentro de una carpeta', 'settings_enableEmail' => 'Habilitar E-mail', 'settings_enableEmail_desc' => 'Habilitar/Deshabilitar notificación automática por correo electrónico', 'settings_enableFilterReceipt' => '', @@ -1291,6 +1292,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Habilitar cuenta de documento/carpeta recursivo', 'settings_enableRecursiveCount_desc' => 'Si cambia a activado, el número de documentos y carpetas en la carpeta será determinado por la cuenta de todos los objetos recursivos procesados de la carpeta y una vez contados el usuarios tendrá permiso para acceder.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', @@ -1519,8 +1522,8 @@ URL: [url]', 'sign_out_user' => 'Desconectar usuario', 'sk_SK' => 'Slovaco', 'sort_by_date' => 'Ordenar por Fecha', -'sort_by_name' => 'Ordenar por Nombre', -'sort_by_sequence' => 'Ordenar por Secuencia', +'sort_by_name' => 'Ordenar por nombre', +'sort_by_sequence' => 'Ordenar por secuencia', 'space_used_on_data_folder' => 'Espacio usado en la carpeta de datos', 'splash_added_to_clipboard' => 'Agregado al portapapeles', 'splash_add_access' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 70f818ab9..9cb33d667 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (755) +// Translators: Admin (1093), jeromerobert (50), lonnnew (9), Oudiceval (755) $text = array( '2_factor_auth' => 'Authentification forte', @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'Aucune action n\'est nécessaire', 'no_approval_needed' => 'Aucune approbation en attente', 'no_attached_files' => 'Aucun fichier attaché', +'no_backup_dir' => '', 'no_current_version' => 'Vous utilisez une vieille version de SeedDMS. La dernière version disponible est la [latestversion].', 'no_default_keywords' => 'Aucun mot-clé disponible', 'no_docs_checked_out' => '', @@ -979,7 +980,7 @@ URL : [url]', 'receipt_status' => 'Statut', 'receipt_summary' => 'Vue d’ensemble réception', 'receipt_update_failed' => 'La confirmation de réception a échoué', -'recent_uploads' => '', +'recent_uploads' => 'Téléchargements récents', 'reception' => 'Réception', 'reception_acknowleged' => 'Réception confirmée', 'reception_noaction' => 'Aucune action', @@ -1344,8 +1345,10 @@ Nom : [username] 'settings_enableReceiptWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.', 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers', 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.', -'settings_enableRevisionOnVoteReject' => 'Rejet par un réviseur', -'settings_enableRevisionOnVoteReject_desc' => 'Si activé, le document sera rejeté si un réviseur rejette le document.', +'settings_enableRevisionOneVoteReject' => 'Rejet par un réviseur', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Activer la révision des documents', 'settings_enableRevisionWorkflow_desc' => 'Activer afin de pouvoir lancer un flux de travail pour réviser un document après une période donnée.', 'settings_enableSelfReceipt' => '', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 125a66c62..14b61726a 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1222), marbanas (16) +// Translators: Admin (1223), marbanas (16) $text = array( '2_factor_auth' => '', @@ -833,6 +833,7 @@ Internet poveznica: [url]', 'no_action' => 'Nema zahtjevane radnje', 'no_approval_needed' => 'Nema odobrenja na čekanju.', 'no_attached_files' => 'Nema priloženih datoteka', +'no_backup_dir' => '', 'no_current_version' => 'Koristite na staru verziju ProsperaDMS-a. Najnovija dostupna verzija je[latestversion].', 'no_default_keywords' => 'Nema dostupnih ključnih riječi', 'no_docs_checked_out' => 'Niti jedan dokument nije odjavljen', @@ -943,7 +944,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'receipt_status' => '', 'receipt_summary' => 'Sažetak prijema', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Poslijedni Prenosi', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1312,6 +1313,8 @@ Internet poveznica: [url]', 'settings_enableReceiptWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.', 'settings_enableRecursiveCount' => 'Omogući rekurzivno brojanje dokumenta/mape', 'settings_enableRecursiveCount_desc' => 'Ako je uključeno, broj dokumenata i mapa u pregledu mape će biti određen brojanjem svih objekata rekurzivnom obradom mapa i brojanjem tih dokumenata i mapa kojima je korisniku omogućen pristup.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Omogućavanje revizije dokumenata', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 2f080ed58..6e68cf456 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (633), ribaz (1036) +// Translators: Admin (634), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -829,6 +829,7 @@ URL: [url]', 'no_action' => 'Nincs teendő', 'no_approval_needed' => 'Nincs folyamatban lévő jóváhagyás.', 'no_attached_files' => 'Nincsenek csatolt állományok', +'no_backup_dir' => '', 'no_current_version' => 'Ön a SeedDMS régebbi változatát futtatja. A legutolsó elérhető verzió [latestversion].', 'no_default_keywords' => 'Nincsenek elérhető kulcsszavak', 'no_docs_checked_out' => '', @@ -939,7 +940,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Legutóbbi feltöltések', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1290,6 +1291,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Engedélyezi a rekurzív dokumentum/mappa számot', 'settings_enableRecursiveCount_desc' => 'Ha be van kapcsolva a mappa nézetben a dokumentumok és mappák száma minden objektum rekurzív feldolgozásával kerül meghatározásra és a dokumentumok és mappák száma a felhasználó számára engedélyezett.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 164cc2663..f4674863b 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,11 +19,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1628), rickr (144), s.pnt (26) +// Translators: Admin (2014), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', -'2_factor_auth_info' => 'Questo sistema usa autenticazione a due fattori. Sarà necessario il “Google Authenticator” sul tuo telephono cellulare. Qui potete vedere due codici QR. Quello di destra è il tuo segreto. è sulla sinistra chè un nuovo segreto. Se si imposta un nuovo segreto per assicurarsi si deve scansione con “Google Authenticator” di nouvo.', +'2_factor_auth_info' => 'Questo sistema usa autenticazione a due fattori. Sarà necessario il “Google Authenticator” sul tuo telephono cellulare. Qui potete vedere due codici QR. Quello di destra è il tuo segreto. è sulla sinistra chè un nuovo segreto. Se si imposta un nuovo segreto per assicurarsi si deve scansione con “Google Authenticator” di nuovo.', '2_fact_auth_secret' => 'Segreto', 'accept' => 'Accetta', 'access_control' => 'Il controllo degli accessi', @@ -50,53 +50,53 @@ URL: [url]', 'action_is_complete' => 'Completata', 'action_is_not_complete' => 'Non completata', 'action_reject' => 'Rifiuta', -'action_review' => 'Rivedi', -'action_revise' => 'Revisiona', +'action_review' => 'Revisiona', +'action_revise' => 'Riesamina', 'add' => 'Aggiungi', 'add_approval' => 'Invio approvazione', 'add_attrdefgroup' => 'Aggiungi nuovo gruppo attributo', 'add_document' => 'Aggiungi documento', 'add_document_link' => 'Aggiungi collegamento', 'add_document_notify' => 'Notifica a', -'add_doc_reviewer_approver_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato assegnato un revisore o un approvatore.', -'add_doc_workflow_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato istituito un flusso di lavoro.', +'add_doc_reviewer_approver_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come pubblicati se non è stato assegnato un revisore o un approvatore.', +'add_doc_workflow_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come pubblicati se non è stato istituito un flusso di lavoro.', 'add_event' => 'Aggiungi un evento', 'add_group' => 'Aggiungi un nuovo gruppo', 'add_member' => 'Aggiungi un membro', 'add_multiple_documents' => 'Aggiungi documenti multipli', 'add_multiple_files' => 'Aggiungi documenti multipli (il nome del file verrà usato come nome del documento)', -'add_receipt' => 'invio ricevuta', -'add_review' => 'Invio revisione', -'add_revision' => 'Aggiungi approvazione', +'add_receipt' => 'Conferma ricezione', +'add_review' => 'Aggiungi revisione', +'add_revision' => 'Aggiungi riesame', 'add_role' => 'Aggiungi nuova responsabilità', 'add_subfolder' => 'Aggiungi sottocartella', -'add_task' => '', +'add_task' => 'Aggiungi attività', 'add_to_clipboard' => 'Aggiungi agli appunti', 'add_to_transmittal' => 'Aggiungi alla trasmissione', 'add_transmittal' => 'Aggiungi trasmissione', 'add_user' => 'Aggiungi un nuovo utente', 'add_user_to_group' => 'Aggiungi un utente al gruppo', -'add_workflow' => 'Crea un flusso di lavoro', -'add_workflow_action' => 'Nuova azione del flusso di lavoro', -'add_workflow_state' => 'Nuovo stato del flusso di lavoro', +'add_workflow' => 'Aggiungi nuovo flusso di lavoro', +'add_workflow_action' => 'Aggiungi nuova azione flusso di lavoro', +'add_workflow_state' => 'Aggiungi nuovo stato flusso di lavoro', 'admin' => 'Amministratore', -'admin_tools' => 'Strumenti di Amministrazione', +'admin_tools' => 'Strumenti di amministrazione', 'all' => 'Tutto', -'all_categories' => 'Tutte le Categorie', -'all_documents' => 'Tutti i Documenti', -'all_pages' => 'Tutte le Pagine', -'all_users' => 'Tutti gli Utenti', +'all_categories' => 'Tutte le categorie', +'all_documents' => 'Tutti i documenti', +'all_pages' => 'Tutte le pagine', +'all_users' => 'Tutti gli utenti', 'already_subscribed' => 'L\'oggetto è già stato sottoscritto', 'and' => 'e', 'apply' => 'Applica', -'approvals_accepted' => '', -'approvals_and_reviews_accepted' => '', -'approvals_and_reviews_not_touched' => '', -'approvals_and_reviews_rejected' => '', -'approvals_not_touched' => '', -'approvals_rejected' => '', -'approvals_without_group' => '', -'approvals_without_user' => '', +'approvals_accepted' => '[no_approvals] approvazioni già accettate', +'approvals_and_reviews_accepted' => '[no_approvals] approvazioni e [no_reviews] revisioni già accettate', +'approvals_and_reviews_not_touched' => '[no_approvals] approvazioni e [no_reviews] revisioni non gestite', +'approvals_and_reviews_rejected' => '[no_approvals] approvazioni e [no_reviews] revisioni già rifiutate', +'approvals_not_touched' => '[no_approvals] approvazioni non gestite', +'approvals_rejected' => '[no_approvals] approvazioni già rifiutate', +'approvals_without_group' => 'Approvazioni senza gruppo', +'approvals_without_user' => 'Approvazioni senza utente', 'approval_deletion_email' => 'Richiesta di approvazione cancellata', 'approval_deletion_email_body' => 'Richiesta di approvazione cancellata. Documento: [name] @@ -133,15 +133,15 @@ URL: [url]', 'approver_already_assigned' => 'Utente già approvatore', 'approver_already_removed' => 'Utente già rimosso dal processo di approvazione o ha già approvato', 'april' => 'Aprile', -'archive' => '', -'archive_creation' => 'Creazione archivi', +'archive' => 'Archivio', +'archive_creation' => 'Creazione archivio', 'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server. Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.', 'ar_EG' => 'Arabo', -'assign_approvers' => 'Assegna Approvatori', -'assign_recipients' => '', -'assign_reviewers' => 'Assegna Revisori', +'assign_approvers' => 'Assegna approvatori', +'assign_recipients' => 'Assegna destinatari', +'assign_reviewers' => 'Assegna revisori', 'assign_user_property_to' => 'Assegna le proprietà dell\'utente a', -'assumed_released' => 'Rilascio acquisito', +'assumed_released' => 'Pubblicazione acquisita', 'attrdefgroup_management' => 'Gestire gruppi di attributi', 'attrdefgrp_show_detail' => 'Dettagli', 'attrdefgrp_show_list' => 'Lista', @@ -149,16 +149,16 @@ URL: [url]', 'attrdefgrp_show_searchlist' => 'risultati trovati', 'attrdef_exists' => 'Definizione di Attributo già esistente', 'attrdef_info' => 'Informazione', -'attrdef_in_use' => 'Definizione di Attributo ancora in uso', -'attrdef_management' => 'Gestione Attributi', -'attrdef_maxvalues' => 'Numero di valori Max.', -'attrdef_minvalues' => 'Numero di valori Min.', +'attrdef_in_use' => 'Definizione di attributo ancora in uso', +'attrdef_management' => 'Gestione attributi', +'attrdef_maxvalues' => 'Numero di valori max.', +'attrdef_minvalues' => 'Numero di valori min.', 'attrdef_min_greater_max' => 'Il numero minimo di valori è maggiore del massimo', 'attrdef_multiple' => 'Permetti valori multipli', 'attrdef_multiple_needs_valueset' => 'Attributo definizione con i molteplici valori esigenze un valore impostato.', -'attrdef_must_be_multiple' => 'Gli Attributi devono avere più di un valore, ma non sono permessi valori multipli', +'attrdef_must_be_multiple' => 'Gli attributi devono avere più di un valore, ma non sono permessi valori multipli', 'attrdef_name' => 'Nome', -'attrdef_noname' => 'Nella definizione dell\'Attributo manca il nome', +'attrdef_noname' => 'Nella definizione dell\'attributo manca il nome', 'attrdef_objtype' => 'Tipo di oggetto', 'attrdef_regex' => 'Espressione regolare', 'attrdef_type' => 'Tipo', @@ -171,35 +171,34 @@ URL: [url]', 'attrdef_type_url' => 'URL', 'attrdef_valueset' => 'Set di valori', 'attributes' => 'Attributi', -'attribute_changed_email_body' => 'Attributo modificato -Documento: [name] -Versione: [version] -Attributo: [attribute_name] -Old value: [attribute_old_value] -New value: [attribute_new_value] -Cartella: [folder_path] -Utente: [username] +'attribute_changed_email_body' => 'Attributo modificato +Documento: [name] +Versione: [version] +Attributo: [attribute_name] +Old value: [attribute_old_value] +New value: [attribute_new_value] +Cartella: [folder_path] +Utente: [username] URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato', 'attribute_count' => 'Numero di utilizzi', -'attribute_value' => 'Valore dell\'Attributo', -'attribute_value_not_in_valueset' => '', -'attr_malformed_boolean' => '', -'attr_malformed_date' => '', -'attr_malformed_email' => 'Il valore di \'[value]\' dell, - => attributo \'[attrname]\' non é un URL valido.', -'attr_malformed_float' => '', -'attr_malformed_int' => '', -'attr_malformed_url' => 'Il valore dell\'attributo \'[valore]\' di attributo \'[attrname]\' non è un URL valido.', +'attribute_value' => 'Valore dell\'attributo', +'attribute_value_not_in_valueset' => 'Valore non presente nel gruppo di valori', +'attr_malformed_boolean' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un valore booleano valido.', +'attr_malformed_date' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è una data valida.', +'attr_malformed_email' => 'Il valore \'[value]\' dell\'attributo \'[attrname]\' non é un URL valido.', +'attr_malformed_float' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un numero in virgola mobile valido.', +'attr_malformed_int' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un intero valido.', +'attr_malformed_url' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un URL valido.', 'attr_max_values' => 'Il numero massimo dei valori richiesti per l\'Attributo [attrname] è superato.', 'attr_min_values' => 'Il numero minimo di valori richiesti per l\'Attributo [attrname] non è raggiunto.', -'attr_not_in_valueset' => '', -'attr_no_regex_match' => 'Il valore dell\'Attributo non è conforme ad un\'espressione regolare.', -'attr_validation_error' => '', +'attr_not_in_valueset' => 'Il valore \'[value]\' per l\'attributo \'[attrname]\' non è contenuto nel gruppo di valori.', +'attr_no_regex_match' => 'Il valore \'[value]\' dell\'attributo \'[attrname]\' non è conforme ad un\'espressione regolare.', +'attr_validation_error' => 'Il valore \'[value]\' dell\'attributo \'[attrname]\' non è valido', 'at_least_n_users_of_group' => 'Minimo [number_of_users] utenti del gruppo [group]', 'august' => 'Agosto', 'authentication' => 'Autenticazione', -'authentication_failed' => '', +'authentication_failed' => 'Autenticazione fallita', 'author' => 'Autore', 'automatic_status_update' => 'Modifica automatica dello stato', 'back' => 'Ritorna', @@ -211,7 +210,7 @@ URL: [url]', 'bg_BG' => 'Bulgaro', 'browse' => 'Scegli file', 'calendar' => 'Calendario', -'calendar_week' => 'Calendario Settimanale', +'calendar_week' => 'Calendario settimanale', 'cancel' => 'Annulla', 'cannot_assign_invalid_state' => 'Non è possibile modificare le assegnazioni di un documento obsoleto o rifiutato', 'cannot_change_final_states' => 'Attenzione: non si può modificare lo stato dei documenti rifiutati, scaduti o in attesa di revisione o approvazione', @@ -230,12 +229,12 @@ URL: [url]', 'category_in_use' => 'Questa categoria è attualmente in uso in alcuni documenti.', 'category_noname' => 'Non è stato attribuito un nome alla categoria.', 'ca_ES' => 'Catalano', -'change_assignments' => 'Modifica le Assegnazioni', +'change_assignments' => 'Modifica le assegnazioni', 'change_password' => 'Cambia la password', 'change_password_message' => 'La password è stata cambiata', 'change_recipients' => 'Cambia lista cartelle', 'change_revisors' => 'Cambia reimmissione', -'change_status' => 'Modifica lo Stato', +'change_status' => 'Modifica lo stato', 'charts' => 'Grafici', 'chart_docsaccumulated_title' => 'Numero di documenti', 'chart_docspercategory_title' => 'Documenti per categoria', @@ -249,7 +248,7 @@ URL: [url]', 'checkedout_file_has_disappeared' => 'File documento approvato non trovato. Impossibile caricare.', 'checkedout_file_is_unchanged' => 'La versione approvata è uguale alla versione corrente. Impossibile caricare.', 'checkin_document' => 'Da approvare', -'checkoutpath_does_not_exist' => '', +'checkoutpath_does_not_exist' => 'Il percorso di approvazione non esiste', 'checkout_document' => 'Approvato', 'checkout_is_disabled' => 'Approvazione dei documenti disabilitata', 'choose_attrdef' => 'Seleziona l\'Attributo', @@ -275,13 +274,13 @@ URL: [url]', 'comment' => 'Commento', 'comment_changed_email' => '', 'comment_for_current_version' => 'Commento per la versione', -'configure_extension' => '', +'configure_extension' => 'Configura estensione', 'confirm_clear_cache' => 'Vuoi davvero cancellare la cache? Questo eliminerà tutte le immagini di anteprima precalcolate.', 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!', 'confirm_move_document' => 'Conferma lo spostamento del documento.', 'confirm_move_folder' => 'Si prega di confermare lo spostamento della cartella.', 'confirm_pwd' => 'Conferma la password', -'confirm_rm_attr_value' => '', +'confirm_rm_attr_value' => 'Vuoi davvero rimuovere il valore dell\'attributo?', 'confirm_rm_backup' => 'Vuoi davvero rimuovere il file "[arkname]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_document' => 'Vuoi veramente eliminare il documento "[documentname]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_dump' => 'Vuoi davvero rimuovere il file "[dumpname]"? Attenzione: questa operazione non può essere annullata.', @@ -294,17 +293,17 @@ URL: [url]', 'confirm_rm_transmittal' => 'Si prega di confermare l\'eliminazione della trasmissione.', 'confirm_rm_transmittalitem' => 'Conferma rimozione', 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.', -'confirm_rm_user_from_processes' => 'Processo', +'confirm_rm_user_from_processes' => 'Vuoi veramente eliminare rimuovere l\'utente "[username]" da tutti i processi?
      Attenzione: questa azione può portare alla pubblicazione di documenti se l\'utente era l\'unico o l\'ultimo responsabile dell\'approvazione.', 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.', -'confirm_transfer_link_document' => '', -'confirm_transfer_objects' => '', +'confirm_transfer_link_document' => 'Seleziona se vuoi collegare il documento trascinato o trasferire il suo contenuto al documento di destinazione come nuova versione. Solo i documenti con una versione possono essere trasferiti. Il documento trascinato verrà rimosso in seguito.', +'confirm_transfer_objects' => 'Vuoi veramente trasferire i documenti, le cartelle, ecc. dell\'utente "[username]"?
      Attenzione: questa operazione non può essere annullata', 'confirm_update_transmittalitem' => 'Conferma aggiornamento', 'content' => 'Contenuto', 'continue' => 'Continua', 'converter_new_cmd' => 'Comando', 'converter_new_mimetype' => 'Nuovo mimetype', 'copied_to_checkout_as' => 'File copiato come \'[filename]\'', -'create_download_link' => '', +'create_download_link' => 'Crea collegamento di scaricamento', 'create_fulltext_index' => 'Crea indice fulltext', 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.', 'creation_date' => 'Data creazione', @@ -328,8 +327,8 @@ URL: [url]', 'de_DE' => 'Tedesco', 'disclaimer' => 'Questa è un\'area riservata. L\'accesso è consentito solo agli utenti autorizzati. Qualunque violazione sarà perseguita a norma delle leggi italiane ed internazionali.', 'discspace' => 'Spazio su disco', -'docs_in_reception_no_access' => '', -'docs_in_revision_no_access' => '', +'docs_in_reception_no_access' => 'Documenti con ricezione senza accesso dai destinatari', +'docs_in_revision_no_access' => 'Documenti in riesame senza accesso dai revisori', 'document' => 'Documento', 'documentcontent' => 'Contenuto documento', 'documents' => 'Documenti', @@ -340,25 +339,25 @@ URL: [url]', 'documents_locked_by_you' => 'Documenti bloccati da te', 'documents_only' => 'Solo documenti', 'documents_to_approve' => 'Documenti in attesa della tua approvazione', -'documents_to_correct' => '', +'documents_to_correct' => 'Documenti in attesa della tua correzione', 'documents_to_process' => 'I documenti che necessitano di trattamento', 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione', 'documents_to_review' => 'Documenti in attesa della tua revisione', -'documents_to_revise' => 'Documenti da revisionare.', -'documents_to_trigger_workflow' => '', -'documents_user_draft' => '', -'documents_user_expiration' => '', -'documents_user_needs_correction' => '', -'documents_user_no_reception' => '', -'documents_user_obsolete' => '', -'documents_user_reception' => '', +'documents_to_revise' => 'Documenti da riesaminare.', +'documents_to_trigger_workflow' => 'Documenti nel flusso di lavoro', +'documents_user_draft' => 'Bozze', +'documents_user_expiration' => 'Scadenza documenti', +'documents_user_needs_correction' => 'Documenti che devono essere corretti', +'documents_user_no_reception' => 'Documenti senza ricezioni', +'documents_user_obsolete' => 'Documenti obsoleti', +'documents_user_reception' => 'Documenti in attesa di ricezione', 'documents_user_rejected' => 'Documenti rifiutati', 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione', -'documents_with_notification' => '', +'documents_with_notification' => 'Documenti con notifica', 'document_already_checkedout' => 'Questo documento è già approvato', 'document_already_locked' => 'Questo documento è già bloccato', -'document_attribute_changed_email_body' => '', -'document_attribute_changed_email_subject' => '', +'document_attribute_changed_email_body' => 'Attributo modificato', +'document_attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato', 'document_comment_changed_email' => 'Commento modificato', 'document_comment_changed_email_body' => 'Commento modificato Documento: [name] @@ -409,8 +408,13 @@ Utente: [username] URL: [url]', 'document_status_changed_email_subject' => '[sitename]: [name] - Modificato lo stato di un documento', 'document_title' => 'Documento \'[documentname]\'', -'document_transfered_email_body' => '', -'document_transfered_email_subject' => '', +'document_transfered_email_body' => 'Documento trasferito ad altro utente +Documento: [name] +Nuovo proprietario: [newuser] +Cartella: [folder_path] +Utente: [username] +URL: [url]', +'document_transfered_email_subject' => '[sitename]: [name] - Documento trasferito', 'document_updated_email' => 'Documento aggiornato', 'document_updated_email_body' => 'Documento aggiornato Documento: [name] @@ -423,10 +427,17 @@ URL: [url]', 'does_not_expire' => 'Nessuna scadenza', 'does_not_inherit_access_msg' => 'Imposta permessi ereditari', 'download' => 'Scarica', -'download_extension' => '', -'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', +'download_extension' => 'Scarica estensione come file zip', +'download_links' => 'Collegamenti di scaricamento', +'download_link_email_body' => 'Fare clic sul collegamento sottostante per scaricare la versione [version] del documento +\'[docname]\'. + +[url] + +Il collegamento The link è ancora valido fino a [valid]. + +[comment]', +'download_link_email_subject' => 'Collegamento di scaricamento', 'do_object_repair' => 'Ripara tutte le cartelle e i documenti.', 'do_object_setchecksum' => 'Imposta il checksum', 'do_object_setfilesize' => 'Imposta la dimensione del file', @@ -438,14 +449,14 @@ URL: [url]', 'dropfolderdir_missing' => 'La vostra cartella di personale non esiste sul server! Si prega di chiedere all\'amministratore di creare per te.', 'dropfolder_file' => 'Scegli file dal server', 'dropfolder_folder' => 'Cartella per il cartella di ricezione', -'dropupload' => 'Caricamento Rapido', +'dropupload' => 'Caricamento rapido', 'drop_files_here' => 'Trascina qui il file', -'dump_creation' => 'Creazione del DB dump', +'dump_creation' => 'Creazione del dump del DB', 'dump_creation_warning' => 'Con questa operazione è possibile creare un file di dump del contenuto del database. Dopo la creazione il file viene salvato nella cartella dati del server.', 'dump_list' => 'List dei dump presenti', 'dump_remove' => 'Cancella il file di dump', 'duplicates' => 'Duplicati', -'duplicate_content' => 'Contenuto Duplicato', +'duplicate_content' => 'Contenuto duplicato', 'edit' => 'Modifica', 'edit_attributes' => 'Modifica gli attributi', 'edit_comment' => 'Modifica il commento', @@ -463,7 +474,7 @@ URL: [url]', 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', 'edit_online' => 'Modifica online', -'edit_task' => '', +'edit_task' => 'Modifica attività', 'edit_transmittal_props' => 'Modifica proprietà trasmissione', 'edit_user' => 'Modifica l\'utente', 'edit_user_details' => 'Modifica i dettagli utente', @@ -476,7 +487,7 @@ URL: [url]', 'email_not_given' => 'Inserisci un indirizzo email valido.', 'empty_attribute_group_list' => 'Nessun gruppo di attributi', 'empty_folder_list' => 'Cartella vuota', -'empty_list' => '', +'empty_list' => 'Nessuna voce', 'empty_notify_list' => 'Nessun record', 'en_GB' => 'Inglese (GB)', 'equal_transition_states' => 'Lo stato iniziale e quello finale sono identici', @@ -484,40 +495,40 @@ URL: [url]', 'error_add_aro' => 'Errore durante l\'accesso aggiungendo richiesta oggetto', 'error_add_permission' => 'Errore durante l\'aggiunta di permesso', 'error_cleared_cache' => 'Errore durante svuotare la cache', -'error_edit_task' => '', -'error_extension_getlist' => '', +'error_edit_task' => 'Modifica attività', +'error_extension_getlist' => 'Errore nel recuperare l\'elenco delle estensioni dal repository', 'error_importfs' => 'Errore durante l\'importazione dal file system', 'error_no_document_selected' => 'Nessun documento selezionato', 'error_no_folder_selected' => 'Nessuna cartella selezionata', 'error_occured' => 'Ooops... Si è verificato un errore', -'error_remove_document' => '', -'error_remove_folder' => '', +'error_remove_document' => 'Errore durante la rimozione del documento', +'error_remove_folder' => 'Errore durante la rimozione della cartella', 'error_remove_permission' => 'Errore durante la rimozione delle autorizzazioni', -'error_rm_workflow' => '', -'error_rm_workflow_action' => '', -'error_rm_workflow_state' => '', +'error_rm_workflow' => 'Errore durante la rimozione del flusso di lavoro', +'error_rm_workflow_action' => 'Errore durante la rimozione dell\'azione del flusso di lavoro', +'error_rm_workflow_state' => 'Errore durante la rimozione dello stato del flusso di lavoro', 'error_toogle_permission' => 'Errore durante la modifica permessi', -'error_transfer_document' => '', -'error_trigger_workflow' => '', -'error_update_document' => '', -'error_uploading_reviewer_only' => '', +'error_transfer_document' => 'Errore durante il trasferimento del documento', +'error_trigger_workflow' => 'Errore durante l\'esecuzione di una transizione del flusso di lavoro', +'error_update_document' => 'Errore durante l\'aggiornamento del documento', +'error_uploading_reviewer_only' => 'Errore durante la creazione del documento. Il documento ha un revisore, ma non un approvatore.', 'es_ES' => 'Spagnolo', 'event_details' => 'Dettagli evento', -'exclude_items' => 'Escludi Elementi', +'exclude_items' => 'Escludi elementi', 'expired' => 'Scaduto', -'expired_at_date' => '', +'expired_at_date' => 'Scadenza il [datetime]', 'expired_documents' => 'Documenti scaduti', 'expires' => 'Scadenza', -'expire_by_date' => 'Scadenza per Data', -'expire_in_1d' => '', -'expire_in_1h' => '', -'expire_in_1m' => '1 Mese', -'expire_in_1w' => '7 Giorni', -'expire_in_1y' => '1 Anno', -'expire_in_2h' => '', -'expire_in_2y' => '2 Anni', -'expire_today' => '', -'expire_tomorrow' => '', +'expire_by_date' => 'Scadenza per data', +'expire_in_1d' => 'Scade in 1 giorno', +'expire_in_1h' => 'Scade in 1 ora', +'expire_in_1m' => 'Scade in 1 mese', +'expire_in_1w' => 'Scade in 7 giorni', +'expire_in_1y' => 'Scade in 1 anno', +'expire_in_2h' => 'Scade in 2 ore', +'expire_in_2y' => 'Scade in 2 anni', +'expire_today' => 'Scade oggi', +'expire_tomorrow' => 'Scade domani', 'expiry_changed_email' => 'Scadenza cambiata', 'expiry_changed_email_body' => 'Data di scadenza cambiata Documento: [name] @@ -526,8 +537,8 @@ Utente: [username] URL: [url]', 'expiry_changed_email_subject' => '[sitename]: [name] - Scadenza cambiata', 'export' => 'Esporta', -'extension_archive' => '', -'extension_changelog' => '', +'extension_archive' => 'Archivio estensioni', +'extension_changelog' => 'Registro delle modifiche delle estensioni', 'extension_loading' => 'Caricamento estensioni...', 'extension_manager' => 'Gestisci le estensioni dei files', 'extension_mgr_installed' => 'Installato', @@ -546,9 +557,9 @@ URL: [url]', 'folder' => 'Cartella', 'folders' => 'Cartelle', 'folders_and_documents_statistic' => 'Visualizzazione generale', -'folders_with_notification' => '', -'folder_attribute_changed_email_body' => '', -'folder_attribute_changed_email_subject' => '', +'folders_with_notification' => 'Cartelle con notifica', +'folder_attribute_changed_email_body' => 'Attributo cartella modificato', +'folder_attribute_changed_email_subject' => 'Attributo cartella modificato', 'folder_comment_changed_email' => 'Commento modificato per la Cartella', 'folder_comment_changed_email_body' => 'Commento modificato per la Cartella Cartella: [name] @@ -591,7 +602,7 @@ URL: [url]', 'fr_FR' => 'Francese', 'fullsearch' => 'Ricerca Fulltext', 'fullsearch_hint' => 'Usa l\'indice fulltext', -'fulltextsearch_disabled' => '', +'fulltextsearch_disabled' => 'Ricerca Fulltext disabilitata', 'fulltext_converters' => 'Indice di conversione documenti', 'fulltext_info' => 'Info indice Fulltext', 'global_attributedefinitiongroups' => 'Attributo gruppi', @@ -612,7 +623,7 @@ URL: [url]', 'group_review_summary' => 'Dettaglio revisioni di gruppo', 'guest_login' => 'Login come Ospite', 'guest_login_disabled' => 'Il login come Ospite è disabilitato.', -'hash' => '', +'hash' => 'Hash', 'help' => 'Aiuto', 'home_folder' => 'Cartella Utente', 'hook_name' => 'Nome del gangio', @@ -624,28 +635,28 @@ URL: [url]', 'id' => 'ID', 'identical_version' => 'La nuova versione è identica a quella attuale.', 'import' => 'Importa', -'importfs' => 'Importa da File System / disco', -'import_extension' => '', +'importfs' => 'Importa da file system/disco', +'import_extension' => 'Importa estensione', 'import_fs' => 'Importa dalla cartella di sistema', -'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno rilasciati immediatamente.', +'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno pubblicati immediatamente.', 'include_content' => 'Includi contenuto', 'include_documents' => 'Includi documenti', 'include_subdirectories' => 'Includi sottocartelle', 'indexing_tasks_in_queue' => 'Operazione di indicizzazione in corso', 'index_converters' => '', -'index_done' => '', -'index_error' => '', +'index_done' => 'Eseguito', +'index_error' => 'Errore di indicizzazione', 'index_folder' => 'Indicizza cartella', -'index_no_content' => '', -'index_pending' => '', +'index_no_content' => 'Non indicizzare contenuti', +'index_pending' => 'Indicizzazione pendente', 'index_waiting' => 'Attendi', 'individuals' => 'Singoli', 'individuals_in_groups' => 'I membri de la gruppo', -'info_recipients_tab_not_released' => '', +'info_recipients_tab_not_released' => 'Non è possibile confermare la ricezione di questa versione del documento, poiché la versione non è stata rilasciata.', 'inherited' => 'ereditato', 'inherits_access_copy_msg' => 'Copia la lista degli accessi ereditati', 'inherits_access_empty_msg' => 'Reimposta una lista di permessi vuota', -'inherits_access_msg' => 'E\' impostato il permesso ereditario.', +'inherits_access_msg' => 'È impostato il permesso ereditario.', 'internal_error' => 'Errore interno', 'internal_error_exit' => 'Errore interno. Impossibile completare la richiesta.', 'invalid_access_mode' => 'Permessi non validi', @@ -654,7 +665,7 @@ URL: [url]', 'invalid_create_date_end' => 'Fine data non valida per la creazione di un intervallo temporale', 'invalid_create_date_start' => 'Inizio data non valida per la creazione di un intervallo temporale', 'invalid_doc_id' => 'ID del documento non valido', -'invalid_dropfolder_folder' => 'cartella non valido nella cartella goccia', +'invalid_dropfolder_folder' => 'cartella non valido nella cartella di pubblicazione', 'invalid_expiration_date_end' => 'Data di fine non è valida per l\'intervallo di data di scadenza.', 'invalid_expiration_date_start' => 'Data di inizio non valida per l\'intervallo di date di scadenza.', 'invalid_file_id' => 'ID del file non valido', @@ -670,25 +681,25 @@ URL: [url]', 'invalid_user_id' => 'ID utente non valido', 'invalid_version' => 'Versione del documento non valida', 'in_folder' => 'nella cartella', -'in_revision' => 'In fase di revisione', -'in_workflow' => 'In fase di lavorazione', -'is_disabled' => 'Account Disabilitato', +'in_revision' => 'In riesame', +'in_workflow' => 'In lavorazione', +'is_disabled' => 'Account disabilitato', 'is_hidden' => 'Nascondi dalla lista utenti', 'it_IT' => 'Italiano', 'january' => 'Gennaio', -'js_form_error' => '', -'js_form_errors' => '', -'js_invalid_email' => '', +'js_form_error' => 'Il modulo contiene ancora # errore.', +'js_form_errors' => 'Il modulo contiene ancora # errori.', +'js_invalid_email' => 'Indirizzo email non valido', 'js_no_approval_group' => 'Si prega di selezionare un gruppo di approvazione', 'js_no_approval_status' => 'Si prega di selezionare lo stato di approvazione', 'js_no_comment' => 'Non ci sono commenti', -'js_no_currentpwd' => '', -'js_no_email' => 'Scrivi il tuo indirizzo di Email', +'js_no_currentpwd' => 'Per favore inserire la propria password attuale', +'js_no_email' => 'Scrivi il tuo indirizzo di email', 'js_no_file' => 'Per favore seleziona un file', 'js_no_keywords' => 'Specifica alcune parole-chiave', 'js_no_login' => 'Per favore digita un ID utente', 'js_no_name' => 'Per favore digita un nome', -'js_no_override_status' => 'E\' necessario selezionare un nuovo [override] stato', +'js_no_override_status' => 'È necessario selezionare un nuovo [override] stato', 'js_no_pwd' => 'La password è necessaria', 'js_no_query' => 'Scrivi una query', 'js_no_review_group' => 'Per favore seleziona un gruppo di revisori', @@ -696,7 +707,7 @@ URL: [url]', 'js_pwd_not_conf' => 'La password inserita e quella di conferma non corrispondono', 'js_select_user' => 'Per favore seleziona un utente', 'js_select_user_or_group' => 'Selezionare almeno un utente o un gruppo', -'js_unequal_passwords' => '', +'js_unequal_passwords' => 'Le password non coincidono', 'july' => 'Luglio', 'june' => 'Giugno', 'keep' => 'Non cambiare', @@ -712,16 +723,16 @@ URL: [url]', 'librarydoc' => 'Documento da cartella', 'linked_documents' => 'Documenti collegati', 'linked_files' => 'Allegati', -'linked_to_current_version' => '', +'linked_to_current_version' => 'Collegato al documento attuale', 'linked_to_document' => 'Collegato al documento', -'linked_to_this_version' => '', +'linked_to_this_version' => 'Collegato a questa versione', 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.', -'link_document' => '', -'link_to_version' => '', +'link_document' => 'Collegamento al documento', +'link_to_version' => 'Collega alla versione', 'list_access_rights' => 'Elenca tutti i diritti di accesso...', -'list_contains_no_access_docs' => '', -'list_hooks' => 'Lista ganci', -'list_tasks' => '', +'list_contains_no_access_docs' => 'L\'elenco contiene più documenti ai quali non si ha accesso e non vengono visualizzati.', +'list_hooks' => 'Elenco hooks', +'list_tasks' => 'Elenco attività', 'local_file' => 'File locale', 'locked_by' => 'Bloccato da', 'lock_document' => 'Blocca', @@ -729,45 +740,45 @@ URL: [url]', 'lock_status' => 'Stato bloccaggio', 'login' => 'Accesso', 'login_disabled_text' => 'Il tuo account è stato disabilitato: troppi login falliti.', -'login_disabled_title' => 'L\'Account è disabilitato', +'login_disabled_title' => 'L\'account è disabilitato', 'login_error_text' => 'Errore nel login. ID utente o password errati.', 'login_error_title' => 'Errore di login', 'login_not_given' => 'Non è stato inserito il nome utente', 'login_ok' => 'Login eseguito', -'login_restrictions_apply' => '', +'login_restrictions_apply' => 'Login fallito a causa di limitazioni', 'logout' => 'Logout', 'log_management' => 'Amministrazione file di log', 'lo_LA' => 'Laotiano', -'malformed_expiration_date' => '', +'malformed_expiration_date' => 'Data di scadenza con formato errato', 'manager' => 'Manager', -'manager_of_group' => 'Tu sei l\'Amministratore di questo gruppo', -'mandatory_approvergroups' => 'Gruppi di Approvatori necessari', -'mandatory_approvergroup_no_access' => 'Il Gruppo di Approvatori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', +'manager_of_group' => 'Tu sei l\'amministratore di questo gruppo', +'mandatory_approvergroups' => 'Gruppi di approvatori necessari', +'mandatory_approvergroup_no_access' => 'Il gruppo di approvatori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', 'mandatory_approvers' => 'Approvatori necessari', -'mandatory_approver_no_access' => 'L\'Approvatore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', -'mandatory_reviewergroups' => 'Gruppi di Revisori necessari', -'mandatory_reviewergroup_no_access' => 'Il Gruppo di Revisori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', +'mandatory_approver_no_access' => 'L\'approvatore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', +'mandatory_reviewergroups' => 'Gruppi di revisori necessari', +'mandatory_reviewergroup_no_access' => 'Il gruppo di revisori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', 'mandatory_reviewers' => 'Revisori necessari', -'mandatory_reviewer_no_access' => 'Il Revisore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', +'mandatory_reviewer_no_access' => 'Il revisore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', 'march' => 'Marzo', 'max_upload_size' => 'Dimensione massima caricabile per ogni file', 'may' => 'Maggio', -'menu_dropfolder' => '', -'menu_upload_from_dropfolder' => '', +'menu_dropfolder' => 'Cartella di pubblicazione', +'menu_upload_from_dropfolder' => 'Importa questo file', 'mimetype' => 'Tipo (MIME)', 'minutes' => 'minuti', 'misc' => 'Varie', 'missing_checksum' => 'Checksum mancante', 'missing_file' => 'File mancante', 'missing_filesize' => 'Dimensione mancante', -'missing_reception' => '', +'missing_reception' => 'Ricezione mancante', 'missing_request_object' => 'Manca oggetto di richiesta', 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti', 'monday' => 'Lunedì', 'monday_abbr' => 'Lun', 'monthly' => 'Mensile', 'month_view' => 'Vista mensile', -'more_objects_loading' => '', +'more_objects_loading' => 'Più oggetti in caricamento...', 'move' => 'Sposta', 'move_clipboard' => 'Sposta appunti', 'move_document' => 'Sposta documento', @@ -776,7 +787,7 @@ URL: [url]', 'my_documents' => 'Documenti personali', 'my_transmittals' => 'Mie trasmissioni', 'name' => 'Nome', -'needs_correction' => '', +'needs_correction' => 'Necessita correzioni', 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.', 'network_drive' => 'Network drive', 'never' => 'Mai', @@ -835,17 +846,18 @@ URL: [url]', 'no_action' => 'Non è richiesto alcun intervento', 'no_approval_needed' => 'Non è richiesta approvazione.', 'no_attached_files' => 'Nessun file allegato', +'no_backup_dir' => '', 'no_current_version' => 'La corrente versione di SeedDMS non è aggiornata. La versione più recente disponibile è la [latestversion].', 'no_default_keywords' => 'Nessuna parola-chiave disponibile', 'no_docs_checked_out' => 'Nessun documento approvato', 'no_docs_locked' => 'Nessun documento bloccato.', -'no_docs_needs_correction' => '', +'no_docs_needs_correction' => 'Nessun documento che necessita di correzioni', 'no_docs_rejected' => 'Nessun documento rifiutato', 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.', 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.', 'no_docs_to_receipt' => 'Nessuna cartella richiesta.', 'no_docs_to_review' => 'Non ci sono documenti che richiedano revisioni.', -'no_docs_to_revise' => 'Non ci sono documenti che richiedano approvazione.', +'no_docs_to_revise' => 'Non ci sono documenti che richiedano riesame.', 'no_email_or_login' => 'Login ed email devono essere digitate', 'no_fulltextindex' => 'Nessun indice fulltext disponibile', 'no_groups' => 'Nessun gruppo', @@ -853,17 +865,17 @@ URL: [url]', 'no_linked_files' => 'Nessun file collegato', 'no_previous_versions' => 'Nessun\'altra versione trovata', 'no_receipt_needed' => 'Rete disco', -'no_review_needed' => 'Nessuna revisione in sospeso.', -'no_revision_needed' => 'Nessuna revisione in corso.', -'no_revision_planed' => 'Nessuna revisione pianificata.', +'no_review_needed' => 'Nessuna revisione in corso.', +'no_revision_needed' => 'Nessun riesame in corso.', +'no_revision_planed' => 'Nessun riesame pianificato.', 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.', 'no_user_image' => 'Nessuna immagine trovata', 'no_version_check' => 'Il controllo per una nuova versione di SeedDMS è fallito! Questo può essere causato da allow_url_fopen settato a 0 nella tua configurazione php.', 'no_version_modification' => 'Nessuna modifica versione', 'no_workflow_available' => 'Nessun flusso di lavoro disponibile', 'objectcheck' => 'Controllo cartelle o documenti', -'object_check_critical' => '', -'object_check_warning' => '', +'object_check_critical' => 'Errori critici', +'object_check_warning' => 'Avvertenze', 'obsolete' => 'Obsoleto', 'october' => 'Ottobre', 'old' => 'Vecchio', @@ -896,7 +908,7 @@ Per farlo cliccare sul seguente link: [url_prefix]out/out.ChangePassword.php?hash=[hash] -Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di Sistema.', +Dovessero esserci ancora problemi al login, prego contatta l\'amministratore di sistema.', 'password_forgotten_email_subject' => '[sitename]: Password dimenticata', 'password_forgotten_send_hash' => 'Le istruzioni su come procedere sono state inviate all\'indirizzo e-mail dell\'utente', 'password_forgotten_text' => 'Compilare i campi seguenti e seguire le istruzioni nell\'e-mail che sarà inviata a breve.', @@ -909,10 +921,10 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'password_wrong' => 'Password errata', 'pdf_converters' => 'Convertitore a PDF', 'pending_approvals' => 'Approvazioni in sospeso', -'pending_receipt' => '', -'pending_reviews' => 'In attesa di recensioni', -'pending_revision' => '', -'pending_workflows' => 'I flussi di lavoro in sospeso', +'pending_receipt' => 'In attesa di ricezione', +'pending_reviews' => 'In attesa di revisione', +'pending_revision' => 'In attesa di riesame', +'pending_workflows' => 'Flussi di lavoro in sospeso', 'personal_default_keywords' => 'Parole-chiave personali', 'pl_PL' => 'Polacco', 'possible_substitutes' => 'Sostituti', @@ -920,8 +932,8 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'preview' => 'Anteprima', 'preview_converters' => 'Anteprima convesione documento', 'preview_images' => 'Immagini di anteprima', -'preview_markdown' => 'Riduione ribasso', -'preview_pdf' => '', +'preview_markdown' => 'Riduzione ribasso', +'preview_pdf' => 'Anteprima come PDF', 'preview_plain' => 'Testo', 'previous_state' => 'Stato precedente', 'previous_versions' => 'Versioni precedenti', @@ -932,13 +944,19 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].', 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.', 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.', -'receipts_accepted' => '', -'receipts_not_touched' => '', -'receipts_rejected' => '', -'receipts_without_group' => '', -'receipts_without_user' => '', -'receipt_deletion_email_body' => '', -'receipt_deletion_email_subject' => '', +'receipts_accepted' => '[no_receipts] ricevute già accettate', +'receipts_not_touched' => '[no_receipts] ricevute non gestite', +'receipts_rejected' => '[no_receipts] ricevute già rifiutate', +'receipts_without_group' => 'Ricevute senza gruppo', +'receipts_without_user' => 'Ricevute senza gruppo', +'receipt_deletion_email_body' => 'Utente rimosso dall\'elenco dei destinatari +Documento: [name] +Versione: [version] +Cartella: [folder_path] +Destinatario: [recipient] +Utente: [username] +URL: [url]', +'receipt_deletion_email_subject' => '[sitename]: [name] - Destinatario rimosso', 'receipt_log' => 'Ricezione Log', 'receipt_request_email_body' => 'Richiesta di ricezione Document: [name] @@ -949,18 +967,18 @@ URL: [url]', 'receipt_request_email_subject' => '[sitename]: [name] - Richiesta di ricezione', 'receipt_status' => 'Status', 'receipt_summary' => 'Sommario ricezione', -'receipt_update_failed' => '', -'recent_uploads' => '', -'reception' => '', -'reception_acknowleged' => '', -'reception_noaction' => '', -'reception_rejected' => '', +'receipt_update_failed' => 'Conferma della ricezione non riuscita', +'recent_uploads' => 'Caricamenti recenti', +'reception' => 'Ricezione', +'reception_acknowleged' => 'Ricezione confermata', +'reception_noaction' => 'Nessuna azione', +'reception_rejected' => 'Ricezione respinta', 'recipients' => 'Cartelle', -'recipient_already_removed' => '', -'redraw' => '', +'recipient_already_removed' => 'Il destinatario è già stato rimosso o riconosciuto come destinatario.', +'redraw' => 'Ridisegna', 'refresh' => 'Ricarica', 'rejected' => 'Rifiutato', -'released' => 'Rilasciato', +'released' => 'Pubblicato', 'removed_approver' => 'Rimosso dalla lista degli approvatori.', 'removed_file_email' => 'Allegato rimosso', 'removed_file_email_body' => 'Rimosso allegato @@ -979,7 +997,7 @@ Cartella: [folder_path] Utente: [username] URL: [url]', 'removed_workflow_email_subject' => '[sitename]: [name] - Flusso di lavoro rimosso dalla versione del documento', -'removeFolderFromDropFolder' => 'Rimuovi la cartella dopo l\'importazione', +'removeFolderFromDropFolder' => 'Rimuovi la cartella di pubblicazione dopo l\'importazione', 'remove_marked_files' => 'Rimuovi i files contrassegnati', 'repaired' => 'riparato', 'repairing_objects' => 'Riparazione documenti e cartelle in corso...', @@ -1009,11 +1027,11 @@ URL: [url]', 'reviewers' => 'Revisori', 'reviewer_already_assigned' => 'è già assegnato come revisore', 'reviewer_already_removed' => 'è già stato rimosso dal processo di revisione oppure ha già inserito una revisione.', -'reviews_accepted' => '', -'reviews_not_touched' => '', -'reviews_rejected' => '', -'reviews_without_group' => '', -'reviews_without_user' => '', +'reviews_accepted' => '[no_reviews] revisioni già accettate', +'reviews_not_touched' => '[no_reviews] revisioni non gestite', +'reviews_rejected' => '[no_reviews] revisioni già rifiutate', +'reviews_without_group' => 'Revisioni senza gruppo', +'reviews_without_user' => 'Revisioni senza utente', 'review_deletion_email' => 'Richiesta di revisione cancellata', 'review_deletion_email_body' => 'Richiesta di revisione cancellata. Documento: [name] @@ -1046,46 +1064,46 @@ URL: [url]', 'review_submit_email_subject' => '[sitename]: [name] - Sottoposta revisione', 'review_summary' => 'Dettaglio revisioni', 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.', -'revise_document' => 'Rivedi documento', -'revise_document_on' => 'Prossima revisione del documento il [date]', -'revisions_accepted' => '', -'revisions_not_touched' => '', -'revisions_pending' => '', -'revisions_rejected' => '', -'revisions_without_group' => '', -'revisions_without_user' => '', -'revision_date' => 'data revisione', -'revision_log' => 'Log revisione', -'revision_request_email_body' => 'Richiesta di ricezione +'revise_document' => 'Riesamina documento', +'revise_document_on' => 'Prossimo riesame del documento il [date]', +'revisions_accepted' => '[no_reviews] riesami già accettati', +'revisions_not_touched' => '[no_reviews] riesami non gestiti', +'revisions_pending' => '[no_reviews] riesami pendenti', +'revisions_rejected' => '[no_reviews] riesami già rifiutati', +'revisions_without_group' => 'Riesami senza gruppo', +'revisions_without_user' => 'Riesami senza utente', +'revision_date' => 'data riesame', +'revision_log' => 'Log riesame', +'revision_request_email_body' => 'Richiesta di riesame Document: [name] Version: [version] Parent folder: [folder_path] User: [username] URL: [url]', -'revision_request_email_subject' => '[sitename]: [name] - Richiesta di revisione', +'revision_request_email_subject' => '[sitename]: [name] - Richiesta di riesame', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', 'revisors' => 'Revisori', 'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore', -'revisor_already_removed' => 'Revisore già rimosso dal processo di revisione o ha già revisionato documento.', -'rewind_workflow' => 'Inverti il flusso di lavoro', -'rewind_workflow_email_body' => 'Il flusso di lavoro è stato invertito +'revisor_already_removed' => 'Revisore già rimosso dal processo di riesame o ha già riesaminato il documento.', +'rewind_workflow' => 'Fa ripartire il flusso di lavoro', +'rewind_workflow_email_body' => 'Il flusso di lavoro è stato fatto ripartire Document: [name] Version: [version] Workflow: [workflow] Parent folder: [folder_path] User: [username] URL: [url]', -'rewind_workflow_email_subject' => '[sitename]: [name] - Il flusso di lavoro è stato invertito', -'rewind_workflow_warning' => 'Se si inverte un flusso di lavoro al suo stato iniziale ogni traccia del flusso di lavoro originale per questo documento sarà cancellata permanentemente.', +'rewind_workflow_email_subject' => '[sitename]: [name] - Il flusso di lavoro è stato fatto ripartire', +'rewind_workflow_warning' => 'Se si fa ripartire un flusso di lavoro al suo stato iniziale ogni traccia del flusso di lavoro originale per questo documento sarà cancellata permanentemente.', 'rm_attrdef' => 'Rimuovi attributo', 'rm_attrdefgroup' => 'Rimuovere questo gruppo di attributi', -'rm_attr_value' => '', +'rm_attr_value' => 'Rimuovi valore attributo', 'rm_default_keyword_category' => 'Rimuovi categoria', 'rm_document' => 'Rimuovi documento', 'rm_document_category' => 'Rimuovi categoria', -'rm_event' => '', +'rm_event' => 'Rimuovi evento', 'rm_file' => 'Rimuovi file', 'rm_folder' => 'Rimuovi cartella', 'rm_from_clipboard' => 'Rimuovi dalla clipboard', @@ -1094,7 +1112,7 @@ URL: [url]', 'rm_transmittal' => 'Rimuovi trasmissione', 'rm_transmittalitem' => 'Rimuovi oggetto', 'rm_user' => 'Rimuovi questo utente', -'rm_user_from_processes' => '', +'rm_user_from_processes' => 'Rimuovi utente dai processi', 'rm_version' => 'Rimuovi versione', 'rm_workflow' => 'Rimuovi flusso di lavoro', 'rm_workflow_action' => 'Rimuovi azione del flusso di lavoro', @@ -1123,58 +1141,63 @@ URL: [url]', 'saturday' => 'Sabato', 'saturday_abbr' => 'Sab', 'save' => 'Salva', -'scheduler_class' => '', -'scheduler_class_description' => '', -'scheduler_class_parameter' => '', -'scheduler_class_tasks' => '', -'scheduler_task_mgr' => '', +'scheduler_class' => 'Classe', +'scheduler_class_description' => 'Descrizione', +'scheduler_class_parameter' => 'Parametro', +'scheduler_class_tasks' => 'Attività della classe', +'scheduler_task_mgr' => 'Pianificatore', 'search' => 'Ricerca', 'search_fulltext' => 'Ricerca fulltext', 'search_in' => 'Cerca in', 'search_mode_and' => 'tutte le parole', -'search_mode_documents' => 'Solo Documenti', -'search_mode_folders' => 'Solo Cartelle', +'search_mode_documents' => 'Solo documenti', +'search_mode_folders' => 'Solo cartelle', 'search_mode_or' => 'almeno una parola', 'search_no_results' => 'Non ci sono documenti che soddisfino la vostra ricerca', 'search_query' => 'Cerca per', 'search_report' => 'Trovati [doccount] documenti e [foldercount] cartelle in [searchtime] secondi.', 'search_report_fulltext' => 'Trovati [doccount] documenti', -'search_resultmode' => 'Risultato Ricerca', -'search_resultmode_both' => 'Documenti e Cartelle', +'search_resultmode' => 'Risultato ricerca', +'search_resultmode_both' => 'Documenti e cartelle', 'search_results' => 'Risultato ricerca', 'search_results_access_filtered' => 'La ricerca può produrre risultati al cui contenuto è negato l\'accesso.', 'search_time' => 'Tempo trascorso: [time] secondi.', 'seconds' => 'secondi', 'selection' => 'Selezione', 'select_attrdefgrp_show' => 'Scegli quando mostrare', -'select_attribute_value' => '', +'select_attribute_value' => 'Seleziona il valore dell\'attributo', 'select_category' => 'Clicca per selezionare la categoria', -'select_group' => 'Seleziona Gruppo', +'select_group' => 'Seleziona gruppo', 'select_groups' => 'Clicca per selezionare i gruppi', 'select_grp_approvers' => 'Seleziona gruppo approvatore', -'select_grp_ind_approvers' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_notification' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_recipients' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_reviewers' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_revisors' => '', -'select_grp_notification' => 'Seleziona Gruppo', -'select_grp_recipients' => 'Seleziona gruppo cartelle', -'select_grp_reviewers' => 'Seleziona gruppo revisore', -'select_grp_revisors' => 'Seleziona gruppo revisori', -'select_ind_approvers' => 'Seleziona approvatore', -'select_ind_notification' => 'Seleziona Utente', -'select_ind_recipients' => 'Seleziona singole cartelle', -'select_ind_reviewers' => 'Seleziona revisore', -'select_ind_revisors' => 'Seleziona singoli revisori', +'select_grp_ind_approvers' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_notification' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_recipients' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_reviewers' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_revisors' => 'Fare clic per selezionare il gruppo', +'select_grp_notification' => 'Fare clic per selezionare notifiche di gruppo', +'select_grp_recipients' => 'Fare clic per selezionare un gruppo di destinatari', +'select_grp_reviewers' => 'Fare clic per selezionare un gruppo di revisori', +'select_grp_revisors' => 'Fare clic per selezionare un gruppo di riesaminatori', +'select_ind_approvers' => 'Fare clic per selezionare un approvatore individuale', +'select_ind_notification' => 'Fare clic per selezionare la notifica individuale', +'select_ind_recipients' => 'Fare clic per selezionare un destinatario individuale', +'select_ind_reviewers' => 'Fare clic per selezionare un revisore individuale', +'select_ind_revisors' => 'Fare clic per selezionare un riesaminatore individuale', 'select_one' => 'Seleziona uno', -'select_user' => 'Seleziona Utente', +'select_user' => 'Seleziona utente', 'select_users' => 'Clicca per selezionare gli utenti', 'select_value' => 'Selezionare un valore', 'select_workflow' => 'Seleziona il flusso di lavoro', -'send_email' => '', -'send_login_data' => '', -'send_login_data_body' => '', -'send_login_data_subject' => '', +'send_email' => 'Invia messaggio', +'send_login_data' => 'Invia dati di login', +'send_login_data_body' => 'Dati di login + +Login: [login] +Name: [username] + +[comment]', +'send_login_data_subject' => '[sitename]: [login] - I tuoi dati di login', 'send_test_mail' => 'Invia messagio di prova', 'september' => 'Settembre', 'sequence' => 'Posizione', @@ -1182,21 +1205,21 @@ URL: [url]', 'seq_end' => 'Alla fine', 'seq_keep' => 'Mantieni la posizione', 'seq_start' => 'Prima posizione', -'sessions' => '', +'sessions' => 'Utenti online', 'setDateFromFile' => 'Prende la data dal file importato', 'setDateFromFolder' => 'Prende la data dalla cartella importata', 'settings' => 'Impostazioni', 'settings_activate_module' => 'Attivazione modulo', 'settings_activate_php_extension' => 'Attivazione estensione PHP', 'settings_adminIP' => 'IP Amministratore', -'settings_adminIP_desc' => 'Se attivato l\'Amministratore si può collegare solo da un IP specifico; lasciare vuoto per evitare il controllo. NOTA: funziona solo con autenticazione locale (no LDAP)', +'settings_adminIP_desc' => 'Se attivato l\'amministratore si può collegare solo da un IP specifico; lasciare vuoto per evitare il controllo. NOTA: funziona solo con autenticazione locale (no LDAP)', 'settings_Advanced' => 'Avanzate', 'settings_advancedAcl' => 'Avanzate controlo accesso', -'settings_advancedAcl_desc' => 'Avanzatoa controlo di accesso consente di attivare / diattivare alcuni moduli di software. Non può essere utilizzato per i diritti di accesso su documenti e cartelle.', -'settings_allowChangeRevAppInProcess' => '', -'settings_allowChangeRevAppInProcess_desc' => '', +'settings_advancedAcl_desc' => 'Avanzatoa controlo di accesso consente di attivare/diattivare alcuni moduli di software. Non può essere utilizzato per i diritti di accesso su documenti e cartelle.', +'settings_allowChangeRevAppInProcess' => 'Consenti modifica revisore/approvatore dopo l\'avvio del processo', +'settings_allowChangeRevAppInProcess_desc' => 'Per impostazione predefinita, i revisori e gli approvatori non possono più essere modificati dopo l\'invio di una revisione o di un\'approvazione. Questa opzione consentirà agli amministratori di farlo purché il documento non venga rilasciato o rifiutato.', 'settings_allowReviewerOnly' => 'Abilita l\'impostazione del solo revisore', -'settings_allowReviewerOnly_desc' => 'Abilita se si vuole concedere di impostare solo un revisore ma non un apporvatore nel workflow tradizionale', +'settings_allowReviewerOnly_desc' => 'Abilita se si vuole concedere di impostare solo un revisore ma non un apporvatore nel flusso di lavoro tradizionale', 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite', 'settings_Authentication' => 'Impostazioni di Autenticazione', 'settings_autoLoginUser' => 'Login automatico', @@ -1253,21 +1276,21 @@ URL: [url]', 'settings_defaultSearchMethod_valdatabase' => 'database', 'settings_defaultSearchMethod_valfulltext' => 'Testo intero', 'settings_delete_install_folder' => 'Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione.', -'settings_disableSelfEdit' => 'Disabilita Auto-Modifica', +'settings_disableSelfEdit' => 'Disabilita auto-modifica', 'settings_disableSelfEdit_desc' => 'Se selezionato l\'utente non può modificare il proprio profilo', 'settings_disable_install' => 'Prova ad eliminare il file ENABLE_INSTALL_TOOL se possibile', 'settings_Display' => 'Impostazioni di visualizzazione', -'settings_dropFolderDir' => 'Cartella per il drop', -'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.', +'settings_dropFolderDir' => 'Cartella per la pubblicazione', +'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per pubblicare file sul server, importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare file in questo modo.', 'settings_Edition' => 'Impostazioni di edizione', 'settings_editOnlineFileTypes' => 'Tipi di files modificabili Online', 'settings_editOnlineFileTypes_desc' => 'I file con uno dei seguenti terminali possono essere modificati on-line (usare solo caratteri minuscoli)', 'settings_enable2FactorAuthentication' => 'Permettere autenticazione a due fattori', -'settings_enable2FactorAuthentication_desc' => 'Abilitare / disabilitare autenticazione a due fattori. Gli utenti avranno bisogno di "Google Authenticator" sul tuo telefono cellulare.', -'settings_enableAcknowledgeWorkflow' => '', -'settings_enableAcknowledgeWorkflow_desc' => '', -'settings_enableAdminReceipt' => '', -'settings_enableAdminReceipt_desc' => '', +'settings_enable2FactorAuthentication_desc' => 'Abilitare/disabilitare autenticazione a due fattori. Gli utenti avranno bisogno di "Google Authenticator" sul tuo telefono cellulare.', +'settings_enableAcknowledgeWorkflow' => 'Consenti la ricezione di documenti per gli amministratori', +'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare questa opzione se si desidera che gli amministratori vengano elencati come destinatari dei documenti.', +'settings_enableAdminReceipt' => 'Consenti revisione/approvazione per gli amministratori', +'settings_enableAdminReceipt_desc' => 'Abilitare questa opzione se si desidera che gli amministratori vengano elencati come revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori', 'settings_enableAdminRevApp_desc' => 'Abilita per elencare gli amministratori tra i revisori/approvatori e per le transizioni del flusso di lavoro', 'settings_enableCalendar' => 'Abilita calendario', @@ -1276,23 +1299,23 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Abilita/disabilita la clipboard sulla pagina \'Vista cartella\'', 'settings_enableConverting' => 'Abilita conversione', 'settings_enableConverting_desc' => 'Abilita/disabilita la conversione dei files', -'settings_enableDropFolderList' => 'Abilita lista dei file nella cartella di rilasco', -'settings_enableDropFolderList_desc' => 'Abilita la lista dei file nella cartella di rilascio. La lista viene mostrata nel menù principale.', -'settings_enableDropUpload' => 'Abilita upload veloce', -'settings_enableDropUpload_desc' => 'Abilita/disabilita l\'area di rilascio nella pagina \'Vista cartella\' per caricare i files con drag&drop (trascina e rilascia).', +'settings_enableDropFolderList' => 'Abilita lista dei file nella cartella di pubblicazione', +'settings_enableDropFolderList_desc' => 'Abilita la lista dei file nella cartella di pubblicazione. La lista viene mostrata nel menù principale.', +'settings_enableDropUpload' => 'Abilita caricamento veloce', +'settings_enableDropUpload_desc' => 'Abilita/disabilita l\'area di pubblicazione nella pagina \'Vista cartella\' per caricare i files con drag&drop (trascina e rilascia).', 'settings_enableDuplicateDocNames' => 'Permetti documenti con lo stesso nome', 'settings_enableDuplicateDocNames_desc' => 'Permetti documenti con lo stesso nome nella stessa cartella', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Permetti nomi sottocartelle duplicati', +'settings_enableDuplicateSubFolderNames_desc' => 'Permetti di avere nomi duplicati di sottocartelle in una cartella.', 'settings_enableEmail' => 'Abilita l\'email', 'settings_enableEmail_desc' => 'Abilita/disabilita la notifica automatica via email', -'settings_enableFilterReceipt' => '', -'settings_enableFilterReceipt_desc' => '', +'settings_enableFilterReceipt' => 'Filtra per proprietario, revisore, ecc. dall\'elenco delle ricezioni', +'settings_enableFilterReceipt_desc' => 'Abilita, per poter filtrare dei destinatari da un elenco di ricezioni se i membri di un gruppo sono selezionati.', 'settings_enableFolderTree' => 'Visualizza la struttura ad albero', 'settings_enableFolderTree_desc' => 'Abilita/disabilita la visualizzaione della struttura ad albero nella pagina \'Vista cartella\'', 'settings_enableFullSearch' => 'Abilita ricerca fulltext', 'settings_enableFullSearch_desc' => 'Abilita/disabilita la ricerca fulltext', -'settings_enableGuestAutoLogin' => 'Activer la connexion automatique pour le compte invité', +'settings_enableGuestAutoLogin' => 'Abilita l\'auto login per gli ospiti', 'settings_enableGuestAutoLogin_desc' => 'Se il login ospite e il login automatico è abilitato, il login ospite sarà usato automaticamente.', 'settings_enableGuestLogin' => 'Permetti login come ospite', 'settings_enableGuestLogin_desc' => 'Per impedire il login come ospite, selezionare questa opzione. Nota bene: il login come ospite dovrebbe essere permesso soltanto in un ambiente fidato.', @@ -1303,7 +1326,7 @@ URL: [url]', 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files', 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.', 'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù', -'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.', +'settings_enableMenuTasks_desc' => 'Abilita/disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.', 'settings_enableMultiUpload' => 'Consenti il caricamento di più files', 'settings_enableMultiUpload_desc' => 'Quando viene creato un nuovo documento, possono essere caricati più files. Ogniuno di essi genera un nuovo documento.', 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore', @@ -1312,34 +1335,36 @@ URL: [url]', 'settings_enableNotificationWorkflow_desc' => 'Se questa opzione è selezionata, gli utenti o i gruppi che sono coinvolti nella successiva transizione del flusso di lavoro riceveranno un avviso, anche se non hanno impostato notifiche riguardanti il documento.', 'settings_enableOwnerNotification' => 'Abilita/disabilita notifica al proprietario', 'settings_enableOwnerNotification_desc' => 'Spuntare per inviare una notifica al proprietario del documento nel momento in cui questo viene aggiunto.', -'settings_enableOwnerReceipt' => '', -'settings_enableOwnerReceipt_desc' => '', +'settings_enableOwnerReceipt' => 'Consentire la ricezione di documenti da parte del proprietario', +'settings_enableOwnerReceipt_desc' => 'Abilitare questa opzione se si desidera che il proprietario di un documento sia elencato come destinatario.', 'settings_enableOwnerRevApp' => 'Permetti la revisione/approvazione per il proprietario', 'settings_enableOwnerRevApp_desc' => 'Spuntare per aggiungere il proprietario del documento alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enablePasswordForgotten' => 'Abilita recupero password', 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.', -'settings_enableReceiptReject' => '', -'settings_enableReceiptReject_desc' => '', +'settings_enableReceiptReject' => 'Abilita il rifiuto dei ricevimenti', +'settings_enableReceiptReject_desc' => 'Abilita per attivare il rifiuto dei ricevimenti.', 'settings_enableReceiptWorkflow' => 'Abilitare per notifiche', -'settings_enableReceiptWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.', +'settings_enableReceiptWorkflow_desc' => 'Abilitare per attivare le ricevute di notifica nel flusso di lavoro.', 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle', 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.', -'settings_enableRevisionOnVoteReject' => '', -'settings_enableRevisionOnVoteReject_desc' => '', -'settings_enableRevisionWorkflow' => 'Abilita revisione documenti', -'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare workflow su revisione documenti dopo scadenza.', -'settings_enableSelfReceipt' => '', -'settings_enableSelfReceipt_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => 'Rifiutato da un revisore', +'settings_enableRevisionOnVoteReject_desc' => 'Se impostato, il documento verrà rifiutato se un revisore rifiuta il documento.', +'settings_enableRevisionWorkflow' => 'Abilita riesame dei documenti', +'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare flusso di lavoro su riesame documenti dopo scadenza.', +'settings_enableSelfReceipt' => 'Consenti la ricezione di documenti per l\'utente che ha effettuato l\'accesso', +'settings_enableSelfReceipt_desc' => 'Abilitare questa opzione se si desidera che l\'utente attualmente connesso sia elencato come destinatario di un documento.', 'settings_enableSelfRevApp' => 'Permetti revisione/approvazione all\'utente registrato', 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enableSessionList' => 'Abilita lista utenti online nel menu', 'settings_enableSessionList_desc' => 'Abilita lista degli utenti loggati nel menu', 'settings_enableThemeSelector' => 'Selezione tema grafico', 'settings_enableThemeSelector_desc' => 'Abilita/disabilita il selettore di tema grafico nella finestra di login', -'settings_enableUpdateReceipt' => '', -'settings_enableUpdateReceipt_desc' => '', -'settings_enableUpdateRevApp' => 'Consenti la modifica della revisione / approvazione estesa', -'settings_enableUpdateRevApp_desc' => 'Abilita questo, se l\'utente che ha effettuato una revisione / approvazione può modificare la decisione finché il passaggio di flusso di lavoro corrente non è stato completato.', +'settings_enableUpdateReceipt' => 'Consenti modifica della ricezione esistente', +'settings_enableUpdateReceipt_desc' => 'Abilitare questa opzione se l\'utente che ha effettuato una ricezione può modificare la decisione.', +'settings_enableUpdateRevApp' => 'Consenti la modifica della revisione/approvazione estesa', +'settings_enableUpdateRevApp_desc' => 'Abilita questo, se l\'utente che ha effettuato una revisione/approvazione può modificare la decisione finché il passaggio di flusso di lavoro corrente non è stato completato.', 'settings_enableUserImage' => 'Abilita immagine utente', 'settings_enableUserImage_desc' => 'L\'opzione permette di attribuire un\'immagine a ciascun utente', 'settings_enableUsersView' => 'Abilita visualizzazione utenti', @@ -1349,9 +1374,9 @@ URL: [url]', 'settings_enableVersionModification' => 'Abilita modifica della versione', 'settings_enableVersionModification_desc' => 'Abilita/disabilita il permesso di modificare le versioni di un documento da parte di un qualsiasi utente. Gli Amministratori hanno sempre e comunque tale facoltà.', 'settings_enableWebdavReplaceDoc' => 'Sostituisci il documento durante il salvataggio', -'settings_enableWebdavReplaceDoc_desc' => 'Se abilitato, durante il salvataggio il documento verrà sostituito invece di crearne uno nuovo. Si applica solo se l\'utente, estensione e nome del file sono uguali all\'ultima versione. E\' utile per applicazioni che ad intervalli regolari salvano un documento.', +'settings_enableWebdavReplaceDoc_desc' => 'Se abilitato, durante il salvataggio il documento verrà sostituito invece di crearne uno nuovo. Si applica solo se l\'utente, estensione e nome del file sono uguali all\'ultima versione. È utile per applicazioni che ad intervalli regolari salvano un documento.', 'settings_enableXsendfile' => 'Usa il modulo apache xsendfile', -'settings_enableXsendfile_desc' => 'Se selezionato ed e\' installato il modulo apache xsendfile, questo puo\' essere usato per inviare immagini', +'settings_enableXsendfile_desc' => 'Se selezionato ed è installato il modulo apache xsendfile, questo puo\' essere usato per inviare immagini', 'settings_encryptionKey' => 'Chiave di criptazione', 'settings_encryptionKey_desc' => 'La chiave viene usata per creare un identificatore unico da aggiungere come campo nascosto ad un formulario per protezione da attacchi CSRF.', 'settings_error' => 'Errore', @@ -1380,7 +1405,7 @@ URL: [url]', 'settings_initialDocumentStatus' => 'Stato iniziale documento', 'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento', 'settings_initialDocumentStatus_draft' => 'Bozza', -'settings_initialDocumentStatus_released' => 'Rilasciato', +'settings_initialDocumentStatus_released' => 'Pubblicato', 'settings_installADOdb' => 'Installa ADOdb', 'settings_install_disabled' => 'Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.', 'settings_install_pear_package_log' => 'Installa il registro del pacchetto Pear', @@ -1403,15 +1428,15 @@ URL: [url]', 'settings_luceneClassDir_desc' => 'Cartella del pacchetto SeedDMS_Lucene (opzionale). Lasciare il campo vuoto se SeedDMS_Lucene è stato installato in una cartella localizzabile dal PHP, ad esempio quella indicata per gli include PHP addizionali.', 'settings_luceneDir' => 'Cartella di indicizzazione fulltext', 'settings_luceneDir_desc' => 'Cartella di memorizzazione dell\'indice utilizzato da Lucene', -'settings_maxDirID' => 'Max numero di ID-Cartella', +'settings_maxDirID' => 'Max numero di ID cartella', 'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 0.', -'settings_maxExecutionTime' => 'Tempo Max di esecuzione (s)', +'settings_maxExecutionTime' => 'Tempo massimo di esecuzione (s)', 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.', 'settings_maxItemsPerPage' => 'Numero massimo di inserimenti per pagina', 'settings_maxItemsPerPage_desc' => 'Riduce numero di cartelle e documenti mostrati nell pagina di visualizzazione cartelle. Altri oggetti saranno caricati allo scorrimento verso la fine della pagina. Impostare 0 per visualizzare tutti gli elementi.', 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle', 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.', -'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea', +'settings_maxSizeForFullText' => 'La lunghezza massima del file per l\'indicizzazione istantanea', 'settings_maxSizeForFullText_desc' => 'Tutte le nuove versioni dei documenti più in basso della dimensione configurata saranno completamente indicizzati dopo il caricamento. In tutti gli altri casi sarà indicizzato solo i metadati.', 'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare', 'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.', @@ -1445,17 +1470,17 @@ URL: [url]', 'settings_presetExpirationDate_desc' => 'Tutti i nuovi documenti caricati avranno la data di scadenza impostata su questo valore. La data inserita può essere specificata nel formato accettato dalla funzione strtotime() di PHP, ad esempio +5 settimane.', 'settings_previewWidthDetail' => 'Larghezza immagini di anteprima (dettagli)', 'settings_previewWidthDetail_desc' => 'Larghezza delle immagini di anteprima mostrate nella pagina dei dettagli', -'settings_previewWidthDropFolderList' => 'Larghezza immagine di anteprima (lista cartella rilascio)', -'settings_previewWidthDropFolderList_desc' => 'Larghezza immagine di anteprima mostrata nella lista, quando selezionato un file dalla cartella di rilascio', +'settings_previewWidthDropFolderList' => 'Larghezza immagine di anteprima (lista cartella di pubblicazione)', +'settings_previewWidthDropFolderList_desc' => 'Larghezza immagine di anteprima mostrata nella lista, quando selezionato un file dalla cartella di pubblicazione', 'settings_previewWidthList' => 'Larghezza delle immagini di anteprima (lista)', 'settings_previewWidthList_desc' => 'Larghezza delle immagini di anteprima mostrate nella lista', 'settings_previewWidthMenuList' => 'Larghezza immagine di anteprima (lista menu)', -'settings_previewWidthMenuList_desc' => 'Larghezza immagine di anteprima mostrata come articolo nel menu cartella di rilascio.', +'settings_previewWidthMenuList_desc' => 'Larghezza immagine di anteprima mostrata come articolo nel menu cartella di pubblicazione.', 'settings_printDisclaimer' => 'Mostra disclaimer', 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.', 'settings_quota' => 'Quota utente', 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.', -'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il successo di posto', +'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il caricamento', 'settings_removeFromDropFolder_desc' => 'Attivare questa, se un file è preso dalla cartella di ricezione, si è cancellata dopo il caricamento di successo.', 'settings_repositoryUrl' => 'URL del repository', 'settings_repositoryUrl_desc' => 'URL del repository per le estensioni', @@ -1509,14 +1534,14 @@ URL: [url]', 'settings_strictFormCheck_desc' => 'Rigido controllo sulla form. Se abilitato verrà richiesto che tutti i campi della form abbiano un valore. Se disabilitato la maggior parte dei commenti e dei campi parola-chiave diventano opzionali. NOTA: i commenti sono sempre necessari quando si carica una revisione o si scavalca lo stato di un documento.', 'settings_suggestionvalue' => 'Valore suggerito', 'settings_System' => 'Sistema', -'settings_tasksInMenu' => '', -'settings_tasksInMenu_approval' => '', -'settings_tasksInMenu_desc' => '', -'settings_tasksInMenu_needscorrection' => '', -'settings_tasksInMenu_receipt' => '', -'settings_tasksInMenu_review' => '', -'settings_tasksInMenu_revision' => '', -'settings_tasksInMenu_workflow' => '', +'settings_tasksInMenu' => 'Attività selezionate', +'settings_tasksInMenu_approval' => 'Approvazioni', +'settings_tasksInMenu_desc' => 'Seleziona le attività da conteggiare. Se non ne sono state selezionate, verranno conteggiate tutte le attività.', +'settings_tasksInMenu_needscorrection' => 'Correzioni necessarie', +'settings_tasksInMenu_receipt' => 'Ricevute', +'settings_tasksInMenu_review' => 'Revisioni', +'settings_tasksInMenu_revision' => 'Riesami', +'settings_tasksInMenu_workflow' => 'Flusso di lavoro', 'settings_theme' => 'Tema di default', 'settings_theme_desc' => 'Stile di default (nome della sottocartella nella cartella "styles")', 'settings_titleDisplayHack' => 'Visualizzazione titoli lunghi', @@ -1534,123 +1559,123 @@ URL: [url]', 'settings_viewOnlineFileTypes_desc' => 'Solo i files che terminano nella maniera seguente verranno visualizzati (UTILIZZARE SOLO IL MINUSCOLO)', 'settings_webdav' => 'WebDAV', 'settings_workflowMode' => 'Modalità flusso di lavoro', -'settings_workflowMode_desc' => 'Il flusso di lavoro \'avanzato\' permette di rilasciare un proprio flusso di lavoro per le versioni dei documenti', +'settings_workflowMode_desc' => 'Il flusso di lavoro \'avanzato\' permette di pubblicare un proprio flusso di lavoro per le versioni dei documenti', 'settings_workflowMode_valadvanced' => 'Avanzato', 'settings_workflowMode_valtraditional' => 'Tradizionale', -'settings_workflowMode_valtraditional_only_approval' => 'tradizionale (senza revisione)', +'settings_workflowMode_valtraditional_only_approval' => 'Tradizionale (senza revisione)', 'settings_zendframework' => 'Framework Zend', 'set_expiry' => 'Imposta scadenza', 'set_owner' => 'Conferma proprietario', 'set_owner_error' => 'Errore nell\'impostazione del proprietario', -'set_password' => 'Imposta Password', +'set_password' => 'Imposta password', 'set_workflow' => 'Imposta il flusso di lavoro', -'show_extension_changelog' => '', +'show_extension_changelog' => 'Registro delle modifiche dell\'estensione', 'show_extension_version_list' => 'Mostra lista delle versioni', 'signed_in_as' => 'Utente', 'sign_in' => 'Accesso', 'sign_out' => 'Disconnettiti', 'sign_out_user' => 'Disconnetti l\'utente', 'sk_SK' => 'Slovacco', -'sort_by_date' => 'Ordina per Data', -'sort_by_name' => 'Ordina per Nom', -'sort_by_sequence' => 'Ordina per Sequenza', +'sort_by_date' => 'Ordina per data', +'sort_by_name' => 'Ordina per nome', +'sort_by_sequence' => 'Ordina per sequenza', 'space_used_on_data_folder' => 'Spazio utilizzato dai dati', 'splash_added_to_clipboard' => 'Aggiunto agli appunti', -'splash_add_access' => '', +'splash_add_access' => 'Accesso aggiunto', 'splash_add_attribute' => 'Attributo aggiunto', 'splash_add_group' => 'Gruppo aggiunto', 'splash_add_group_member' => 'Membro aggiunto al gruppo', 'splash_add_role' => 'Aggiunto nuovo ruolo', 'splash_add_to_transmittal' => 'Aggiungere alla trasmissione', -'splash_add_transmittal' => '', +'splash_add_transmittal' => 'Aggiungere trasmissione', 'splash_add_user' => 'Utente aggiunto', 'splash_cleared_cache' => 'Cache cancellata', 'splash_cleared_clipboard' => 'Appunti cancellati', -'splash_delete_access' => '', +'splash_delete_access' => 'Diritto d\'accesso cancellato', 'splash_document_added' => 'Documento aggiunto', 'splash_document_checkedout' => 'Documento approvato', 'splash_document_edited' => 'Documento modificato', -'splash_document_indexed' => '', +'splash_document_indexed' => 'Documento indicizzato', 'splash_document_locked' => 'Documento bloccato', 'splash_document_unlocked' => 'Documento sbloccato', -'splash_edit_access' => '', +'splash_edit_access' => 'Accesso modificato', 'splash_edit_attribute' => 'Attributo modificato', -'splash_edit_event' => '', +'splash_edit_event' => 'Evento modificato', 'splash_edit_group' => 'Gruppo modificato', -'splash_edit_role' => 'Ruolo memorizzata', -'splash_edit_task' => '', +'splash_edit_role' => 'Ruolo memorizzato', +'splash_edit_task' => 'Attività modificata', 'splash_edit_user' => 'Utente modificato', 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione', -'splash_error_rm_download_link' => '', -'splash_error_send_download_link' => '', -'splash_extension_getlist' => '', -'splash_extension_import' => '', -'splash_extension_refresh' => '', -'splash_extension_upload' => '', +'splash_error_rm_download_link' => 'Errore durante la rimozione del collegamento di scaricamento', +'splash_error_send_download_link' => 'Errore durante l\'invio del collegamento di scaricamento', +'splash_extension_getlist' => 'Elenco estensioni aggiornate dal repository', +'splash_extension_import' => 'Extensition installed', +'splash_extension_refresh' => 'Refreshed list of extensions', +'splash_extension_upload' => 'Extension installed', 'splash_folder_edited' => 'Cartella modificata', 'splash_importfs' => 'Importati [Documenti] documenti e cartelle [cartelle]', -'splash_inherit_access' => '', +'splash_inherit_access' => 'Il diritto di accesso verrà ereditato', 'splash_invalid_folder_id' => 'ID cartella non valido', 'splash_invalid_searchterm' => 'Termine di ricerca non valido', -'splash_link_document' => '', +'splash_link_document' => 'Collegamento aggiunto', 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente', 'splash_move_document' => 'Documento spostato', 'splash_move_folder' => 'Cartella spostato', -'splash_notinherit_access' => '', -'splash_receipt_update_success' => '', +'splash_notinherit_access' => 'I diritti di accesso non sono più ereditati', +'splash_receipt_update_success' => 'Ricevuta aggiunta con successo', 'splash_removed_from_clipboard' => 'Rimosso dagli appunti', 'splash_rm_attribute' => 'Attributo rimosso', -'splash_rm_attr_value' => '', +'splash_rm_attr_value' => 'Valore attributo rimosso', 'splash_rm_document' => 'Documento rimosso', -'splash_rm_download_link' => '', +'splash_rm_download_link' => 'Collegamento di scaricamento rimosso', 'splash_rm_folder' => 'Cartella eliminata', 'splash_rm_group' => 'Gruppo eliminato', 'splash_rm_group_member' => 'Membro del gruppo eliminato', 'splash_rm_role' => 'Ruolo cancellato', 'splash_rm_transmittal' => 'Trasmissione cancellato', 'splash_rm_user' => 'Utente eliminato', -'splash_rm_user_processes' => '', -'splash_rm_workflow' => '', -'splash_rm_workflow_action' => '', -'splash_rm_workflow_state' => '', -'splash_saved_file' => '', -'splash_save_user_data' => '', -'splash_send_download_link' => '', -'splash_send_login_data' => '', -'splash_setowner' => '', +'splash_rm_user_processes' => 'Utente rimosso da tutti i processi', +'splash_rm_workflow' => 'flusso di lavoro rimosso', +'splash_rm_workflow_action' => 'Azione del flusso di lavoro rimossa', +'splash_rm_workflow_state' => 'Stato del flusso di lavoro rimosso', +'splash_saved_file' => 'Versione salvata', +'splash_save_user_data' => 'Dati utente salvati', +'splash_send_download_link' => 'Collegamento di scaricamento inviato via email.', +'splash_send_login_data' => 'Dati di login inviati', +'splash_setowner' => 'Imposta nuovo proprietario', 'splash_settings_saved' => 'Impostazioni salvate', -'splash_set_default_access' => '', +'splash_set_default_access' => 'Imposta accesso predefinito', 'splash_substituted_user' => 'Utente sostituito', 'splash_switched_back_user' => 'Ritorno all\'utente originale', 'splash_toogle_group_manager' => 'Amministratore di gruppo invertito', -'splash_transfer_content' => '', -'splash_transfer_document' => '', -'splash_transfer_objects' => '', -'splash_trigger_workflow' => '', +'splash_transfer_content' => 'Contenuto trasferito', +'splash_transfer_document' => 'Documento trasferito', +'splash_transfer_objects' => 'Oggetti trasferito', +'splash_trigger_workflow' => 'Attivata transizione del flusso di lavoro', 'state_and_next_state' => 'Stato/Prossimo stato', 'statistic' => 'Statistiche', 'status' => 'Stato', 'status_approval_rejected' => 'Bozza rifiutata', 'status_approved' => 'Approvato', 'status_approver_removed' => 'Approvatore rimosso dal processo', -'status_needs_correction' => '', +'status_needs_correction' => 'Necessita correzioni', 'status_not_approved' => 'Non ancora approvato', 'status_not_receipted' => 'Non ancora ricevuto', -'status_not_reviewed' => 'Non ancora revisionato', -'status_not_revised' => 'Non revisionato', +'status_not_reviewed' => 'Non revisionato', +'status_not_revised' => 'Non riesaminato', 'status_receipted' => 'Ricevuto', -'status_receipt_rejected' => 'Rigettato', +'status_receipt_rejected' => 'Rifiutato', 'status_recipient_removed' => 'Cartella rimossa dalla lista', 'status_reviewed' => 'Revisionato', 'status_reviewer_rejected' => 'Bozza rifiutata', 'status_reviewer_removed' => 'Revisore rimosso dal processo', -'status_revised' => 'Revisionato', -'status_revision_rejected' => 'Rigettato', -'status_revision_sleeping' => 'In attesa', +'status_revised' => 'riesaminato', +'status_revision_rejected' => 'Rifiutato', +'status_revision_sleeping' => 'in attesa', 'status_revisor_removed' => 'Revisore rimosso dalla lista', 'status_unknown' => 'Sconosciuto', 'storage_size' => 'Spazio di archiviazione', -'subfolder_duplicate_name' => '', +'subfolder_duplicate_name' => 'Nome sottocartella duplicato', 'submit_2_fact_auth' => 'Salva segreto', 'submit_approval' => 'Invio approvazione', 'submit_login' => 'Accedi', @@ -1658,9 +1683,9 @@ URL: [url]', 'submit_password_forgotten' => 'Inizio processo di recupero', 'submit_receipt' => 'Invio ricevuta', 'submit_review' => 'Invio revisione', -'submit_revision' => 'Aggiungere Revisione', +'submit_revision' => 'Aggiungi riesame', 'submit_userinfo' => 'Invio info utente', -'subsribe_timelinefeed' => '', +'subsribe_timelinefeed' => 'Iscriviti al feed della linea temporale', 'substitute_to_user' => 'Cambia in \'[username]\'', 'substitute_user' => 'Impersona utente', 'success_add_aro' => 'Aggiunto richiesta di accesso oggetto', @@ -1671,55 +1696,55 @@ URL: [url]', 'sunday_abbr' => 'Dom', 'sv_SE' => 'Svedese', 'switched_to' => 'Passato a', -'takeOverAttributeValue' => '', +'takeOverAttributeValue' => 'Riprendi il valore dell\'attributo dall\'ultima versione', 'takeOverGrpApprover' => 'Riprendi il gruppo degli approvatori dall\'ultima versione.', 'takeOverGrpReviewer' => 'Riprendi il gruppo dei revisori dall\'ultima versione.', 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.', 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.', -'tasks' => 'Compiti', -'task_description' => '', -'task_disabled' => '', -'task_frequency' => '', -'task_last_run' => '', -'task_name' => '', -'task_next_run' => '', +'tasks' => 'Attività', +'task_description' => 'Descrizione', +'task_disabled' => 'Disabilitata', +'task_frequency' => 'Frequenza', +'task_last_run' => 'Ultima esecuzione', +'task_name' => 'Nome', +'task_next_run' => 'Prossima esecuzione', 'temp_jscode' => 'Codice javascript temporaneo', 'testmail_body' => 'Questo messaggio di posta elettronica è solo un test per verificare la configurazione del repository', 'testmail_subject' => 'Messaggio di test', 'theme' => 'Tema', 'thursday' => 'Giovedì', 'thursday_abbr' => 'Gio', -'timeline' => 'Linea del Tempo', +'timeline' => 'Linea temporale', 'timeline_add_file' => 'Nuovo allegato', 'timeline_add_version' => 'Nuova versione [version]', 'timeline_full_add_file' => '[document]
      Nuovo attacco', 'timeline_full_add_version' => '[document]
      Nuovo versione [version]', -'timeline_full_scheduled_revision' => '', +'timeline_full_scheduled_revision' => '[document]
      Riesame della versione [version]', 'timeline_full_status_change' => '[document]
      Versione [version]: [status]', -'timeline_scheduled_revision' => '', +'timeline_scheduled_revision' => 'Riesame della versione [version]', 'timeline_selected_item' => 'Documento selezionato', 'timeline_skip_add_file' => 'allegato aggiunto', -'timeline_skip_scheduled_revision' => '', +'timeline_skip_scheduled_revision' => 'Riesame programmato', 'timeline_skip_status_change_-1' => 'respinto', 'timeline_skip_status_change_-3' => 'scaduto', 'timeline_skip_status_change_0' => 'in attesa di revisione', 'timeline_skip_status_change_1' => 'in attesa di approvazione', -'timeline_skip_status_change_2' => 'rilasciato', -'timeline_skip_status_change_3' => 'nel workflow', -'timeline_skip_status_change_4' => '', -'timeline_skip_status_change_5' => '', +'timeline_skip_status_change_2' => 'pubblicato', +'timeline_skip_status_change_3' => 'nel flusso di lavoro', +'timeline_skip_status_change_4' => 'in riesame', +'timeline_skip_status_change_5' => 'bozza', 'timeline_status_change' => 'Versione [version]: Stato', 'to' => 'A', 'toggle_manager' => 'Gestore', -'toggle_qrcode' => 'Mostri / nascondi codice QR', +'toggle_qrcode' => 'Mostri/nascondi codice QR', 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio', -'transfer_content' => '', -'transfer_document' => 'Trasferisci Documento', -'transfer_no_read_access' => 'L`utente non ha i permessi in lettura per la cartella', -'transfer_no_write_access' => 'L`utente non ha i permessi in scrittura per la cartella', -'transfer_objects' => '', -'transfer_objects_to_user' => '', -'transfer_to_user' => 'Trasferisci all`utente', +'transfer_content' => 'Trasferisci contenuto', +'transfer_document' => 'Trasferisci documento', +'transfer_no_read_access' => 'L\'utente non ha i permessi in lettura per la cartella', +'transfer_no_write_access' => 'L\'utente non ha i permessi in scrittura per la cartella', +'transfer_objects' => 'Trasferisci oggetti', +'transfer_objects_to_user' => 'Trasferisci all\'utente', +'transfer_to_user' => 'Trasferisci all\'utente', 'transition_triggered_email' => 'Inizio transizione del flusso di lavoro', 'transition_triggered_email_body' => 'Transizione del flusso di lavoro iniziata Documento: [name] @@ -1734,7 +1759,7 @@ URL: [url]', 'transition_triggered_email_subject' => 'Transizione del flusso di lavoro iniziata', 'transmittal' => 'Trasmissione', 'transmittalitem_removed' => 'Oggetto trasmissione rimosso', -'transmittalitem_updated' => 'Documento aggiornato alla ultima versione', +'transmittalitem_updated' => 'Documento aggiornato all\'ultima versione', 'transmittal_comment' => 'Commento', 'transmittal_name' => 'Nome', 'transmittal_size' => 'Dimensione', @@ -1794,7 +1819,7 @@ URL: [url]', 'use_comment_of_document' => 'Utilizza il commento al documento', 'use_default_categories' => 'Usa categorie predefinite', 'use_default_keywords' => 'Usa parole-chiave predefinite', -'valid_till' => '', +'valid_till' => 'Valido fino a', 'version' => 'Versione', 'versioning_file_creation' => 'Creazione file di versione', 'versioning_file_creation_warning' => 'Con questa operazione è possibile creare un file di backup delle informazioni di versione dei documenti di un\'intera cartella. Dopo la creazione ogni file viene salvato nella cartella del relativo documento.', @@ -1817,30 +1842,30 @@ URL: [url]', 'weeks' => 'settimane', 'week_view' => 'Vista settimana', 'workflow' => 'Flusso di lavoro', -'workflows_involded' => '', +'workflows_involded' => 'Coinvolto nel flusso di lavoro', 'workflow_actions_management' => 'Gestione azioni del flusso di lavoro', 'workflow_action_in_use' => 'Questa azione è attualmente usata da alcuni flussi di lavoro', 'workflow_action_name' => 'Nome', 'workflow_editor' => 'Modifica flussi di lavoro', 'workflow_group_summary' => 'Sommario di gruppo', -'workflow_has_cycle' => '', +'workflow_has_cycle' => 'Il flusso di lavoro ha un ciclo', 'workflow_initstate' => 'Stato iniziale', 'workflow_in_use' => 'Questo flusso di lavoro è attualmente usato da alcuni documenti', -'workflow_layoutdata_saved' => '', +'workflow_layoutdata_saved' => 'Dati di layout salvati', 'workflow_management' => 'Gestione flusso di lavoro', 'workflow_name' => 'Nome', -'workflow_no_doc_rejected_state' => '', -'workflow_no_doc_released_state' => '', -'workflow_no_initial_state' => '', +'workflow_no_doc_rejected_state' => 'Il documento non verrà rifiutato in uno stato di flusso di lavoro!', +'workflow_no_doc_released_state' => 'Il documento non verrà rilasciato in uno stato di flusso di lavoro!', +'workflow_no_initial_state' => 'Nessuna delle transizioni inizia con lo stato iniziale del flusso di lavoro!', 'workflow_no_states' => 'Prima di aggiungere un flusso di lavoro occorre definirne prima gli stati.', -'workflow_save_layout' => '', +'workflow_save_layout' => 'Salva layout', 'workflow_state' => 'Stato del flusso di lavoro', 'workflow_states_management' => 'Gestione stati del flusso di lavoro', 'workflow_state_docstatus' => 'Stato del documento', 'workflow_state_in_use' => 'Questo stato è attualmente usato da alcuni flussi di lavoro', 'workflow_state_name' => 'Nome', 'workflow_summary' => 'Riepilogo flusso di lavoro', -'workflow_transition_without_user_group' => '', +'workflow_transition_without_user_group' => 'Almeno una delle transizioni non ha un utente o un gruppo!', 'workflow_user_summary' => 'Riepilogo utenti', 'x_more_objects' => '[number] altri oggetti', 'year_view' => 'Vista anno', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index e70270c90..ed9171373 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -835,6 +835,7 @@ URL : [url]', 'no_action' => '조치가 필요하지 않습니다', 'no_approval_needed' => '승인을 보류하지 않습니다', 'no_attached_files' => '첨부 파일 없음', +'no_backup_dir' => '', 'no_current_version' => '당신은 이전 버전의 SeedDMS를 사용하고 있습니다. 사용 가능한 최신 버전은 [latestversion] 입니다.', 'no_default_keywords' => '사용 가능한 키워드가 존재하지 않습니다.', 'no_docs_checked_out' => '체크아웃 문서가 없습니다.', @@ -1306,6 +1307,8 @@ URL : [url]', 'settings_enableReceiptWorkflow_desc' => '문서의 수신 확인을 위해 워크플로어를 선택하고 활성화 합니다.', 'settings_enableRecursiveCount' => '재귀적 문서 / 폴더 수 사용', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '문서의 개정 허용', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 5796aba51..e53d12553 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -839,6 +839,7 @@ URL: [url]', 'no_action' => 'ບໍ່ຕ້ອງດຳເນີນການໄດໆ', 'no_approval_needed' => 'ຍັງບໍ່ມີການອະນຸມັດ', 'no_attached_files' => 'ບໍ່ມີການແນບໄຟລມາ', +'no_backup_dir' => '', 'no_current_version' => 'ເຈົ້າກຳລັງນຳໄຊ້ເວີຊັນເກົ່າຄື ຊິສ DMS. ສວນເວີຊັນທີ່ມີຢູ່ລ້າສຸດຄື [latestversion]', 'no_default_keywords' => 'ບໍ່ມີຄຳຫລັກ', 'no_docs_checked_out' => 'ບໍ່ມີເອກະສານທີ່ເອົາອອກໄປ', @@ -1339,6 +1340,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'ເປີດໄຊ້ງານການນັບເອກະສານ/ໂຟລເດີນັບຊໍ້າ', 'settings_enableRecursiveCount_desc' => 'ຫາກເປີດໄຊ້ງານຈຳນວນເອກະສານແລະໂຟລເດີໃນມຸມມອງຂອງໂຟລເດີຈະຖືກກຳນົດໂດຍນັບວັດຖຸທັງໝົດໂດຍປະມວນຜົນໂຟລເດີໂຟລເດີຊຳ, ນັບເກະສານ ແລະໂຟລເດີທີຜູ້ໄຊ້ສາມາດເຂົ້າເຖິງໄດ້', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'ເປີກການໄຊ້ງານການແກ້ໄຂເອກະສານ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 0a58e0506..20bc78f30 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (770), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (772), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( '2_factor_auth' => '2-factor-authenticatie', @@ -833,6 +833,7 @@ URL: [url]', 'no_action' => 'Geen actie nodig', 'no_approval_needed' => 'Geen goedkeuring gaande.', 'no_attached_files' => 'Geen bijlagen', +'no_backup_dir' => '', 'no_current_version' => 'U werkt met een oude versie van SeedDMS. De laatste versie beschikbaar is [latestversion].', 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar', 'no_docs_checked_out' => 'Geen documenten in gebruik genomen', @@ -955,7 +956,7 @@ URL: [url]', 'receipt_status' => 'Status ontvangst', 'receipt_summary' => 'Samenvatting', 'receipt_update_failed' => 'Update ontvangst mislukt', -'recent_uploads' => '', +'recent_uploads' => 'Recent Uploads', 'reception' => 'bestemming', 'reception_acknowleged' => 'bestemming OK', 'reception_noaction' => 'Geen actie', @@ -1336,6 +1337,8 @@ Name: [username] 'settings_enableReceiptWorkflow_desc' => 'Aanzetten workflow-stappen', 'settings_enableRecursiveCount' => 'Document/ map teller herhalen toestaan', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Herzieningsworkflow aanzetten', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 4716d5be8..75913e9ef 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (831), netixw (84), romi (93), uGn (112) +// Translators: Admin (832), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -822,6 +822,7 @@ URL: [url]', 'no_action' => 'Żadne działanie nie jest wymagane', 'no_approval_needed' => 'Nie ma dokumentów oczekujących na akceptację.', 'no_attached_files' => 'Brak załączonych plików', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'Nie ma słów kluczowych', 'no_docs_checked_out' => '', @@ -932,7 +933,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Najnowsze dodania', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1270,6 +1271,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Włącz licznik rekurencji dokumentu/folderu', 'settings_enableRecursiveCount_desc' => 'Jeżeli jest włączone, to liczba dokumentów i folderów w widoku będzie ustalona poprzez zliczenie wszystkich obiektów przez rekurencyjnie przetwarzane foldery i policzenia tych dokumentów i folderów do których użytkownik ma dostęp', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 790e080b6..46e715528 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1719), flaviove (627), lfcristofoli (352) +// Translators: Admin (1721), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => 'Autenticação de dois fatores', @@ -859,6 +859,7 @@ URL: [url]', 'no_action' => 'Nenhuma ação é requerida', 'no_approval_needed' => 'Nenhuma aprovação pendente.', 'no_attached_files' => 'Não há arquivos anexados', +'no_backup_dir' => '', 'no_current_version' => 'Você está executando uma versão antiga do SeedDMS. A última versão disponível é [latestversion].', 'no_default_keywords' => 'não há palavras-chave disponíveis', 'no_docs_checked_out' => 'Nenhum documento retirado', @@ -980,7 +981,7 @@ URL: [url]', 'receipt_status' => 'Estado', 'receipt_summary' => 'Resumo da entrada', 'receipt_update_failed' => 'Confirmação de entrada falhou', -'recent_uploads' => '', +'recent_uploads' => 'Uploads recentes', 'reception' => 'Entrada', 'reception_acknowleged' => 'Entrada reconhecida', 'reception_noaction' => 'Nenhuma ação', @@ -1358,8 +1359,10 @@ Nome: [username] 'settings_enableReceiptWorkflow_desc' => 'Habilitar para ativar o fluxo de trabalho para confirmar a entrada do documento.', 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva', 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva proceáando as pastas e contando eáes documentos e pastas que o usuário tem permissão de acesso.', -'settings_enableRevisionOnVoteReject' => 'Rejeitar por um revisor', -'settings_enableRevisionOnVoteReject_desc' => 'Se definido, o documento será rejeitado se um revisor rejeitar o documento.', +'settings_enableRevisionOneVoteReject' => 'Rejeitar por um revisor', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Habilitar revisão de documentos', 'settings_enableRevisionWorkflow_desc' => 'Habilitar para poder executar o fluxo de trabalho para revisar um documento após um determinado período de tempo.', 'settings_enableSelfReceipt' => 'Permitir a recepção de documentos para usuário conectado', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index fab5e2718..eae81c265 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1086), balan (87) +// Translators: Admin (1087), balan (87) $text = array( '2_factor_auth' => '', @@ -834,6 +834,7 @@ URL: [url]', 'no_action' => 'Nici o acțiune necesară', 'no_approval_needed' => 'Nici o aprobare în așteptare.', 'no_attached_files' => 'Nu sunt fișiere atașate', +'no_backup_dir' => '', 'no_current_version' => 'Utilizați o versiune veche de SeedDMS. Cea mai recentă versiune disponibilă este [latestversion].', 'no_default_keywords' => 'Nu există cuvinte cheie disponibile', 'no_docs_checked_out' => 'Nu exista documente verificate', @@ -944,7 +945,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Incarcari recente', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1313,6 +1314,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Activați numararea recursiva pentru documente/foldere', 'settings_enableRecursiveCount_desc' => 'Dacă este activată, numărul de documente și foldere din vizualizarea unui director va fi determinat prin numărarea tuturor obiectelor recursiv din folderele unde accesul utilizatorului este permis.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 164a90bb5..94cc06907 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1669) +// Translators: Admin (1671) $text = array( '2_factor_auth' => 'Двухфакторная аутентификация', @@ -531,7 +531,7 @@ URL: [url]', 'extension_manager' => 'Управление расширениями', 'extension_mgr_installed' => '', 'extension_mgr_no_upload' => '', -'extension_mgr_repository' => '', +'extension_mgr_repository' => 'Установленные', 'extension_version_list' => '', 'february' => 'Февраль', 'file' => 'Файл', @@ -833,6 +833,7 @@ URL: [url]', 'no_action' => 'Действие не требуется', 'no_approval_needed' => 'Утверждение не требуется', 'no_attached_files' => 'Нет вложений', +'no_backup_dir' => '', 'no_current_version' => 'Вы используете старую версию SeedDMS. Последняя доступная версия [latestversion].', 'no_default_keywords' => 'Нет меток', 'no_docs_checked_out' => 'Нет документов на рассмотрении', @@ -946,7 +947,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => 'Сводка по получению', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Последние загрузки', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1320,6 +1321,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => 'Включить для активации функции подтверждения получения документа', 'settings_enableRecursiveCount' => 'Рекурсивно подсчитывать
      документы и каталоги', 'settings_enableRecursiveCount_desc' => 'Если включено, количество документов и каталогов в виде каталога будет определятся рекурсивным подсчётом всех документов и каталогов разрешённых для доступа пользователя.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Включить процесс ревизии', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 652190545..752d1e628 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1225), destinqo (19), pS2017 (508), ssebech (4) +// Translators: Admin (1226), destinqo (19), pS2017 (508), ssebech (4) $text = array( '2_factor_auth' => '2-faktorové overovanie', @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'Nič sa nevykoná', 'no_approval_needed' => 'Neprebieha žiadne schvaľovanie.', 'no_attached_files' => 'Žiadne prílohy', +'no_backup_dir' => '', 'no_current_version' => 'Neaktualizovaná verzia', 'no_default_keywords' => 'Nie sú dostupné žiadne kľúčové slová.', 'no_docs_checked_out' => 'No documents checked out', @@ -1360,8 +1361,10 @@ Meno: [username] 'settings_enableReceiptWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableRecursiveCount' => 'Enable recursive document/folder count', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', -'settings_enableRevisionOnVoteReject' => 'Reject by one revisor', -'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be reject if one revisor rejects the document.', +'settings_enableRevisionOneVoteReject' => 'Reject by one revisor', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Povoliť revíziu dokumentov', 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.', 'settings_enableSelfReceipt' => 'Allow reception of documents for logged in user', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 1607dd21f..327b150f0 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1160), MagnusI (649), tmichelfelder (106) +// Translators: Admin (1161), MagnusI (649), tmichelfelder (106) $text = array( '2_factor_auth' => '2-faktors autentisering', @@ -847,6 +847,7 @@ URL: [url]', 'no_action' => 'Ingen åtgärd behövs.', 'no_approval_needed' => 'Inget godkännande behövs.', 'no_attached_files' => 'Inga filer har bifogats.', +'no_backup_dir' => '', 'no_current_version' => 'Du har en gammal version av SeedDMS. Senaste versionen är [latestversion].', 'no_default_keywords' => 'Inga nyckelord tillgängliga', 'no_docs_checked_out' => 'Inga utcheckade dokument', @@ -954,7 +955,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.', 'receipt_status' => 'Status', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Senast uppladdat', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => 'Ingen åtgärd', @@ -1333,6 +1334,8 @@ Kommentar: [comment]', 'settings_enableReceiptWorkflow_desc' => 'Aktivera notifiering av meddelanden i arbetsflödet.', 'settings_enableRecursiveCount' => 'Aktivera rekursiv räkning av dokument/katalog', 'settings_enableRecursiveCount_desc' => 'Om detta sätts på, kommer antal dokument och kataloger i katalogvyn fastställas genom att räkna alla objekter via rekursiv hantering av alla kataloger och räkna dessa dokument och kataloger som användaren har rättigheter till.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Aktivera revidering av dokument', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index fa3a9b4ca..63b1ba7a3 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1087), aydin (83) +// Translators: Admin (1089), aydin (83) $text = array( '2_factor_auth' => '', @@ -828,6 +828,7 @@ URL: [url]', 'no_action' => 'İşlem gerekmiyor', 'no_approval_needed' => 'Onay bekleyen yok.', 'no_attached_files' => 'Ek dosya yok', +'no_backup_dir' => '', 'no_current_version' => 'Kullandığınız SeedDMS versiyonu eski görünüyor. Son versiyon [latestversion].', 'no_default_keywords' => 'Anahtar kelime yok', 'no_docs_checked_out' => '', @@ -940,7 +941,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'En son yüklenenler', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1292,6 +1293,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Özyinelenen doküman/klasör sayımını etkinleştir', 'settings_enableRecursiveCount_desc' => 'Aktif hale getirildiğinde, klasör içindeki dokümanlar ve diğer klasörlerin sayısı kullanıcının erişim hakkı olan tüm nesnelerin özyinelemeli olarak sayılması yolu ile bulunur.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 1379c1e32..2d6dc128c 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1338) +// Translators: Admin (1339) $text = array( '2_factor_auth' => '', @@ -833,6 +833,7 @@ URL: [url]', 'no_action' => 'Дій не потрібно', 'no_approval_needed' => 'Затвердження не потрібно', 'no_attached_files' => 'Немає додатків', +'no_backup_dir' => '', 'no_current_version' => 'Ви використовуєте застарілу версію SeedDMS. Остання версія [latestversion].', 'no_default_keywords' => 'Немає ключових слів', 'no_docs_checked_out' => 'Немає документів на опрацюванні', @@ -946,7 +947,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => 'Підсумки отримання', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Останні завантаження', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1313,6 +1314,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу', 'settings_enableRecursiveCount' => 'Рекурсивно підраховувати
      документи і каталоги', 'settings_enableRecursiveCount_desc' => 'Якщо увімкнено, кількість документів і каталогів при перегляді каталогу буде підраховано рекурсивно для всіх документів до яких користувач має доступ.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Увімкнути процес ревізії', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index e688f1a7f..6b1896a55 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (765), archonwang (469), fengjohn (5), yang86 (1) +// Translators: Admin (766), archonwang (469), fengjohn (5), yang86 (1) $text = array( '2_factor_auth' => '双重认证', @@ -830,6 +830,7 @@ URL: [url]', 'no_action' => '无动作请求', 'no_approval_needed' => '无待审核的文件', 'no_attached_files' => '无附件', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => '无关键字', 'no_docs_checked_out' => '文档未签出', @@ -945,7 +946,7 @@ URL: [url]', 'receipt_status' => '状态', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => '最近上传', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1294,6 +1295,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '启用文档修订记录', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 207cfce69..14e0e47e3 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2417) +// Translators: Admin (2418) $text = array( '2_factor_auth' => '', @@ -731,6 +731,7 @@ URL: [url]', 'no_action' => '無動作請求', 'no_approval_needed' => '無待審核的檔', 'no_attached_files' => '無附件', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => '無關鍵字', 'no_docs_checked_out' => '', @@ -827,7 +828,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => '最近上傳', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1143,6 +1144,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', From 296e55e4814bdcc0b0a4d71871f4be27b9547c63 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 22 Oct 2019 06:57:08 +0200 Subject: [PATCH 219/467] add update of italian translation to 5.1.13 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index b9d21eb00..66d9ed9b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ set to 'traditional without review'. - turn off auto complete for date fields - new hook pageNavigationBar in bootstrap, preContent, postContent in ViewDocument +- major update of italian translation -------------------------------------------------------------------------------- Changes in version 5.1.12 From 40dee4b9d2f9b8910bc71899597134c8cc570187 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 23 Oct 2019 09:05:04 +0200 Subject: [PATCH 220/467] hook addDocumentContentAttribute and addDocumentAttribute may return a string --- views/bootstrap/class.AddDocument.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 7d4c25ee9..156ba0904 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -285,6 +285,8 @@ $(document).ready(function() { if($arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr)) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, '')); } @@ -342,6 +344,8 @@ $(document).ready(function() { $arr = $this->callHook('addDocumentContentAttribute', null, $attrdef); if(is_array($arr)) { $this->formField($arr[0], $arr[1]); + } elseif(is_string($arr)) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, '', 'attributes_version')); } From 75f3afdc84d63d28f297ad6bcf2ecf8ee0f502f6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 23 Oct 2019 09:06:19 +0200 Subject: [PATCH 221/467] new hooks processConfig and showConfig hook 'showConfig' is anly called for extension variables if the type is set to 'hook'. 'processConfig' is called after the extension configuration is read --- views/bootstrap/class.Settings.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index c627bf913..a83cdf384 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -474,6 +474,8 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> $extconf) { + if($this->hasHook('processConfig')) + $extconf = $this->callHook('processConfig', $extname, $extconf); if($extconf['config']) { $this->showRawConfigHeadline("".$extconf['title']); foreach($extconf['config'] as $confkey=>$conf) { @@ -565,11 +567,14 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); } } break; + case 'hook': + echo $this->callHook('showConfig', $confkey, $extname, $extconf); + break; default: $this->showTextField("extensions[".$extname."][".$confkey."]", isset($settings->_extensions[$extname][$confkey]) ? $settings->_extensions[$extname][$confkey] : '', isset($conf['type']) ? $conf['type'] : '', isset($conf['placeholder']) ? $conf['placeholder'] : ''); } $html = ob_get_clean(); - $this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html); + $this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html); } } } From 38f2759c5fcef1d7dfd3fe4f904fefb076c9d7eb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 23 Oct 2019 09:08:53 +0200 Subject: [PATCH 222/467] extension config vars are only save to settings.xml if a value is set previously even empty values has been saved, they just needed to be defined in the extension configuration. This may break extensions which do not check if a config var is set. --- inc/inc.ClassSettings.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 6eb59977d..5561d2fd4 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -1039,12 +1039,27 @@ class Settings { /* {{{ */ { // search XML node $extnode = $extnodes->addChild('extension'); - $this->setXMLAttributValue($extnode, 'name', $name); + $this->setXMLAttributValue($extnode, 'name', $name); + /* New code saves all parameters of the extension which have been set + * in configuration form. + */ + foreach($extension as $fieldname=>$confvalue) { + if($confvalue) { + $parameter = $extnode->addChild('parameter'); + $parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : ''; + $this->setXMLAttributValue($parameter, 'name', $fieldname); + } + } + /* Old code saves those parameters listed in the configuration + * of the extension. + */ + /* foreach($GLOBALS['EXT_CONF'][$name]['config'] as $fieldname=>$conf) { $parameter = $extnode->addChild('parameter'); $parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : ''; $this->setXMLAttributValue($parameter, 'name', $fieldname); } + */ } // foreach From 65212329a74909579110a6af01b71ed2c570c6db Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 08:23:27 +0100 Subject: [PATCH 223/467] fix invaled xml --- SeedDMS_Core/package.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index a791f4370..9447260fe 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -1660,7 +1660,6 @@ fix php warning if workflow state doesn' have next transition add method SeedDMS_Core_DatabaseAccess::setLogFp() - 2019-05-03 From ee88f44693067944ad3f70075cc1cb4fa0fd2ddb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 09:14:07 +0100 Subject: [PATCH 224/467] fix php warning $iRev is probably not needed anymore, but kept for now --- views/bootstrap/class.MyDocuments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index a3a25d66a..9e5da1249 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -143,12 +143,12 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $docIdx[$res["id"]][$res["version"]] = $res; } + $iRev = array(); // List the documents where a review has been requested. if($workflowmode == 'traditional') { $this->contentHeading(getMLText("documents_to_review")); $this->contentContainerStart(); $printheader=true; - $iRev = array(); $dList = array(); foreach ($reviewStatus["indstatus"] as $st) { From b705fdab44f599b8838451f08642bb9bbd058b42 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 09:26:35 +0100 Subject: [PATCH 225/467] fix up to parent button on ViewFolder page --- views/bootstrap/class.ViewFolder.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index b45acfff2..ab433cfeb 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -163,6 +163,15 @@ console.log("location: " + document.location + ", state: " + JSON.stringify(even console.log(JSON.stringify(event.state)); window.location = document.location; }; +/* catch click on 'goto parent button' */ +$('body').on('click', '#goto-parent', function(ev) { + attr_id = $(ev.currentTarget).data('parentid'); + folderSelected(attr_id, ''); + $([document.documentElement, document.body]).animate({ + scrollTop: 200 + }, 200); +}); +/* catch click on a folder row in the list folders and documents */ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) { attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; folderSelected(attr_id, ''); @@ -170,6 +179,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) scrollTop: 200 }, 200); }); +/* catch click on a document row in the list folders and documents */ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; @@ -326,7 +336,7 @@ $('body').on('click', '.order-btn', function(ev) { else { print ""; print "\n\n"; - print "\n"; + print "\n"; print ""; + return "getName(), ENT_QUOTES)."\">"; } /* }}} */ function documentListRowEnd($document) { /* {{{ */ @@ -2422,7 +2422,7 @@ $(document).ready( function() { * @return string starting tr tag for a table */ function folderListRowStart($folder, $class='') { /* {{{ */ - return "getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget".($class ? ' '.$class : '')."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">"; + return "getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget".($class ? ' '.$class : '')."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\">"; } /* }}} */ function folderListRowEnd($folder) { /* {{{ */ From b9bbb8739f28ba53a26a6ac046693ac115d6c29c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2019 19:55:55 +0100 Subject: [PATCH 231/467] add action data (currently not used) --- views/bootstrap/class.ViewFolder.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index ab433cfeb..3feed0202 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -36,6 +36,16 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { + function data() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + + $jsondata = array('name'=>$folder->getName()); + header('Content-Type: application/json'); + echo json_encode($jsondata); + } /* }}} */ + function getAccessModeText($defMode) { /* {{{ */ switch($defMode) { case M_NONE: From ff0d550144657874d506ca11789731fb86c4fec1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2019 19:56:43 +0100 Subject: [PATCH 232/467] show target and source document/folder when moving on object --- styles/bootstrap/application.js | 54 ++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 217d1c3a7..dfba97ef8 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -20,6 +20,17 @@ chzn_template_func = function (state) { var $newstate = $(html); return $newstate; }; +function escapeHtml(text) { + var map = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''' + }; + + return text.replace(/[&<>"']/g, function(m) { return map[m]; }); +} $(document).ready( function() { /* close popovers when clicking somewhere except in the popover or the * remove icon @@ -166,9 +177,7 @@ $(document).ready( function() { { command: 'addtoclipboard', type: type, id: id }, function(data) { if(data.success) { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') noty({ text: attr_msg, @@ -203,9 +212,7 @@ $(document).ready( function() { { command: 'removefromclipboard', type: type, id: id }, function(data) { if(data.success) { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') noty({ text: attr_msg, @@ -443,9 +450,7 @@ $(document).ready( function() { success: function(data){ if(data.success) { if(element.data('param1') == 'command=clearclipboard') { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') } noty({ @@ -481,16 +486,12 @@ function onAddClipboard(ev) { /* {{{ */ source_type = source_info.type; source_id = source_info.id; formtoken = source_info.formtoken; -// source_type = ev.originalEvent.dataTransfer.getData("type"); -// source_id = ev.originalEvent.dataTransfer.getData("id"); if(source_type == 'document' || source_type == 'folder') { $.get('../op/op.Ajax.php', { command: 'addtoclipboard', type: source_type, id: source_id }, function(data) { if(data.success) { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') noty({ text: data.message, @@ -757,6 +758,7 @@ $(document).ready(function() { /* {{{ */ attr_rel = $(e.currentTarget).data('droptarget'); target_type = attr_rel.split("_")[0]; target_id = attr_rel.split("_")[1]; + target_name = $(e.currentTarget).data('name') if(target_type == 'folder') { var files = e.originalEvent.dataTransfer.files; if(files.length > 0) { @@ -769,7 +771,10 @@ $(document).ready(function() { /* {{{ */ formtoken = source_info.formtoken; console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id); if(source_type == 'document') { - bootbox.dialog(trans.confirm_move_document, [{ + var bootbox_message = trans.confirm_move_document; + if(source_info.name) + bootbox_message += "

      "+escapeHtml(source_info.name)+' '+escapeHtml(target_name)+"

      "; + bootbox.dialog(bootbox_message, [{ "label" : " "+trans.move_document, "class" : "btn-danger", "callback": function() { @@ -810,7 +815,10 @@ $(document).ready(function() { /* {{{ */ url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id; // document.location = url; } else if(source_type == 'folder' && source_id != target_id) { - bootbox.dialog(trans.confirm_move_folder, [{ + var bootbox_message = trans.confirm_move_folder; + if(source_info.name) + bootbox_message += "

      "+escapeHtml(source_info.name)+' '+escapeHtml(target_name)+"

      "; + bootbox.dialog(bootbox_message, [{ "label" : " "+trans.move_folder, "class" : "btn-danger", "callback": function() { @@ -947,8 +955,22 @@ $(document).ready(function() { /* {{{ */ var dragStartInfo = { id : attr_rel.split("_")[1], type : "folder", - formtoken : $(e.target).attr('formtoken') + formtoken : $(e.target).attr('formtoken'), + name: $(e.target).data('name') }; + /* Currently not used + $.ajax({url: '../out/out.ViewFolder.php', + type: 'GET', + dataType: "json", + data: {action: 'data', folderid: attr_rel.split("_")[1]}, + success: function(data) { + if(data) { + dragStartInfo.source = data; + } + }, + timeout: 3000 + }); + */ e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); }); @@ -959,7 +981,8 @@ $(document).ready(function() { /* {{{ */ var dragStartInfo = { id : attr_rel.split("_")[1], type : "document", - formtoken : $(e.target).attr('formtoken') + formtoken : $(e.target).attr('formtoken'), + name: $(e.target).data('name') }; e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); }); @@ -1014,9 +1037,6 @@ $(document).ready(function() { /* {{{ */ source_type = source_info.type; source_id = source_info.id; formtoken = source_info.formtoken; -// source_type = e.originalEvent.dataTransfer.getData("type"); -// source_id = e.originalEvent.dataTransfer.getData("id"); -// formtoken = e.originalEvent.dataTransfer.getData("formtoken"); if(source_type == 'document') { bootbox.dialog(trans.confirm_move_document, [{ "label" : " "+trans.move_document, From 1c08d8370421edc907febee773db9050cb21a2a2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2019 21:59:02 +0100 Subject: [PATCH 233/467] need M_ALL to set revisor --- inc/inc.ClassAccessOperation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index 14dd07413..fca3e73b1 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -187,7 +187,7 @@ class SeedDMS_AccessOperation { if($document->isType('document')) { if($latestContent = $document->getLatestContent()) { $status = $latestContent->getStatus(); - if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) { + if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) { return true; } } From 7362bf192b176345d7e909b0b952ee8af8221203 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 8 Nov 2019 08:03:02 +0100 Subject: [PATCH 234/467] add method check_access() just like in SeedDMS_View_Common --- inc/inc.ClassControllerCommon.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php index 618fc1ca3..8b465568c 100644 --- a/inc/inc.ClassControllerCommon.php +++ b/inc/inc.ClassControllerCommon.php @@ -246,4 +246,25 @@ class SeedDMS_Controller_Common { return false; } /* }}} */ + /** + * Check if the access on the contoller with given name or the current + * controller itself may be accessed. + * + * The function requires the parameter 'accessobject' to be available in the + * controller, because it calls SeedDMS_AccessOperation::check_controller_access() + * to check access rights. If the the optional $name is not set the + * current controller is used. + * + * @param string|array $name name of controller or list of controller names + * @return boolean true if access is allowed otherwise false + */ + protected function check_access($name='') { /* {{{ */ + if(!$name) + $name = $this; + if(!isset($this->params['accessobject'])) + return false; + $access = $this->params['accessobject']->check_controller_access($name); + return $access; + } /* }}} */ + } From 4f28cd19d14801daa5586434638ccc990d2201db Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Nov 2019 15:39:47 +0100 Subject: [PATCH 235/467] show preview for all images supported by browser --- views/bootstrap/class.ViewDocument.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index ffb59411b..27461d1a1 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -384,6 +384,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { contentHeading(getMLText("preview")); ?> From 28e25498664faf90a3aabb4b8ad5653b87deb7e0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 12 Nov 2019 15:22:00 +0100 Subject: [PATCH 236/467] menuTasks returns complete menuItem --- styles/bootstrap/application.js | 2 +- views/bootstrap/class.Bootstrap.php | 9 +++++---- views/bootstrap/class.Tasks.php | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index dfba97ef8..55d587257 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -1162,7 +1162,7 @@ $(document).ready(function() { /* {{{ */ if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) || (typeof data.data.review != 'undefined' && review_count != data.data.review.length) || (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) { - $("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') + $("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0; review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0; workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0; diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 95b11d2ea..d8c148740 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -336,11 +336,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if($this->params['enablemenutasks']) { echo "
      "; - echo "
        \n"; - echo "
      • \n"; + echo "
        "; +// echo "
          \n"; +// echo "
        • \n"; // echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array())); - echo "
          • \n"; - echo "
        \n"; +// echo "
        • \n"; +// echo "
      \n"; echo "
      "; //$this->addFooterJS('checkTasks();'); } diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php index 4a8572366..8146e9beb 100644 --- a/views/bootstrap/class.Tasks.php +++ b/views/bootstrap/class.Tasks.php @@ -138,8 +138,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $tasks = $this->__myTasks(); $content = ''; -// $content .= " \n"; + $content .= " \n"; + $content .= " \n"; echo $content; } /* }}} */ From 05f7807b05c71ceae2fa693754816daf7e95ca57 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 12 Nov 2019 15:28:19 +0100 Subject: [PATCH 237/467] use update on div.ajax for updating tasks in menu --- styles/bootstrap/application.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 55d587257..da9d4e291 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -1162,7 +1162,8 @@ $(document).ready(function() { /* {{{ */ if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) || (typeof data.data.review != 'undefined' && review_count != data.data.review.length) || (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) { - $("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') +// $("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') + $('#menu-tasks > div.ajax').trigger('update', {folderid: seeddms_folder}); approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0; review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0; workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0; From 2b00423225e9263c0da0d72d7891e90bdc157d42 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 07:25:53 +0100 Subject: [PATCH 238/467] get latest version for later checking could be used to filter out older documents --- views/bootstrap/class.RemoveUserFromProcesses.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index f8cca27e3..0d1e7c5ca 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -54,6 +54,8 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $reviewStatus = $rmuser->getReviewStatus(); $tmpr = array(); foreach($reviewStatus['indstatus'] as $ri) { + $doc = $dms->getDocument($ri['documentID']); + $ri['latest'] = $doc->getLatestContent()->getVersion(); if(isset($tmpr[$ri['status']])) $tmpr[$ri['status']][] = $ri; else @@ -63,6 +65,8 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $approvalStatus = $rmuser->getApprovalStatus(); $tmpa = array(); foreach($approvalStatus['indstatus'] as $ai) { + $doc = $dms->getDocument($ri['documentID']); + $ai['latest'] = $doc->getLatestContent()->getVersion(); if(isset($tmpa[$ai['status']])) $tmpa[$ai['status']][] = $ai; else From 096b117e348fb2e7f4426591980d46c79f9f6e05 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 08:46:43 +0100 Subject: [PATCH 239/467] create access object --- out/out.RemoveUser.php | 1 + out/out.RemoveUserFromProcesses.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/out/out.RemoveUser.php b/out/out.RemoveUser.php index f2289f49a..08b6b161c 100644 --- a/out/out.RemoveUser.php +++ b/out/out.RemoveUser.php @@ -57,6 +57,7 @@ $allusers = $dms->getAllUsers($settings->_sortUsersInList); if($view) { $view->setParam('rmuser', $rmuser); $view->setParam('allusers', $allusers); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.RemoveUserFromProcesses.php b/out/out.RemoveUserFromProcesses.php index 61aedcbb3..682c84219 100644 --- a/out/out.RemoveUserFromProcesses.php +++ b/out/out.RemoveUserFromProcesses.php @@ -20,6 +20,7 @@ if(!isset($settings)) require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); require_once("inc/inc.Language.php"); require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); @@ -29,9 +30,9 @@ require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); - -if (!$user->isAdmin()) { - UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); +if (!$accessop->check_view_access($view, $_GET)) { + UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax); } if (!isset($_GET["userid"]) || !is_numeric($_GET["userid"]) || intval($_GET["userid"])<1) { @@ -49,6 +50,7 @@ if ($rmuser->getID()==$user->getID()) { if($view) { $view->setParam('rmuser', $rmuser); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } From 3a62afd084ee0ee4640770a515c33f3558b4d6e7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 09:34:41 +0100 Subject: [PATCH 240/467] count processes in latest version --- .../class.RemoveUserFromProcesses.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index 0d1e7c5ca..ab3d8d27a 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -53,9 +53,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { getReviewStatus(); $tmpr = array(); + $cr = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($reviewStatus['indstatus'] as $ri) { $doc = $dms->getDocument($ri['documentID']); $ri['latest'] = $doc->getLatestContent()->getVersion(); + if($ri['latest'] == $ri['version']) + $cr[$ri['status']]++; if(isset($tmpr[$ri['status']])) $tmpr[$ri['status']][] = $ri; else @@ -64,9 +67,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $approvalStatus = $rmuser->getApprovalStatus(); $tmpa = array(); + $ca = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($approvalStatus['indstatus'] as $ai) { $doc = $dms->getDocument($ri['documentID']); $ai['latest'] = $doc->getLatestContent()->getVersion(); + if($ai['latest'] == $ai['version']) + $ca[$ai['status']]++; if(isset($tmpa[$ai['status']])) $tmpa[$ai['status']][] = $ai; else @@ -77,7 +83,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -86,7 +92,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -95,7 +101,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -105,7 +111,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -114,7 +120,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -123,7 +129,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      From e20d4e492f5dcee8847b13717639eb55182d22fb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 10:03:55 +0100 Subject: [PATCH 241/467] output processes in old versions --- .../class.RemoveUserFromProcesses.php | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index cf01299d1..db1f8ad60 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -81,7 +81,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $receiptStatus = $rmuser->getReceiptStatus(); $tmpb = array(); + $cb = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($receiptStatus['indstatus'] as $ai) { + $doc = $dms->getDocument($ai['documentID']); + $ai['latest'] = $doc->getLatestContent()->getVersion(); + if($ai['latest'] == $ai['version']) + $cb[$ai['status']]++; if(isset($tmpb[$ai['status']])) $tmpb[$ai['status']][] = $ai; else @@ -90,7 +95,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $revisionStatus = $rmuser->getRevisionStatus(); $tmpc = array(); + $cc = array("-3"=>0, "-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($revisionStatus['indstatus'] as $ai) { + $doc = $dms->getDocument($ai['documentID']); + $ai['latest'] = $doc->getLatestContent()->getVersion(); + if($ai['latest'] == $ai['version']) + $cc[$ai['status']]++; if(isset($tmpc[$ai['status']])) $tmpc[$ai['status']][] = $ai; else @@ -157,7 +167,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -166,7 +176,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -175,7 +185,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -185,7 +195,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -194,7 +204,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -203,7 +213,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      @@ -212,7 +222,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
      From 4aef495c03c62e8585c70230ac3f78ac282dfd1b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 10:04:49 +0100 Subject: [PATCH 242/467] fix wrong counting of documents --- views/bootstrap/class.RemoveUserFromProcesses.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index ab3d8d27a..768f09c49 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -69,7 +69,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $tmpa = array(); $ca = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($approvalStatus['indstatus'] as $ai) { - $doc = $dms->getDocument($ri['documentID']); + $doc = $dms->getDocument($ai['documentID']); $ai['latest'] = $doc->getLatestContent()->getVersion(); if($ai['latest'] == $ai['version']) $ca[$ai['status']]++; From 5ab528af72aeb7a6a1747f61e7ad04ff4d7753c7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 10:28:51 +0100 Subject: [PATCH 243/467] many more translation and new keys --- languages/ar_EG/lang.inc | 24 +++++++++++++++++++----- languages/bg_BG/lang.inc | 14 ++++++++++++++ languages/ca_ES/lang.inc | 14 ++++++++++++++ languages/cs_CZ/lang.inc | 14 ++++++++++++++ languages/de_DE/lang.inc | 16 +++++++++++++++- languages/el_GR/lang.inc | 14 ++++++++++++++ languages/en_GB/lang.inc | 16 +++++++++++++++- languages/es_ES/lang.inc | 28 +++++++++++++++++++++------- languages/fr_FR/lang.inc | 18 ++++++++++++++++-- languages/hr_HR/lang.inc | 14 ++++++++++++++ languages/hu_HU/lang.inc | 14 ++++++++++++++ languages/it_IT/lang.inc | 14 ++++++++++++++ languages/ko_KR/lang.inc | 14 ++++++++++++++ languages/lo_LA/lang.inc | 14 ++++++++++++++ languages/nl_NL/lang.inc | 14 ++++++++++++++ languages/pl_PL/lang.inc | 30 ++++++++++++++++++++++-------- languages/pt_BR/lang.inc | 14 ++++++++++++++ languages/ro_RO/lang.inc | 26 ++++++++++++++++++++------ languages/ru_RU/lang.inc | 28 +++++++++++++++++++++------- languages/sk_SK/lang.inc | 14 ++++++++++++++ languages/sv_SE/lang.inc | 14 ++++++++++++++ languages/tr_TR/lang.inc | 14 ++++++++++++++ languages/uk_UA/lang.inc | 14 ++++++++++++++ languages/zh_CN/lang.inc | 14 ++++++++++++++ languages/zh_TW/lang.inc | 14 ++++++++++++++ 25 files changed, 387 insertions(+), 37 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 6a99a05a9..fe76d37c6 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1307) +// Translators: Admin (1311) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'و', 'apply' => 'تطبيق', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'طلب الموافقة تم الغاؤه', @@ -425,13 +428,14 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'ملف من مجلد التجميع', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'رفع سريع', 'drop_files_here' => 'أفلت الملفات هنا!', 'dump_creation' => 'انشاء مستخرج من قاعدة البيانات', 'dump_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف مستخرج من محتوى قاعدة البيانات. بعد انشاء الملف المستخرج سيتم حفظه في مجلد البيانات الخاص بسيرفرك', 'dump_list' => 'ملف مستخرج حالي', 'dump_remove' => 'ازالة الملف المستخرج', -'duplicates' => '', +'duplicates' => 'ﻢﻛﺭﺭﺓ', 'duplicate_content' => '', 'edit' => 'تعديل', 'edit_attributes' => 'تعديل السمات', @@ -913,8 +917,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => 'اقصى مساحة للقرص الصلب تم تعديها بمقدار [bytes]. من فضلك قم بمسح بعض المستندات او اصدارات سابقة منها', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -925,7 +932,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'ﺂﺧﺭ ﺎﻠﻤﻠﻓﺎﺗ ﺎﻠﻣﺮﻓﻮﻋﺓ"', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -978,8 +985,11 @@ URL: [url]', 'reviewer_already_assigned' => 'بالفعل تم تخصيصة كمراجع', 'reviewer_already_removed' => 'بالفعل تم ازالته من عملية المراجعة او تم تقديمه للمراجعة', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'طلب المراجعة تم مسحه', @@ -1007,9 +1017,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1657,8 +1671,8 @@ URL: [url]', 'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_scheduled_revision' => '', -'timeline_skip_status_change_-1' => '', -'timeline_skip_status_change_-3' => '', +'timeline_skip_status_change_-1' => 'ﻡﺮﻓﻮﺿﺓ', +'timeline_skip_status_change_-3' => 'ﻢﻨﺘﻬﻳﺓ', 'timeline_skip_status_change_0' => '', 'timeline_skip_status_change_1' => '', 'timeline_skip_status_change_2' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 83741c002..a35fb8e69 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -86,11 +86,14 @@ $text = array( 'and' => 'и', 'apply' => 'Приложи', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Запитване за утвърждаване за изтрит', @@ -378,6 +381,7 @@ $text = array( 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Файл от drop папка', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Бърз ъплоуд', 'drop_files_here' => 'Пусни файла тук!', 'dump_creation' => 'Създаване дъмп на БД', @@ -812,8 +816,11 @@ $text = array( 'quota_is_disabled' => '', 'quota_warning' => 'Вашето max. използуване на диска е превишена с [bytes]. Please remove documents or previous versions.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -861,8 +868,11 @@ $text = array( 'reviewer_already_assigned' => 'вече назначено за рецензиране', 'reviewer_already_removed' => 'вече премахнат от списъка с рецензиращи или вече е оставил рецензия', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Запитване за рецензия премахнато', @@ -883,9 +893,13 @@ $text = array( 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 01bcbb405..d7b84ca99 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -86,11 +86,14 @@ $text = array( 'and' => 'i', 'apply' => 'Apply', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Demanda d\'aprovació esborrada', @@ -383,6 +386,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '', 'dropfolder_folder' => 'Carpeta', +'dropfolder_metadata' => '', 'dropupload' => 'Pujada ràpida', 'drop_files_here' => 'Dugui arxius aquí', 'dump_creation' => 'Creació de bolcat de BDD', @@ -817,8 +821,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => '', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -866,8 +873,11 @@ URL: [url]', 'reviewer_already_assigned' => 'Ja està asignat com revisor', 'reviewer_already_removed' => 'Ja ha estat eliminat del procés de revisió o ja ha enviat una revisió', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Petició de revisió eliminada', @@ -888,9 +898,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index bc0faaec4..48e05feb7 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'a', 'apply' => 'Použít', 'approvals_accepted' => '[no_approvals] schválení již schváleno', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] schválení a [no_reviews] recenzí již přijato', 'approvals_and_reviews_not_touched' => '[no_approvals] schválení a [no_reviews] recenzí nejsou dotčeny', 'approvals_and_reviews_rejected' => '[no_approvals] schválení a [no_reviews] recenzí již bylo zamítnuto', 'approvals_not_touched' => '[no_approvals] schválení nebylo dotčeno', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] schválení bylo zamítnuto', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Schválení bez skupiny', 'approvals_without_user' => 'Schválení bez uživatele', 'approval_deletion_email' => 'Zrušení schválení požadavku', @@ -456,6 +459,7 @@ Odkaz je platný do [valid]. 'dropfolderdir_missing' => 'Váš osobní adresář pro drop neexistuje na serveru! Požádejte správce, aby jej vytvořil.', 'dropfolder_file' => 'Soubor z "přetažené" složky', 'dropfolder_folder' => 'Složka rychlého uploadu', +'dropfolder_metadata' => '', 'dropupload' => 'Rychlý upload', 'drop_files_here' => 'Soubory dát sem!', 'dump_creation' => 'Vytvoření zálohy databáze', @@ -955,8 +959,11 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm 'quota_is_disabled' => 'Podpora kvót je v současné době zakázána v nastavení. Nastavení uživatelských kvót nebude mít žádný vliv, dokud se znovu neaktivuje.', 'quota_warning' => 'Vaše maximální využití disku je překročeno o [bajtů]. Prosím, odstraňte dokumenty nebo předchozí verze.', 'receipts_accepted' => '[no_receipts] potvrzení přijetí již přijato', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] potvrzení přijetí nebylo dotčeno', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] potvrzení přijetí odmítnuto', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Potvrzení přijetí bez skupiny', 'receipts_without_user' => 'Potvrzení přijetí bez uživatele', 'receipt_deletion_email_body' => 'Uživatel byl ze seznamu příjemců odebrán @@ -1038,8 +1045,11 @@ URL: [url]', 'reviewer_already_assigned' => 'je už pověřen jako recenzent', 'reviewer_already_removed' => 'už byl odstraněn z procesu recenzí nebo poslal recenzi', 'reviews_accepted' => '[no_reviews] recenzí již přijato', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] recenzí nebylo dotčeno', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] recenzí již bylo zamítnuto', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Recenze bez skupiny', 'reviews_without_user' => 'Recenze bez uživatele', 'review_deletion_email' => 'Žádost na recenzi odstraněn', @@ -1076,9 +1086,13 @@ URL: [url]', 'revise_document' => 'Revize dokumentu', 'revise_document_on' => 'Další revize verze dokumentu v [date]', 'revisions_accepted' => '[no_revisions] již přijato', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revizí nebylo dotčeno', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revizí teprve proběhne', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revizí bylo odmítnuto', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revize bez skupiny', 'revisions_without_user' => 'Revize bez uživatele', 'revision_date' => 'Datum revize', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 0add1a8b1..ac3564de0 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2699), dgrutsch (22) +// Translators: Admin (2717), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'und', 'apply' => 'Anwenden', 'approvals_accepted' => '[no_approvals] Freigaben', +'approvals_accepted_latest' => '(davon [no_approvals] in letzter Version)', 'approvals_and_reviews_accepted' => '[no_approvals] Freigaben und [no_reviews] Prüfungen', 'approvals_and_reviews_not_touched' => '[no_approvals] offene Freigaben und [no_reviews] offene Prüfungen', 'approvals_and_reviews_rejected' => '[no_approvals] abgelehnte Freigaben und [no_reviews] abgelehnte Prüfungen', 'approvals_not_touched' => '[no_approvals] offene Freigaben', +'approvals_not_touched_latest' => '(davon [no_approvals] in letzter Version)', 'approvals_rejected' => '[no_approvals] abgelehnte Freigaben', +'approvals_rejected_latest' => '(davon [no_approvals] in letzter Version)', 'approvals_without_group' => 'Freigaben ohne Gruppe', 'approvals_without_user' => 'Freigaben ohne Benutzer', 'approval_deletion_email' => 'Freigabeaufforderung gelöscht', @@ -455,6 +458,7 @@ Der Link ist bis zum [valid] gültig. 'dropfolderdir_missing' => 'Ihr persönlicher Ablageordner auf dem Server existiert nicht! Kontaktieren Sie den Administrator, um in anlegen zu lassen.', 'dropfolder_file' => 'Datei aus Ablageordner', 'dropfolder_folder' => 'Ordner aus Ablageordner', +'dropfolder_metadata' => '', 'dropupload' => 'Direkt Hochladen', 'drop_files_here' => 'Dateien hier hin ziehen!', 'dump_creation' => 'DB dump erzeugen', @@ -957,8 +961,11 @@ Sollen Sie danach immer noch Probleme bei der Anmeldung haben, dann kontaktieren 'quota_is_disabled' => 'Quota-Unterstützung ist zur Zeit ausgeschaltet. Benutzer-Quota werden ignoriert bis Quota-Unterstützung in den Einstellungen eingeschaltet wird.', 'quota_warning' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten. Bitte löschen Sie Dokumente oder ältere Versionen.', 'receipts_accepted' => '[no_receipts] Empfangsbestätigungen', +'receipts_accepted_latest' => '(davon [no_receipts] in letzter Version)', 'receipts_not_touched' => '[no_receipts] offene Empfangsbestätigungen', +'receipts_not_touched_latest' => '(davon [no_receipts] in letzter Version)', 'receipts_rejected' => '[no_receipts] abgelehnte Empfangsbestätigungen', +'receipts_rejected_latest' => '(davon [no_receipts] in letzter Version)', 'receipts_without_group' => 'Empfangsbestätigungen ohne Gruppe', 'receipts_without_user' => 'Empfangsbestätigungen ohne Benutzer', 'receipt_deletion_email_body' => 'Benutzer von Liste der Empfänger gelöscht @@ -1040,8 +1047,11 @@ URL: [url]', 'reviewer_already_assigned' => 'Prüfer bereits zugewiesen', 'reviewer_already_removed' => 'Prüfer wurde bereits aus dem Prüfvorgang entfernt oder hat die Prüfung bereits abgeschlossen', 'reviews_accepted' => '[no_reviews] Prüfungen', +'reviews_accepted_latest' => '(davon [no_reviews] in letzter Version)', 'reviews_not_touched' => '[no_reviews] offene Prüfungen', +'reviews_not_touched_latest' => '(davon [no_reviews] in letzter Version)', 'reviews_rejected' => '[no_reviews] abgelehnte Prüfungen', +'reviews_rejected_latest' => '(davon [no_reviews] in letzter Version)', 'reviews_without_group' => 'Prüfungen ohne Gruppe', 'reviews_without_user' => 'Prüfungen ohne Benutzer', 'review_deletion_email' => 'Prüfungsaufforderung gelöscht', @@ -1079,9 +1089,13 @@ URL: [url]', 'revise_document' => 'Wiederholungsprüfung', 'revise_document_on' => 'Nächste Wiederholungsprüfung des Dokuments am [date]', 'revisions_accepted' => '[no_revisions] Wiederholungsprüfungen', +'revisions_accepted_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_not_touched' => '[no_revisions] offene Wiederholungspüfungen', +'revisions_not_touched_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_pending' => '[no_revisions] zukünftige Wiederholungsprüfungen', +'revisions_pending_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_rejected' => '[no_revisions] abgelehnte Wiederholungsprüfungen', +'revisions_rejected_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_without_group' => 'Wiederholungsprüfungen ohne Gruppe', 'revisions_without_user' => 'Wiederholungsprüfungen ohne Benutzer', 'revision_date' => 'Datum der Wiederholungsprüfung', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 82a7b9a2b..8a12d392a 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -86,11 +86,14 @@ $text = array( 'and' => 'και', 'apply' => 'Apply', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => '', @@ -378,6 +381,7 @@ $text = array( 'dropfolderdir_missing' => '', 'dropfolder_file' => '', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Γρήγορη Προσθήκη', 'drop_files_here' => 'Προσθέστε έγγραφα εδώ!', 'dump_creation' => '', @@ -823,8 +827,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => '', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -872,8 +879,11 @@ URL: [url]', 'reviewer_already_assigned' => '', 'reviewer_already_removed' => '', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '', @@ -894,9 +904,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index b48452290..50e9f528f 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1793), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1813), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'and', 'apply' => 'Apply', 'approvals_accepted' => '[no_approvals] approvals already accepted', +'approvals_accepted_latest' => '(being [no_approvals] in latest version)', 'approvals_and_reviews_accepted' => '[no_approvals] approvals and [no_reviews] reviews already accepted', 'approvals_and_reviews_not_touched' => '[no_approvals] approvals and [no_reviews] reviews not being touched', 'approvals_and_reviews_rejected' => '[no_approvals] approvals and [no_reviews] reviews already rejected', 'approvals_not_touched' => '[no_approvals] approvals not being touched', +'approvals_not_touched_latest' => '(being [no_approvals] in latest version)', 'approvals_rejected' => '[no_approvals] approvals already rejected', +'approvals_rejected_latest' => '(being [no_approvals] in latest version)', 'approvals_without_group' => 'Approvals without group', 'approvals_without_user' => 'Approvals without user', 'approval_deletion_email' => 'Approval request deleted', @@ -456,6 +459,7 @@ The link is valid until [valid]. 'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.', 'dropfolder_file' => 'File from drop folder', 'dropfolder_folder' => 'Folder from drop folder', +'dropfolder_metadata' => 'Metadata of the drop folder', 'dropupload' => 'Fast upload', 'drop_files_here' => 'Drop files here!', 'dump_creation' => 'DB dump creation', @@ -959,8 +963,11 @@ If you have still problems to login, then please contact your administrator.', 'quota_is_disabled' => 'Quota support is currently disabled in the settings. Setting a user quota will have no effect until it is enabled again.', 'quota_warning' => 'Your maximum disc usage is exceeded by [bytes]. Please remove documents or previous versions.', 'receipts_accepted' => '[no_receipts] receipts already accepted', +'receipts_accepted_latest' => '(being [no_receipts] in latest version)', 'receipts_not_touched' => '[no_receipts] receipts not being touched', +'receipts_not_touched_latest' => '(being [no_receipts] in latest version)', 'receipts_rejected' => '[no_receipts] receipts already rejected', +'receipts_rejected_latest' => '(being [no_receipts] in latest version)', 'receipts_without_group' => 'Receipts without group', 'receipts_without_user' => 'Receipts without user', 'receipt_deletion_email_body' => 'User has been removed from the list of recipients @@ -1042,8 +1049,11 @@ URL: [url]', 'reviewer_already_assigned' => 'User is already assigned as a reviewer', 'reviewer_already_removed' => 'Reviewer has already been removed from review process or has already submitted a review', 'reviews_accepted' => '[no_reviews] reviews already accepted', +'reviews_accepted_latest' => '(being [no_reviews] in latest version)', 'reviews_not_touched' => '[no_reviews] reviews not being touched', +'reviews_not_touched_latest' => '(being [no_reviews] in latest version)', 'reviews_rejected' => '[no_reviews] reviews already rejected', +'reviews_rejected_latest' => '(being [no_reviews] in latest version)', 'reviews_without_group' => 'Reviews without group', 'reviews_without_user' => 'Reviews without user', 'review_deletion_email' => 'Review request deleted', @@ -1081,9 +1091,13 @@ URL: [url]', 'revise_document' => 'Revise document', 'revise_document_on' => 'Next revision of document version on [date]', 'revisions_accepted' => '[no_revisions] revisions already accepted', +'revisions_accepted_latest' => '(being [no_revisions] in latest version)', 'revisions_not_touched' => '[no_revisions] revisions not being touched', +'revisions_not_touched_latest' => '(being [no_revisions] in latest version)', 'revisions_pending' => '[no_revisions] revisions due in future', +'revisions_pending_latest' => '(being [no_revisions] in latest version)', 'revisions_rejected' => '[no_revisions] revisions already rejected', +'revisions_rejected_latest' => '(being [no_revisions] in latest version)', 'revisions_without_group' => 'Revisions without group', 'revisions_without_user' => 'Revisions without user', 'revision_date' => 'Date of revision', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 3aa3b6912..4a9d982fd 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (1124), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (1130), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'y', 'apply' => 'Aplicar', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Petición de aprobación eliminada', @@ -431,7 +434,8 @@ URL: [url]', 'drag_icon_here' => 'Arrastre carpeta o documento aquí!', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fichero de la carpeta destino', -'dropfolder_folder' => '', +'dropfolder_folder' => 'Carpeta de la carpeta destino', +'dropfolder_metadata' => '', 'dropupload' => 'Carga Rapida', 'drop_files_here' => 'Arrastre archivos aquí!', 'dump_creation' => 'Creación de volcado de BDD', @@ -621,7 +625,7 @@ URL: [url]', 'importfs' => '', 'import_extension' => '', 'import_fs' => 'Importar desde sistema de archivos', -'import_fs_warning' => '', +'import_fs_warning' => 'Esto funciona únicamente con carpetas dentro de la carpeta destino. La operación importa recursivamente todos los archivos y carpetas. Los archivos serán liberados inmediatamente.', 'include_content' => '', 'include_documents' => 'Incluir documentos', 'include_subdirectories' => 'Incluir subcarpetas', @@ -928,8 +932,11 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado 'quota_is_disabled' => 'La cuota está actualmente deshabilitada en las opciones. Establecer una cuota de usuario no tendrá efecto hasta que sea habilitada de nuevo.', 'quota_warning' => 'El máximo de uso de disco se ha excedido en [bytes]. Por favor eliminar documentos o versiones anteriores.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -969,7 +976,7 @@ Carpeta principal: [folder_path] Usuario: [username] nURL: [url]', 'removed_workflow_email_subject' => '[sitename]: [name] - Eliminar flujo de trabajo de la versión del documento', -'removeFolderFromDropFolder' => '', +'removeFolderFromDropFolder' => 'Eliminar carpeta después de importar', 'remove_marked_files' => 'Eliminar ficheros marcados', 'repaired' => 'Reparado', 'repairing_objects' => 'Reparando documentos y carpetas.', @@ -993,8 +1000,11 @@ nURL: [url]', 'reviewer_already_assigned' => 'Ya está asignado como revisor', 'reviewer_already_removed' => 'Ya ha sido eliminado del proceso de revisión o ya ha enviado una revisión', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Petición de revisión eliminada', @@ -1022,9 +1032,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1151,8 +1165,8 @@ URL: [url]', 'seq_keep' => 'Mantener posición', 'seq_start' => 'Primera posición', 'sessions' => '', -'setDateFromFile' => '', -'setDateFromFolder' => '', +'setDateFromFile' => 'Obtiene la fecha del archivo importado', +'setDateFromFolder' => 'Obtiene la fecha de la carpeta importada', 'settings' => 'Configuración', 'settings_activate_module' => 'Activar módulo', 'settings_activate_php_extension' => 'Activar extensión PHP', @@ -1390,7 +1404,7 @@ URL: [url]', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', 'settings_no_content_dir' => 'Carpeta de contenidos', -'settings_onePageMode' => '', +'settings_onePageMode' => 'Modo una página', 'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Anular MimeType', 'settings_overrideMimeType_desc' => 'Permitir que SeedDMS fije el tipo MIME sobreescribiendo el que haya definido el navegador durante el proceso de carga de un archivo.', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 0c8661165..dc223ee4a 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1093), jeromerobert (50), lonnnew (9), Oudiceval (755) +// Translators: Admin (1094), jeromerobert (50), lonnnew (9), Oudiceval (755) $text = array( '2_factor_auth' => 'Authentification forte', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'et', 'apply' => 'Appliquer', 'approvals_accepted' => '[no_approvals] approbations déjà confirmées', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] approbations et [no_reviews] vérifications déjà confirmées', 'approvals_and_reviews_not_touched' => '[no_approvals] approbations et [no_reviews] vérifications non amorcées', 'approvals_and_reviews_rejected' => '[no_approvals] approbations et [no_reviews] vérifications déjà rejetées', 'approvals_not_touched' => '[no_approvals] approbations non amorcées', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] approbations déjà rejetées', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Approbations sans groupe', 'approvals_without_user' => 'Approbations sans utilisateur', 'approval_deletion_email' => 'Demande d\'approbation supprimée', @@ -456,6 +459,7 @@ Le lien est valide jusqu’au [valid]. 'dropfolderdir_missing' => 'Votre dossier de dépôt personnel n\'existe pas sur le serveur ! Veuillez faire une demande à l\'administrateur.', 'dropfolder_file' => 'Fichier du dossier de dépôt', 'dropfolder_folder' => 'Répertoire du dossier de dépôt', +'dropfolder_metadata' => '', 'dropupload' => 'Téléchargement rapide', 'drop_files_here' => 'Glissez les fichiers ici !', 'dump_creation' => 'Sauvegarder la base de données', @@ -957,8 +961,11 @@ En cas de problème persistant, veuillez contacter votre administrateur.', 'quota_is_disabled' => 'Le support des quotas est actuellement désactivé dans les réglages. Affecter un quota utilisateur n’aura pas d’effet jusqu’à ce qu’il soit de nouveau activé.', 'quota_warning' => 'Votre quota d’espace disque est dépassé de [bytes]. Veuillez supprimer des documents ou d\'anciennes versions.', 'receipts_accepted' => '[no_receipts] réceptions déjà confirmées', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] réceptions non amorcées', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] réceptions déjà rejetées', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Réceptions sans groupe', 'receipts_without_user' => 'Réceptions sans utilisateur', 'receipt_deletion_email_body' => 'L’utilisateur a été retiré de la liste des destinataires @@ -1032,8 +1039,11 @@ URL : [url]', 'reviewer_already_assigned' => 'est déjà déclaré en tant qu’examinateur', 'reviewer_already_removed' => 'L’examinateur a déjà été retiré du processus de vérification ou a déjà soumis la vérification.', 'reviews_accepted' => '[no_reviews] vérifications déjà confirmées', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] vérifications non amorcées', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] vérifications déjà rejetées', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Vérifications sans groupe', 'reviews_without_user' => 'Vérifications sans utilisateur', 'review_deletion_email' => 'Demande de vérification supprimée', @@ -1071,9 +1081,13 @@ URL : [url]', 'revise_document' => 'Réviser le document', 'revise_document_on' => 'Prochaine révision de la version du document le [date]', 'revisions_accepted' => '[no_revisions] révisions déjà confirmées', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] révisions non amorcées', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] révisions à venir en attente', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] révisions déjà rejetées', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Révisions sans groupe', 'revisions_without_user' => 'Révisions sans utilisateur', 'revision_date' => 'Date de révision', @@ -1443,7 +1457,7 @@ Nom : [username] 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', 'settings_no_content_dir' => 'Répertoire de contenu', -'settings_onePageMode' => '', +'settings_onePageMode' => 'Mode une page', 'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Passer outre le type MIME', 'settings_overrideMimeType_desc' => 'Ne pas tenir compte du type MIME envoyé par le navigateur quand un fichier est téléversé. Le type MIME sera déterminé par SeedDMS.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index b806dde70..0ebfc4e25 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -90,11 +90,14 @@ Internet poveznica: [url]', 'and' => 'i', 'apply' => 'Primjeni', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Izbrisan zahtjev za odobrenje', @@ -437,6 +440,7 @@ Internet poveznica: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Datoteka iz padajuće mape', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Zona za brzo učitavanje', 'drop_files_here' => 'Ovdje ispusti datoteku!', 'dump_creation' => 'Izrada odlagališta baze podataka', @@ -932,8 +936,11 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'quota_is_disabled' => 'Podrška kvoti je trenutno onemogućena u postavkama. Postavka korisničke kvote neće imati utjecaja dok se ponovno ne omogući.', 'quota_warning' => 'Vaš maksimalni prostor na disku je premašen za [bytes]. Molimo uklonite dokumente ili prethodne verzije.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1004,8 +1011,11 @@ Internet poveznica: [url]', 'reviewer_already_assigned' => 'je već dodijeljen kao recezent', 'reviewer_already_removed' => 'je već uklonjen iz postupka pregleda ili je već podnijet pregled.', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Izbrisan zahtjev za pregled', @@ -1043,9 +1053,13 @@ Internet poveznica: [url]', 'revise_document' => 'Revidiraj dokument', 'revise_document_on' => 'Slijedeća revizija verzije dokumenta na dan [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => 'Datum revizije', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index fbce10eaf..93408b6c4 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => '-', 'apply' => 'Elfogad', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Jóváhagyási kérelem törölve', @@ -432,6 +435,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Állomány a dropfolder-ből', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Gyors feltöltés', 'drop_files_here' => 'Húzz ide egy fájlt', 'dump_creation' => 'Adatbázis mentés létrehozása', @@ -928,8 +932,11 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a 'quota_is_disabled' => 'Kvóta támogatás jelenleg le van tiltva a beállításoknál. Felhasználói korlát beállítások nem kerülnek érvényesítésre amíg nincs újra engedélyezve.', 'quota_warning' => 'Túllépte lemez korlátot [bytes] bájttal. Kérjük távolítson el dokumentumokat vagy korábbi változatokat.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -993,8 +1000,11 @@ URL: [url]', 'reviewer_already_assigned' => 'már hozzá lett rendelve felülvizsgálóként', 'reviewer_already_removed' => 'már el lett távolítva a felülvizsgálati folyamatból vagy már el lett küldve egy felülvizsgálat', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Felülvizsgálat kérés törölve', @@ -1022,9 +1032,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 4cdcff3f9..dc9d4d604 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'e', 'apply' => 'Applica', 'approvals_accepted' => '[no_approvals] approvazioni già accettate', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] approvazioni e [no_reviews] revisioni già accettate', 'approvals_and_reviews_not_touched' => '[no_approvals] approvazioni e [no_reviews] revisioni non gestite', 'approvals_and_reviews_rejected' => '[no_approvals] approvazioni e [no_reviews] revisioni già rifiutate', 'approvals_not_touched' => '[no_approvals] approvazioni non gestite', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] approvazioni già rifiutate', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Approvazioni senza gruppo', 'approvals_without_user' => 'Approvazioni senza utente', 'approval_deletion_email' => 'Richiesta di approvazione cancellata', @@ -449,6 +452,7 @@ Il collegamento The link è ancora valido fino a [valid]. 'dropfolderdir_missing' => 'La vostra cartella di personale non esiste sul server! Si prega di chiedere all\'amministratore di creare per te.', 'dropfolder_file' => 'Scegli file dal server', 'dropfolder_folder' => 'Cartella per il cartella di ricezione', +'dropfolder_metadata' => '', 'dropupload' => 'Caricamento rapido', 'drop_files_here' => 'Trascina qui il file', 'dump_creation' => 'Creazione del dump del DB', @@ -945,8 +949,11 @@ Dovessero esserci ancora problemi al login, prego contatta l\'amministratore di 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.', 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.', 'receipts_accepted' => '[no_receipts] ricevute già accettate', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] ricevute non gestite', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] ricevute già rifiutate', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Ricevute senza gruppo', 'receipts_without_user' => 'Ricevute senza gruppo', 'receipt_deletion_email_body' => 'Utente rimosso dall\'elenco dei destinatari @@ -1028,8 +1035,11 @@ URL: [url]', 'reviewer_already_assigned' => 'è già assegnato come revisore', 'reviewer_already_removed' => 'è già stato rimosso dal processo di revisione oppure ha già inserito una revisione.', 'reviews_accepted' => '[no_reviews] revisioni già accettate', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] revisioni non gestite', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] revisioni già rifiutate', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Revisioni senza gruppo', 'reviews_without_user' => 'Revisioni senza utente', 'review_deletion_email' => 'Richiesta di revisione cancellata', @@ -1067,9 +1077,13 @@ URL: [url]', 'revise_document' => 'Riesamina documento', 'revise_document_on' => 'Prossimo riesame del documento il [date]', 'revisions_accepted' => '[no_reviews] riesami già accettati', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_reviews] riesami non gestiti', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_reviews] riesami pendenti', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_reviews] riesami già rifiutati', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Riesami senza gruppo', 'revisions_without_user' => 'Riesami senza utente', 'revision_date' => 'data riesame', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 6f6c35321..794f3929f 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => '와', 'apply' => '적용', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] 이미 승인 거부됨', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => '승인 요청 삭제', @@ -438,6 +441,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '드롭 폴더 파일', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => '빠른 업로드', 'drop_files_here' => '이곳에 파일을 올려놓으세요!', 'dump_creation' => 'DB 덤프 생성', @@ -926,8 +930,11 @@ URL : [url]', 'quota_is_disabled' => '할당량 지원이 설정에서 비활성화되어 있습니다. 다시 활성화 될 때까지 사용자의 할당량 설정은 적용되지 않습니다.', 'quota_warning' => '당신의 최대 디스크 사용량 [bytes] 초과됩니다. 문서 또는 이전 버전을 제거하십시오.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -998,8 +1005,11 @@ URL: [url]', 'reviewer_already_assigned' => '해 사용자는 리뷰어로 배정되었습니다.', 'reviewer_already_removed' => '이미 검토 과정에서 제거되었거나 리뷰로 제출', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '검토 요청 삭제됨', @@ -1037,9 +1047,13 @@ URL: [url]', 'revise_document' => '개정 문서', 'revise_document_on' => '문서 버전의 다음 개정 [날짜]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '개정 일자', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index bdd3107b9..514a4673b 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'ແລະ', 'apply' => 'ໃຊ້', 'approvals_accepted' => '[no_approvals] ອະນຸມັດໂດຍບໍ່ຕ້ອງສຳພັດ', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] ອະນຸມັດແລ້ວ ແລະ [no_reviews] ອະນຸມັດແລ້ວ', 'approvals_and_reviews_not_touched' => '[no_approvals] ອະນຸມັດແລ້ວ ແລະ [no_reviews] ການກວດຄືນ ທີບໍ່ມີການສໍາຜັດ', 'approvals_and_reviews_rejected' => '[no_approvals] ອະນຸມັດແລ້ວ ແລະ [no_reviews] ການກວດຄືນໄດ້ຮັບການປະຕິເສດ', 'approvals_not_touched' => '[no_approvals] ອະນຸມັດໂດຍບໍ່ຕ້ອງສຳພັດ', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] ບໍໄດ້ຮັບການອະນຸມັດ', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'ການອະນຸມັດໂດຍບໍ່ຢູ່ໃນກຸ່ມ', 'approvals_without_user' => 'ການອະນຸມັດຍັງບໍ່ໄດ້ຮັບການນຳໄຊ້', 'approval_deletion_email' => 'ຄຳຂໍອະນຸມັດໄດ້ຖືກລົບແລ້ວ', @@ -442,6 +445,7 @@ URL: [url]', 'dropfolderdir_missing' => 'ໂຟລເດີສ່ວນບຸກຄົນຂອງທ່ານບໍໄດ້ຢູ່ໃນເຊີເວີ ກະລຸນາໃຫ້ຜູ້ດູແລລະບົບຂອງເຈົ້າສ້າງຂໍ້ມູນ', 'dropfolder_file' => 'ໄຟລຈາກໂຟລເດີແບບເລືອນລົງ', 'dropfolder_folder' => 'ໂຟລເດີຈາກໂຟລເດີວ່າງ', +'dropfolder_metadata' => '', 'dropupload' => 'ອັບໂຫລດຢ່າງວ່ອງໄວ', 'drop_files_here' => 'ວາງໄຟລທີນີ້!', 'dump_creation' => 'ການສ້າງຂໍ້ມູນ DB', @@ -938,8 +942,11 @@ URL: [url]', 'quota_is_disabled' => 'ຂະນະນີ້ການສະນັບສະໜູນໂຄຕ້າຖືກປິດໄຊ້ງານໃນການຕັ້ງຄ່າແລ້ວການກຳນົດໂຄຕ້າຜູ້ໄຊ້ຈະບໍ່ມີຜົນໄດໆ ຈົນກວ່າຈະເປີດໄຊ້ງານອີກຄັ້ງ', 'quota_warning' => 'ການໄຊ້ດິສສູງສຸດຂອງເຈົ້າເກີນ [ໄບຣ] ໂປດລົບເອກະສານຫຼືເວີຊັນກ່ອນໜ້າ', 'receipts_accepted' => 'ໃບບິນຮັບເງີນໄດ້ຮັບການຍອມຮັບແລ້ວ [ບໍມີໃບບິນຮັບເງິນ]', +'receipts_accepted_latest' => '', 'receipts_not_touched' => 'ບໍ່ມີໃບບິນຮັບເງິນ', +'receipts_not_touched_latest' => '', 'receipts_rejected' => 'ໃບຮັບເງີນ [ບໍ່ມີໃບບິນຮັບເງີນ] ຖືກປະຕິເສດແລ້ວ', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'ບໍ່ມີກຸ່ມໃບບິນຮັບເງີນ', 'receipts_without_user' => 'ໃບບິນຮັບເງີນຍັງບໍ່ມີຜູ້ໄຊ້', 'receipt_deletion_email_body' => 'ຜູ້ໄຊ້ໄດ້ຖືກລົບອອກຈາກລາຍຊື່ຜູ້ຮັບ @@ -1021,8 +1028,11 @@ URL: [url]', 'reviewer_already_assigned' => 'ຜູ້ໄຊ້ໄດ້ຮັບມອບໝາຍໃຫ້ຜູ້ກວດສອບແລ້ວ', 'reviewer_already_removed' => 'ຜູ້ກວດສອບໄດ້ຍ້າຍອອກຈາກການກວດຄືນແລ້ວຫຼືໄດ້ສົ່ງຄຳເຫັນແລ້ວ', 'reviews_accepted' => 'ບໍ່ມີລິວິວ ຄວາມເຫັນທີຍອມຮັບໄດ້', +'reviews_accepted_latest' => '', 'reviews_not_touched' => 'ລີວິວ ບໍ່ມີລີວິວ ບໍ່ໄດ້ຮັບການສຳຜັດ', +'reviews_not_touched_latest' => '', 'reviews_rejected' => 'ບໍ່ມີລີວິວ ຄວາມເຫັນທີຖືກປະຕິເສດແລ້ວ', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'ການທົບທວນໂດຍບໍ່ຢູ່ໃນກຸ່ມ', 'reviews_without_user' => 'ຄວາມເຫັນໂດຍບໍ່ມີຜູ້ໄຊ້', 'review_deletion_email' => 'ລົບຄຳຂໍການກວດກາແລ້ວ', @@ -1060,9 +1070,13 @@ URL: [url]', 'revise_document' => 'ແກ້ໄຂເອກະສານ', 'revise_document_on' => 'ແກ້ໄຂເອກະສານຮູບແບບໄຫມ່ ໃນ ວັນທີ', 'revisions_accepted' => 'ໄດ້ມີການແກ້ໄຂເອກະສານແລ້ວ ບໍ່ມີການແກ້ໄຂ', +'revisions_accepted_latest' => '', 'revisions_not_touched' => 'ບໍ່ມີການແກ້ໄຂ ການແກ້ໄຂບໍ່ຖືກຕ້ອງ', +'revisions_not_touched_latest' => '', 'revisions_pending' => 'ບໍ່ມີການແກ້ໄຂ ການແກ້ໄຂຈະເກີດຂື້ນໃນອານາຄົດ', +'revisions_pending_latest' => '', 'revisions_rejected' => 'ບໍ່ມີການແກ້ໄຂ ການແກ້ໄຂໄດ້ຖືກປະຕິເສດ', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'ການປັບປຸງໂດຍບໍ່ຢູ່ໃນກຸ່ມ', 'revisions_without_user' => 'ການແກ້ໄຂໂດຍບໍ່ມີຜູ້ໄຊ້', 'revision_date' => 'ວັນທີ່ແກ້ໄຂ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 980e33d72..ed3933853 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'en', 'apply' => 'Toepassen', 'approvals_accepted' => '[no_approvals] goedkeuringen', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] goedkeuringen en [no_reviews] geaccepteerde reviews', 'approvals_and_reviews_not_touched' => '[no_approvals] goedkeuringen [no_reviews] reviews nog niet behandeld', 'approvals_and_reviews_rejected' => '[no_approvals] goedkeuringen en [no_reviews] reviews afgekeurd', 'approvals_not_touched' => '[no_approvals] goedkeuringen nog niet behandeld', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] goedkeuringen afgekeurd', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Goedkeuringen zonder groep', 'approvals_without_user' => 'Goedkeuringen zonder gebruiker', 'approval_deletion_email' => 'Goedkeuringsverzoek verwijderd', @@ -437,6 +440,7 @@ De link is geldig tot [valid]. 'dropfolderdir_missing' => 'Uw persoonlijke map om files te droppen (dropfolder) bestaat niet op de server! Vraag de administrator om deze aan te maken.', 'dropfolder_file' => 'Bestand in dropfolder', 'dropfolder_folder' => 'Map in dropfolder', +'dropfolder_metadata' => '', 'dropupload' => 'Snel toevoegen', 'drop_files_here' => 'Sleep bestanden hierheen', 'dump_creation' => 'DB-dump aanmaken', @@ -933,8 +937,11 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con 'quota_is_disabled' => 'Quota support is momenteel niet actief in de eigenschappen. Een user-quotum instellen zal geen effect hebben tot quota actief zijn', 'quota_warning' => 'Uw maximale datagebruik is overschreden met [bytes]. Gelieve documenten of eerdere versies te verwijderen.', 'receipts_accepted' => '[no_receipts] ontvangen en geaccepteerd', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] ontvangen, nog niet behandeld', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] ontvangen, geweigerd', +'receipts_rejected_latest' => '', 'receipts_without_group' => '[no_receipts] ontvangen, geen groep', 'receipts_without_user' => '[no_receipts] ontvangen, geen gebruiker', 'receipt_deletion_email_body' => 'Gebruiker is verwijderd uit de lijst van ontvangers @@ -1015,8 +1022,11 @@ URL: [url]', 'reviewer_already_assigned' => 'is reeds aangewezen als beoordelaar', 'reviewer_already_removed' => 'is reeds verwijderd uit het beoordelingsproces of heeft reeds een beoordeling uitgevoerd', 'reviews_accepted' => '[no_reviews] reviews geaccepteerd', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] reviews niet geopend', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] reviews geweigerd', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'reviews zonder groep', 'reviews_without_user' => 'reviews zonder gebruiker', 'review_deletion_email' => 'Beoordelingsverzoek verwijderd', @@ -1053,9 +1063,13 @@ URL: [url]', 'revise_document' => 'Document herzien', 'revise_document_on' => 'Volgende herziening van document op [date]', 'revisions_accepted' => '[no_revisions] revisies geaccepteerd', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revisies geopend', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revisies in afwachting', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revisies geweigerd', +'revisions_rejected_latest' => '', 'revisions_without_group' => '[no_revisions] revisies zonder groep', 'revisions_without_user' => '[no_revisions] revisies zonder gebruiker', 'revision_date' => 'Datum revisie', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 12e0d82b8..c9bff7f10 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (832), netixw (84), romi (93), uGn (112) +// Translators: Admin (840), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'i', 'apply' => 'Zastosuj', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Prośba o akceptację została usunięta', @@ -425,6 +428,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Plik z folderu rozwijanego', 'dropfolder_folder' => 'Katalog ze strefy drop', +'dropfolder_metadata' => '', 'dropupload' => 'Szybki upload', 'drop_files_here' => 'Przeciągnij tu pliki!', 'dump_creation' => 'Utworzenie zrzutu bazy danych', @@ -906,7 +910,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'possible_substitutes' => '', 'preset_expires' => 'Wygasa', 'preview' => 'Podgląd', -'preview_converters' => '', +'preview_converters' => 'Podgląd konwersji dokumentu', 'preview_images' => '', 'preview_markdown' => '', 'preview_pdf' => '', @@ -921,8 +925,11 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'quota_is_disabled' => 'Wsparcie limitów dyskowych jest obecnie wyłączone w ustawieniach. Ustawiony limit dyskowy użytkownika nie będzie działał dopóki wparcie nie zostanie ponownie włączone.', 'quota_warning' => 'Przekroczono użycie dysku o [bytes]. Usuń dokumenty lub poprzednie wersje.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -962,7 +969,7 @@ Folder nadrzędny: [folder_path] Użytkownik: [username] URL: [url]', 'removed_workflow_email_subject' => '[sitename]: [name] - Usunięty workflow z wersji dokumentu', -'removeFolderFromDropFolder' => '', +'removeFolderFromDropFolder' => 'Usuń folder po imporcie', 'remove_marked_files' => 'Usuń zaznaczone pliki', 'repaired' => 'naprawiony', 'repairing_objects' => 'Naprawa dokumentów i katalogów.', @@ -979,8 +986,11 @@ URL: [url]', 'reviewer_already_assigned' => 'jest już przypisany jako recenzent', 'reviewer_already_removed' => 'został już usunięty z procesu opiniowania lub już wydał swoją opinię', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Prośba o recenzję usunięta', @@ -1001,9 +1011,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1229,8 +1243,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => 'Zezwalaj na zduplikowane nazwy dokumentów', 'settings_enableDuplicateDocNames_desc' => 'Zezwala na tworzenie w folderze dokumentów o tej samej nazwie.', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Zezwól na duplikaty nazw podfolderów', +'settings_enableDuplicateSubFolderNames_desc' => 'Zezwala na zduplikowane nazwy podfolderów w folderze', 'settings_enableEmail' => 'Włącz powiadomienia e-mail', 'settings_enableEmail_desc' => 'Włącz/Wyłącz automatyczne powiadomienia drogą mailową', 'settings_enableFilterReceipt' => '', @@ -1251,7 +1265,7 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.', 'settings_enableMenuTasks' => '', 'settings_enableMenuTasks_desc' => '', -'settings_enableMultiUpload' => '', +'settings_enableMultiUpload' => 'Zezwól na wysyłanie wielu plików', 'settings_enableMultiUpload_desc' => '', 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów', 'settings_enableNotificationAppRev_desc' => 'Zaznacz aby wysyłać powiadomienia do zatwierdzających i recenzentów kiedy pojawi się nowa wersja dokumentu', @@ -1283,7 +1297,7 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu', 'settings_enableSessionList' => '', 'settings_enableSessionList_desc' => '', -'settings_enableThemeSelector' => '', +'settings_enableThemeSelector' => 'Wybór motywu', 'settings_enableThemeSelector_desc' => '', 'settings_enableUpdateReceipt' => '', 'settings_enableUpdateReceipt_desc' => '', @@ -1371,7 +1385,7 @@ URL: [url]', 'settings_no_content_dir' => 'Katalog treści', 'settings_onePageMode' => '', 'settings_onePageMode_desc' => '', -'settings_overrideMimeType' => '', +'settings_overrideMimeType' => 'Nadpisz typ rozszerzenia', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Rozmiar części pliku', 'settings_partitionSize_desc' => 'Rozmiar części pliku, w bajtach, wczytywane przez jumploader. Nie wpisuj wartości większej niż maksymalna wartość wczytywanego pliku ustawiona na serwerze.', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 2f1f1609c..18980a55b 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'e', 'apply' => 'Aplicar', 'approvals_accepted' => '[no_approvals] aprovações já aceitas', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] aprovações e [no_reviews] comentários já aceitos', 'approvals_and_reviews_not_touched' => '[no_approvals] aprovações e [no_reviews] comentários não tocados', 'approvals_and_reviews_rejected' => '[no_approvals] aprovações e [no_reviews] avaliações já rejeitadas', 'approvals_not_touched' => '[no_approvals] aprovações não sendo tocadas', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] aprovações já rejeitadas', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Aprovações sem grupo', 'approvals_without_user' => 'Aprovações sem usuário', 'approval_deletion_email' => 'Solicitação de Aprovação eliminada', @@ -456,6 +459,7 @@ O link é válido até [valid]. 'dropfolderdir_missing' => 'Sua pasta suspensa pessoal não existe no servidor! Por favor, peça ao seu administrador para criá-lo.', 'dropfolder_file' => 'Arquivo de pasta suspensa', 'dropfolder_folder' => 'Pasta da pasta-alvo', +'dropfolder_metadata' => '', 'dropupload' => 'Envio rápido', 'drop_files_here' => 'Solte os arquivos aqui!', 'dump_creation' => 'Criação de despejo de banco de dados', @@ -958,8 +962,11 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ 'quota_is_disabled' => 'Suporte a cota está desativado nas configurações. A definição de cota do usuário não terá efeito até que seja habilitada novamente.', 'quota_warning' => 'Seu uso máximo do disco foi ultrapassado em [bytes]. Por favor, remova documentos ou versões anteriores.', 'receipts_accepted' => '[no_receipts] recibos já aceitos', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] recibos não tocados', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] recibos já rejeitados', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Recibos sem grupo', 'receipts_without_user' => 'Recibos sem usuário', 'receipt_deletion_email_body' => 'O usuário foi removido da lista de destinatários @@ -1041,8 +1048,11 @@ URL: [url]', 'reviewer_already_assigned' => 'já está atribuído como avaliador', 'reviewer_already_removed' => 'já foi removido do processo de revisão ou já enviou um comentário', 'reviews_accepted' => '[no_reviews] avaliações já aceitas', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] avaliações não tocadas', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] avaliações já rejeitadas', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Avaliações sem grupo', 'reviews_without_user' => 'Avaliações sem usuário', 'review_deletion_email' => 'Pedido de revisão eliminado', @@ -1079,9 +1089,13 @@ URL: [url]', 'revise_document' => 'Revisar documento', 'revise_document_on' => 'Próxima revisão da versão do documento em [date]', 'revisions_accepted' => '[no_revisions] revisões já aceitas', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revisões não sendo tocadas', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revisões devidas no futuro', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revisões já rejeitadas', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revisões sem grupo', 'revisions_without_user' => 'Revisões sem usuário', 'revision_date' => 'Data da revisão', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 98d53cc2a..e0726d0ef 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1087), balan (87) +// Translators: Admin (1092), balan (87) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'si', 'apply' => 'Aplică', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Cerere de aprobare stearsă', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fișiere din folderele aruncate (File from drop folder)', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Încărcare rapidă', 'drop_files_here' => 'Aruncă fișierele aici!', 'dump_creation' => 'Creare fisier imagine baza de date', @@ -933,8 +937,11 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'quota_is_disabled' => 'Spatiu alocat este dezactivată în setări. Stabilirea unui spatiu alocat pentru utilizator nu va avea nici un efect până când setarea este reactivată din nou.', 'quota_warning' => 'Dimensiunea dumneavoastră maximă este depasită cu [bytes]. Vă rugăm să eliminați documente sau versiuni anterioare.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1005,8 +1012,11 @@ URL: [url]', 'reviewer_already_assigned' => 'este deja alocat ca un revizuitor', 'reviewer_already_removed' => 'a fost deja eliminat din procesul de revizuire sau a postat deja o revizuire', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Cerere de revizuire eliminată', @@ -1044,9 +1054,13 @@ URL: [url]', 'revise_document' => 'Revizuiti documentul', 'revise_document_on' => 'Urmatoarea revizuire a versiunii document pe [data]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1192,7 +1206,7 @@ URL: [url]', 'settings_autoLoginUser' => 'Login automat', 'settings_autoLoginUser_desc' => '', 'settings_available_languages' => 'Limbi disponibile', -'settings_available_languages_desc' => '', +'settings_available_languages_desc' => 'Numai limbile selectate vor fii incarcate la accesare. Limba default va fii mereu incarcata', 'settings_backupDir' => '', 'settings_backupDir_desc' => '', 'settings_cacheDir' => 'Director Cache', @@ -1545,9 +1559,9 @@ URL: [url]', 'sign_out' => 'Sign out', 'sign_out_user' => 'Sign out utilizator', 'sk_SK' => 'Slovacă', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Sortare dupa data', +'sort_by_name' => 'Sortare dupa nume', +'sort_by_sequence' => 'Sortare dupa numar', 'space_used_on_data_folder' => 'Spatiu folosit în folderul de date', 'splash_added_to_clipboard' => 'Adăugat la clipboard', 'splash_add_access' => '', @@ -1836,7 +1850,7 @@ URL: [url]', 'workflow_summary' => 'Sumar Workflow', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Sumar Utilizator', -'x_more_objects' => '', +'x_more_objects' => 'Mai multe', 'year_view' => 'Vizualizare an', 'yes' => 'Da', 'zh_CN' => 'Chineză (CN)', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 9b1f3f640..25e863e17 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1671) +// Translators: Admin (1677) $text = array( '2_factor_auth' => 'Двухфакторная аутентификация', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'и', 'apply' => 'Применить', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Запрос на утверждение удалён', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => 'Проходной каталог не существует', 'dropfolder_file' => 'Файл из проходного каталога', 'dropfolder_folder' => 'Путь к проходному каталогу', +'dropfolder_metadata' => '', 'dropupload' => 'Быстрая загрузка', 'drop_files_here' => 'Переместите файлы сюда', 'dump_creation' => 'Создать дамп БД', @@ -930,8 +934,11 @@ URL: [url]', 'quota_is_disabled' => 'Поддержка квот в настоящее время отключена в настройках.', 'quota_warning' => 'Ваша дисковая квота превышена на [bytes]. Удалите ненужные документы или их предыдущие версии.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1007,8 +1014,11 @@ URL: [url]', 'reviewer_already_assigned' => 'уже назначен на рецензирование', 'reviewer_already_removed' => 'уже удалён из списка рецензирующих или уже оставил рецензию', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Запрос на рецензию удалён', @@ -1046,9 +1056,13 @@ URL: [url]', 'revise_document' => 'Ревизировать документ', 'revise_document_on' => 'Следующий ревизия версии документа назначен на [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => 'Дата ревизии', @@ -1279,7 +1293,7 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Включить/отключить область в "Просмотр папки" для загрузки при помощи Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Разрешить документы
      с одинаковым названием', 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.', -'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames' => 'Разрешить дублирующие имена подпапок', 'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Включить e-mail', 'settings_enableEmail_desc' => 'Включить/отключить автоматическое уведомление по e-mail.', @@ -1413,7 +1427,7 @@ URL: [url]', 'settings_maxSizeForFullText' => 'Макс. размер документа для индексирования на лету', 'settings_maxSizeForFullText_desc' => 'Размер документа, который может быть индексирован срузу после добавления', 'settings_maxUploadSize' => 'Максимальный размер загружаемых файлов', -'settings_maxUploadSize_desc' => '', +'settings_maxUploadSize_desc' => 'Это максимальный размер загружаемых файлов. Он повлияет на версии документов и вложения.', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', @@ -1486,7 +1500,7 @@ URL: [url]', 'settings_smtpPort_desc' => 'Порт сервера SMTP, по умолчанию 25.', 'settings_smtpSendFrom' => 'От', 'settings_smtpSendFrom_desc' => 'Отправлять с указанного адреса.', -'settings_smtpSendTestMail' => '', +'settings_smtpSendTestMail' => 'Отправить тестовое письмо"', 'settings_smtpSendTestMail_desc' => '', 'settings_smtpServer' => 'Хост SMTP', 'settings_smtpServer_desc' => 'Хост сервера SMTP.', @@ -1552,9 +1566,9 @@ URL: [url]', 'sign_out' => 'Выйти', 'sign_out_user' => 'Пользовательский выход', 'sk_SK' => 'Slovak', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Сортировка по дате', +'sort_by_name' => 'Сортировка по имени', +'sort_by_sequence' => 'Сортировка по порядку', 'space_used_on_data_folder' => 'Размер каталога данных', 'splash_added_to_clipboard' => 'Добавлено в буфер обмена', 'splash_add_access' => '', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 92b62ea7a..2a1376986 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'a', 'apply' => 'Použiť', 'approvals_accepted' => '[no_approvals] approvals already accepted', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] approvals and [no_reviews] reviews already accepted', 'approvals_and_reviews_not_touched' => '[no_approvals] approvals and [no_reviews] reviews not being touched', 'approvals_and_reviews_rejected' => '[no_approvals] approvals and [no_reviews] reviews already rejected', 'approvals_not_touched' => '[no_approvals] approvals not being touched', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] approvals already rejected', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Approvals without group', 'approvals_without_user' => 'Approvals without user', 'approval_deletion_email' => 'Požiadavka na schválenie zmazaná', @@ -456,6 +459,7 @@ Odkaz je platný do [valid]. 'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.', 'dropfolder_file' => 'Súbor z drop zložky', 'dropfolder_folder' => 'Zložka z drop zložky', +'dropfolder_metadata' => '', 'dropupload' => 'Rýchlo nahraj', 'drop_files_here' => 'Sem vložte súbory!', 'dump_creation' => 'Vytvorenie výstupu DB', @@ -959,8 +963,11 @@ If you have still problems to login, then please contact your administrator.', 'quota_is_disabled' => 'Podpora kvót je momentálne zakázaná v nastaveniach. Nastavenie kvóty používateľa nebude mať žiadny účinok, kým nebude znovu aktivovaná.', 'quota_warning' => 'Maximálne využitie disku je prekročené o [bytes]. Odstráňte dokumenty alebo predchádzajúce verzie.', 'receipts_accepted' => '[no_receipts] receipts already accepted', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] receipts not being touched', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] receipts already rejected', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Receipts without group', 'receipts_without_user' => 'Receipts without user', 'receipt_deletion_email_body' => 'Používateľ bol odstránený zo zoznamu recipientov @@ -1042,8 +1049,11 @@ URL: [url]', 'reviewer_already_assigned' => 'je už poverený ako recenzent', 'reviewer_already_removed' => 'už bol odstránený z procesu recenzie alebo už odoslal recenziu', 'reviews_accepted' => '[no_reviews] reviews already accepted', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] reviews not being touched', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] reviews already rejected', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Reviews without group', 'reviews_without_user' => 'Reviews without user', 'review_deletion_email' => 'Požiadavka na recenziu zmazaná', @@ -1081,9 +1091,13 @@ URL: [url]', 'revise_document' => 'Revidovať dokument', 'revise_document_on' => 'Next revision of document version on [date]', 'revisions_accepted' => '[no_revisions] revisions already accepted', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revisions not being touched', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revisions due in future', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revisions already rejected', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revízie bez skupiny', 'revisions_without_user' => 'Revízie bez používateľa', 'revision_date' => 'Dátum revízie', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index b8649998f..e829ce792 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -91,11 +91,14 @@ URL: [url]', 'and' => 'och', 'apply' => 'Använd', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Godkännandet saknar grupp', 'approvals_without_user' => 'Godkännandet saknar användare', 'approval_deletion_email' => 'Begäran om godkännande har raderats', @@ -450,6 +453,7 @@ Länken är giltig t o m [valid]. 'dropfolderdir_missing' => 'Du saknar en personlig mapp för uppladdning till servern. Kontakta systemadminiustratören för att få hjälp att skapa den.', 'dropfolder_file' => 'Fil från mellanlagringsmappen', 'dropfolder_folder' => 'Katalog från mellanlagringsmappen', +'dropfolder_metadata' => '', 'dropupload' => 'Snabb uppladdning', 'drop_files_here' => 'Släpp filer här!', 'dump_creation' => 'Skapa DB-dump', @@ -943,8 +947,11 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.', 'quota_is_disabled' => 'Kvotstöd är för närvarande inaktiverad i inställningarna. Ett värde för användarkvot kommer inte att ha någon effekt förrän den är aktiverad igen.', 'quota_warning' => 'Din maximala lagringskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1015,8 +1022,11 @@ URL: [url]', 'reviewer_already_assigned' => 'Användaren har redan tilldelats rollen som granskare', 'reviewer_already_removed' => 'har redan tagits bort från granskningen eller har redan skickat en granskning', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => 'Granskningar som saknar användare', 'review_deletion_email' => 'Förfrågan om granskning borttagen', @@ -1054,9 +1064,13 @@ URL: [url]', 'revise_document' => 'Revidera dokument', 'revise_document_on' => 'Nästa revidering av dokumentversion [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revisioner som saknar grupp', 'revisions_without_user' => 'Revisioner som saknar användare', 'revision_date' => 'Datum för revision', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 3d546bb16..da7ae9c06 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -89,11 +89,14 @@ URL: [url]', 'and' => 've', 'apply' => 'Uygula', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Onay talebi silindi', @@ -431,6 +434,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Sürüklenen klasörden dosya', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Hızlı yükleme', 'drop_files_here' => 'Dosyaları buraya sürükleyin!', 'dump_creation' => 'Veritabanı dump oluşturma', @@ -929,8 +933,11 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'quota_is_disabled' => 'Kota desteği ayarlardan kapatılmış durumda. Açılana kadar kullanıcıya kota tanımlamanın bir etkisi olmaz.', 'quota_warning' => 'Size ayrılan disk kotası [bytes] aşıldı. Lütfen gereksiz olduğunu düşündüğünüz dokümanları veya eski versiyonları silin.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -994,8 +1001,11 @@ URL: [url]', 'reviewer_already_assigned' => 'zaten kontrol eden olarak tanımlı', 'reviewer_already_removed' => 'kontrol sürecinden silindi veya zaten kontrolü gönderdi', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Kontrol talebi silindi', @@ -1023,9 +1033,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 90ee03d4d..a7463efb5 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'і', 'apply' => 'Застосувати', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Запит на підтвердження скасовано', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Файл з прохідного каталогу', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Швидке завантаження', 'drop_files_here' => 'Перемістіть файли сюди', 'dump_creation' => 'Створити дамп БД', @@ -930,8 +934,11 @@ URL: [url]', 'quota_is_disabled' => 'Квотування відключено', 'quota_warning' => 'Ваша дискова квота перевищена на [bytes]. Видаліть непотрібні документи або їх попередні версії.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1000,8 +1007,11 @@ URL: [url]', 'reviewer_already_assigned' => 'вже призначений для рецензування', 'reviewer_already_removed' => 'вже видалено зі списку рецензентів або вже лишив рецензію', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Запит на редагування видалено', @@ -1039,9 +1049,13 @@ URL: [url]', 'revise_document' => 'Ревізувати документ', 'revise_document_on' => 'Наступна ревізія документу [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => 'Дата ревізії', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index b2e4a8ac8..4bb139c98 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'and', 'apply' => '应用', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] 审核和 [no_reviews] 校对已通过', 'approvals_and_reviews_not_touched' => '[no_approvals] 审核和 [no_reviews] 校对暂未执行', 'approvals_and_reviews_rejected' => '[no_approvals] 审核和 [no_reviews] 校对未通过', 'approvals_not_touched' => '[no_approvals] 审核未执行', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] 审核未通过', +'approvals_rejected_latest' => '', 'approvals_without_group' => '不含组的审核', 'approvals_without_user' => '不含用户的审核', 'approval_deletion_email' => '审核请求已被删除', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '所选文件夹的文件', 'dropfolder_folder' => '从下拉菜单中选择文件夹', +'dropfolder_metadata' => '', 'dropupload' => '快速上传', 'drop_files_here' => '拖入这里', 'dump_creation' => '转储数据', @@ -929,8 +933,11 @@ URL: [url]', 'quota_is_disabled' => '配额的支持', 'quota_warning' => '您的磁盘最大使用量已超过 [bytes]。请删除文档或以前的版本。', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -992,8 +999,11 @@ URL: [url]', 'reviewer_already_assigned' => '已经被指派为校对人', 'reviewer_already_removed' => '已经从校对队列中删除或者已经提交校对', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '校对请求被删除', @@ -1021,9 +1031,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '[no_revisions] 修订已被接受', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '修订日期', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 7f878c1d1..576fcd0b2 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => '和', 'apply' => '接受', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => '審核請求已被刪除', @@ -382,6 +385,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '檔案來源為 drop 目錄', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => '快速上傳', 'drop_files_here' => '拖入這裡', 'dump_creation' => '轉儲數據', @@ -816,8 +820,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => '', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -865,8 +872,11 @@ URL: [url]', 'reviewer_already_assigned' => '已經被指派為校對人', 'reviewer_already_removed' => '已經從校對佇列中刪除或者已經提交校對', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '校對請求被刪除', @@ -887,9 +897,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', From ac0824ae37cd9afc12582c32229dee44ef80c6fb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 16:07:27 +0100 Subject: [PATCH 244/467] set access object --- out/out.TransferObjects.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/out/out.TransferObjects.php b/out/out.TransferObjects.php index b2a0095c8..1118a1305 100644 --- a/out/out.TransferObjects.php +++ b/out/out.TransferObjects.php @@ -20,6 +20,7 @@ if(!isset($settings)) require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); require_once("inc/inc.Language.php"); require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); @@ -27,8 +28,11 @@ require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); require_once("inc/inc.Authentication.php"); -if (!$user->isAdmin()) { - UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); +if (!$accessop->check_view_access($view, $_GET)) { + UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax); } if (!isset($_GET["userid"]) || !is_numeric($_GET["userid"]) || intval($_GET["userid"])<1) { @@ -46,11 +50,10 @@ if ($rmuser->getID()==$user->getID()) { $allusers = $dms->getAllUsers($settings->_sortUsersInList); -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { $view->setParam('rmuser', $rmuser); $view->setParam('allusers', $allusers); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } From b095c48ddd2a5ed43a930579f5fa81e56ecf7e0b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 18:20:53 +0100 Subject: [PATCH 245/467] formField() treats a value == "0" as not empty --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index d8c148740..478fecb97 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -906,7 +906,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; (!empty($value['type']) ? ' type="'.$value['type'].'"' : ''). (!empty($value['id']) ? ' id="'.$value['id'].'"' : ''). (!empty($value['name']) ? ' name="'.$value['name'].'"' : ''). - (!empty($value['value']) ? ' value="'.$value['value'].'"' : ''). + (is_string($value['value']) || !empty($value['value']) ? ' value="'.$value['value'].'"' : ''). (!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : ''). (!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : ''). (!empty($value['checked']) ? ' checked' : ''). From b2715684a3b113564a121e42b61f12dd06179035 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 18:21:34 +0100 Subject: [PATCH 246/467] use formField() instead of plain html --- .../class.RemoveUserFromProcesses.php | 159 ++++++++++++------ 1 file changed, 111 insertions(+), 48 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index 768f09c49..ec202ce24 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -80,66 +80,129 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { } ?> -
      -
      - -
      -
      +formField( + getMLText('reviews_not_touched', array('no_reviews' => count($tmpr["0"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[review][]', + 'value'=>'0', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"]))) + ) + ); +?> -
      -
      - -
      -
      +formField( + getMLText('reviews_accepted', array('no_reviews' => count($tmpr["1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"]))) + ) + ); +?> -
      -
      - -
      -
      +formField( + getMLText('reviews_rejected', array('no_reviews' => count($tmpr["-1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'-1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"]))) + ) + ); +?> -
      -
      - -
      -
      +formField( + getMLText('approvals_not_touched', array('no_approvals' => count($tmpa["0"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'0', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"]))) + ) + ); +?> -
      -
      - -
      -
      +formField( + getMLText('approvals_accepted', array('no_approvals' => count($tmpa["1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"]))) + ) + ); +?> -
      -
      - -
      -
      +formField( + getMLText('approvals_rejected', array('no_approvals' => count($tmpa["-1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'-1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"]))) + ) + ); +?> - -
      -
      - -
      -
      +getAllUsers($sortusersinlist); + foreach ($allUsers as $currUser) { + if (!$currUser->isGuest()) + $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), ($currUser->getID()==$user->getID()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); + } + $this->formField( + getMLText("user"), + array( + 'element'=>'select', + 'id'=>'newuser', + 'name'=>'newuserid', + 'class'=>'chzn-select', + 'options'=>$options + ) + ); + */ + $this->formSubmit(" ".getMLText('rm_user_from_processes')); +?> Date: Tue, 19 Nov 2019 21:03:19 +0100 Subject: [PATCH 247/467] add scheduler to menu --- views/bootstrap/class.Bootstrap.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 6bf7b63db..e2ea94d18 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -831,6 +831,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>'charts'); if ($this->check_access('Timeline')) $menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>'timeline'); + if ($this->check_access('SchedulerTaskMgr')) + $menuitems['misc']['children']['schedulertaskmgr'] = array('link'=>"../out/out.SchedulerTaskMgr.php", 'label'=>'scheduler_task_mgr'); if ($this->check_access('ObjectCheck')) $menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>'objectcheck'); if ($this->check_access('ExpiredDocuments')) From d9a4305fd7ef423421771c0c6e1b5c040e673e6e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 21:03:44 +0100 Subject: [PATCH 248/467] remove second instance of SeedDMS_AccessOperation --- out/out.Calendar.php | 2 -- out/out.Timeline.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/out/out.Calendar.php b/out/out.Calendar.php index 325a54066..2920c0c0a 100644 --- a/out/out.Calendar.php +++ b/out/out.Calendar.php @@ -49,8 +49,6 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume } else $document = null; -$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); - $calendar = new SeedDMS_Calendar($dms->getDB(), $user); if(isset($_GET['eventid']) && $_GET['eventid'] && is_numeric($_GET['eventid'])) { diff --git a/out/out.Timeline.php b/out/out.Timeline.php index f71abdfa9..52c47ef03 100644 --- a/out/out.Timeline.php +++ b/out/out.Timeline.php @@ -42,8 +42,6 @@ if(isset($_GET['skip'])) else $skip = array(); -$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); - $document = null; $content = null; if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['documentid'])) { From 270770782f2135aea1d2662a1d2ca53a876f7da9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:11:24 +0100 Subject: [PATCH 249/467] verifyStatus() handles status change when S_EXPIRED is set --- SeedDMS_Core/Core/inc.ClassDocument.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 799d3f243..56603dba3 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -3285,7 +3285,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } elseif($st["status"]==S_IN_REVISION) { if($needsCorrection) $this->setStatus(S_NEEDS_CORRECTION,$msg,$user); else $this->setStatus(S_RELEASED,$msg,$user); + } elseif($st["status"]==S_EXPIRED) { + $this->setStatus(S_RELEASED,$msg,$user); } + } } /* }}} */ From 43f57637e794ab1468b02a54104ef2d76dec9481 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:12:11 +0100 Subject: [PATCH 250/467] add method check_view_lecacy_access() which does the legacy access checking if advanded acl is turned off --- inc/inc.ClassAccessOperation.php | 107 +++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 4 deletions(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index fca3e73b1..b4d44aae4 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -406,6 +406,108 @@ class SeedDMS_AccessOperation { return false; } /* }}} */ + protected function check_view_lecacy_access($view, $get=array()) { /* {{{ */ + if($this->user->isAdmin()) + return true; + + if(is_string($view)) { + $scripts = array($view); + } elseif(is_array($view)) { + $scripts = $view; + } elseif(is_subclass_of($view, 'SeedDMS_View_Common')) { + $scripts = array($view->getParam('class')); + } else { + return false; + } + if(array_intersect($scripts, array( + 'AddDocument', + 'AddEvent', + 'AddFile', + 'AddSubFolder', + 'AddToTransmittal', + 'ApprovalSummary', + 'ApproveDocument', + 'Calendar', + 'CategoryChooser', + 'ChangePassword', + 'CheckInDocument', + 'Clipboard', + 'DocumentAccess', + 'DocumentChooser', + 'DocumentNotify', + 'DocumentVersionDetail', + 'DropFolderChooser', + 'EditAttributes', + 'EditComment', + 'EditDocumentFile', + 'EditDocument', + 'EditEvent', + 'EditFolder', + 'EditOnline', + 'EditUserData', + 'ErrorDlg', + 'FolderAccess', + 'FolderChooser', + 'FolderNotify', + 'ForcePasswordChange', + 'GroupView', + 'Help', + 'Info', + 'KeywordChooser', + 'Login', + 'ManageNotify', + 'MoveDocument', + 'MoveFolder', + 'MyAccount', + 'MyDocuments', + 'OpensearchDesc', + 'OverrideContentStatus', + 'PasswordForgotten', + 'PasswordSend', + 'ReceiptDocument', + 'ReceiptSummary', + 'RemoveDocumentFile', + 'RemoveDocument', + 'RemoveEvent', + 'RemoveFolderFiles', + 'RemoveFolder', + 'RemoveTransmittal', + 'RemoveVersion', + 'RemoveWorkflowFromDocument', + 'ReturnFromSubWorkflow', + 'ReviewDocument', + 'ReviewSummary', + 'ReviseDocument', + 'RewindWorkflow', + 'RunSubWorkflow', + 'SearchForm', + 'Search', + 'Session', + 'SetExpires', + 'SetRecipients', + 'SetReviewersApprovers', + 'SetRevisors', + 'SetWorkflow', + 'SubstituteUser', + 'TimelineFeed', + 'Timeline', + 'TransmittalMgr', + 'TriggerWorkflow', + 'UpdateDocument', + 'UserDefaultKeywords', + 'UserImage', + 'UserList', + 'UsrView', + 'ViewDocument', + 'ViewEvent', + 'ViewFolder', + 'WorkflowGraph', + 'WorkflowSummary'))) + return true; + + return false; + } /* }}} */ + /** * Check for access permission on view * @@ -426,10 +528,7 @@ class SeedDMS_AccessOperation { */ function check_view_access($view, $get=array()) { /* {{{ */ if(!$this->settings->_advancedAcl) { - if($this->user->isAdmin()) - return true; - else - return false; + return $this->check_view_lecacy_access($view, $get); } if(is_string($view)) { $scripts = array($view); From a493e7645dff0726989d787cfb5a9b1063055bdf Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:13:07 +0100 Subject: [PATCH 251/467] set accessobject already in factory --- inc/inc.ClassUI.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index 0b9efd8e9..d591e5062 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -45,7 +45,7 @@ class UI extends UI_Default { * @return object an object of a class implementing the view */ static function factory($theme, $class='', $params=array()) { /* {{{ */ - global $settings, $session, $EXT_CONF; + global $settings, $dms, $user, $session, $EXT_CONF; if(!$class) { $class = 'Bootstrap'; $classname = "SeedDMS_Bootstrap_Style"; @@ -105,6 +105,7 @@ class UI extends UI_Default { require($filename); $view = new $classname($params, $theme); /* Set some configuration parameters */ + $view->setParam('accessobject', new SeedDMS_AccessOperation($dms, $user, $settings)); $view->setParam('refferer', $_SERVER['REQUEST_URI']); $view->setParam('absbaseprefix', $settings->_httpRoot.$httpbasedir); $view->setParam('class', $class); From 1b6a07b73e466d792d490941d2992d9ebbce2ab6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:13:28 +0100 Subject: [PATCH 252/467] more documentation --- inc/inc.ClassViewCommon.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php index 7f52cd0fc..f32f43259 100644 --- a/inc/inc.ClassViewCommon.php +++ b/inc/inc.ClassViewCommon.php @@ -210,6 +210,9 @@ class SeedDMS_View_Common { * to check access rights. If the the optional $name is not set the * current view is used. * + * If $name is an array then just one of the passed objects in the array + * must be accessible for this function to return true. + * * @param string|array $name name of view or list of view names * @return boolean true if access is allowed otherwise false */ From ed32e8e2b2ea0c144e95ac12391874c678585651 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:13:51 +0100 Subject: [PATCH 253/467] call $accessobject->check_view_access() instead of $this->check_access() --- views/bootstrap/class.Bootstrap.php | 96 ++++++++++++++++------------- 1 file changed, 52 insertions(+), 44 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index e2ea94d18..abf9207fc 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -281,6 +281,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; */ function __menuTasks($tasks) { /* {{{ */ $dms = $this->params['dms']; + $accessobject = $this->params['accessobject']; $content = ''; // $content .= "
        \n"; // $content .= "
      • \n"; @@ -330,7 +331,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $content .= "
      \n"; $content .= " \n"; } - if ($this->check_access('MyDocuments')) { + if ($accessobject->check_view_access('MyDocuments')) { $content .= "
    • \n"; $content .= "
    • ".getMLText("my_documents")."
      • \n"; } @@ -342,6 +343,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; function globalNavigation($folder=null) { /* {{{ */ $dms = $this->params['dms']; + $accessobject = $this->params['accessobject']; echo "
      \n"; echo "
      \n"; echo "
      \n"; @@ -359,11 +361,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo "
        \n"; if (!$this->params['user']->isGuest()) { $menuitems = array(); - if ($this->check_access('MyDocuments')) + if ($accessobject->check_view_access('MyDocuments')) $menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'my_documents'); - if ($this->check_access('MyAccount')) + if ($accessobject->check_view_access('MyAccount')) $menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account'); - if ($this->check_access('TransmittalMgr')) + if ($accessobject->check_view_access('TransmittalMgr')) $menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals'); $hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap'); foreach($hookObjs as $hookObj) { @@ -453,8 +455,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo "
          \n"; // echo "
        • params['rootfolderid']."\">".getMLText("content")."
          • \n"; // echo "
        • params['rootfolderid']."\">".getMLText("search")."
          • \n"; - if ($this->params['enablecalendar'] && $this->check_access('Calendar')) echo "
        • params['calendardefaultview']."\">".getMLText("calendar")."
          • \n"; - if ($this->check_access('AdminTools')) echo "
        • ".getMLText("admin_tools")."
          • \n"; + if ($this->params['enablecalendar'] && $accessobject->check_view_access('Calendar')) echo "
        • params['calendardefaultview']."\">".getMLText("calendar")."
          • \n"; + if ($accessobject->check_view_access('AdminTools')) echo "
        • ".getMLText("admin_tools")."
          • \n"; if($this->params['enablehelp']) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); echo "
        • ".getMLText("help")."
          • \n"; @@ -572,6 +574,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; private function folderNavigationBar($folder) { /* {{{ */ $dms = $this->params['dms']; + $accessobject = $this->params['accessobject']; if (!is_object($folder) || !$folder->isType('folder')) { echo "
            \n"; echo "
          \n"; @@ -585,12 +588,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $menuitems = array(); if ($accessMode == M_READ && !$this->params['user']->isGuest()) { + if ($accessobject->check_view_access('FolderNotify')) $menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_notify'); } else if ($accessMode >= M_READWRITE) { - if ($this->check_access('AddSubFolder')) + if ($accessobject->check_view_access('AddSubFolder')) $menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_subfolder'); - if ($this->check_access('AddDocument')) + if ($accessobject->check_view_access('AddDocument')) $menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_document'); if(0 && $this->params['enablelargefileupload']) $menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_multiple_documents'); @@ -623,6 +627,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } /* }}} */ private function documentNavigationBar($document) { /* {{{ */ + $accessobject = $this->params['accessobject']; $accessMode = $document->getAccessMode($this->params['user']); $docid=".php?documentid=" . $document->getID(); echo "".getMLText("document")."\n"; @@ -667,7 +672,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } if ($accessMode == M_ALL) { $menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document'); - if ($this->check_access('DocumentAccess')) + if ($accessobject->check_view_access('DocumentAccess')) $menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access'); } if ($accessMode >= M_READ && !$this->params['user']->isGuest()) { @@ -701,6 +706,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } /* }}} */ private function accountNavigationBar() { /* {{{ */ + $accessobject = $this->params['accessobject']; echo "".getMLText("my_account")."\n"; echo "
          \n"; echo "
            \n"; @@ -717,9 +723,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'edit_existing_notify'); if ($this->params['enableusersview']){ - if ($this->check_access('UsrView')) + if ($accessobject->check_view_access('UsrView')) $menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>'users'); - if ($this->check_access('GroupView')) + if ($accessobject->check_view_access('GroupView')) $menuitems['groups'] = array('link'=>"../out/out.GroupView.php", 'label'=>'groups'); } @@ -735,6 +741,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } /* }}} */ private function myDocumentsNavigationBar() { /* {{{ */ + $accessobject = $this->params['accessobject']; echo "".getMLText("my_documents")."\n"; echo "
            \n"; @@ -763,91 +770,92 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } /* }}} */ private function adminToolsNavigationBar() { /* {{{ */ + $accessobject = $this->params['accessobject']; echo " ".getMLText("admin_tools")."\n"; echo "
            \n"; echo "
              \n"; - if($this->check_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) { + if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) { $menuitems = array(); $menuitems['user_group_management'] = array('link'=>"#", 'label'=>'user_group_management'); - if ($this->check_access('UsrMgr')) + if ($accessobject->check_view_access('UsrMgr')) $menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>'user_management'); - if ($this->check_access('RoleMgr')) + if ($accessobject->check_view_access('RoleMgr')) $menuitems['user_group_management']['children']['role_management'] = array('link'=>"../out/out.RoleMgr.php", 'label'=>'role_management'); - if ($this->check_access('GroupMgr')) + if ($accessobject->check_view_access('GroupMgr')) $menuitems['user_group_management']['children']['group_management'] = array('link'=>"../out/out.GroupMgr.php", 'label'=>'group_management'); - if ($this->check_access('UserList')) + if ($accessobject->check_view_access('UserList')) $menuitems['user_group_management']['children']['user_list'] = array('link'=>"../out/out.UserList.php", 'label'=>'user_list'); - if ($this->check_access('Acl')) + if ($accessobject->check_view_access('Acl')) $menuitems['user_group_management']['children']['access_control'] = array('link'=>"../out/out.Acl.php", 'label'=>'access_control'); } - if($this->check_access(array('DefaultKeywords', 'Categories', 'AttributeMgr', 'WorkflowMgr', 'WorkflowStatesMgr', 'WorkflowActionsMgr'))) { + if($accessobject->check_view_access(array('DefaultKeywords', 'Categories', 'AttributeMgr', 'WorkflowMgr', 'WorkflowStatesMgr', 'WorkflowActionsMgr'))) { $menuitems['definitions'] = array('link'=>"#", 'label'=>'definitions'); - if ($this->check_access('DefaultKeywords')) + if ($accessobject->check_view_access('DefaultKeywords')) $menuitems['definitions']['children']['default_keywords'] = array('link'=>"../out/out.DefaultKeywords.php", 'label'=>'global_default_keywords'); - if ($this->check_access('Categories')) + if ($accessobject->check_view_access('Categories')) $menuitems['definitions']['children']['document_categories'] = array('link'=>"../out/out.Categories.php", 'label'=>'global_document_categories'); - if ($this->check_access('AttributeMgr')) + if ($accessobject->check_view_access('AttributeMgr')) $menuitems['definitions']['children']['attribute_definitions'] = array('link'=>"../out/out.AttributeMgr.php", 'label'=>'global_attributedefinitions'); if($this->params['workflowmode'] == 'advanced') { - if ($this->check_access('WorkflowMgr')) + if ($accessobject->check_view_access('WorkflowMgr')) $menuitems['definitions']['children']['workflows'] = array('link'=>"../out/out.WorkflowMgr.php", 'label'=>'global_workflows'); - if ($this->check_access('WorkflowStatesMgr')) + if ($accessobject->check_view_access('WorkflowStatesMgr')) $menuitems['definitions']['children']['workflow_states'] = array('link'=>"../out/out.WorkflowStatesMgr.php", 'label'=>'global_workflow_states'); - if ($this->check_access('WorkflowActionsMgr')) + if ($accessobject->check_view_access('WorkflowActionsMgr')) $menuitems['definitions']['children']['workflow_actions'] = array('link'=>"../out/out.WorkflowActionsMgr.php", 'label'=>'global_workflow_actions'); } } if($this->params['enablefullsearch']) { - if($this->check_access(array('Indexer', 'CreateIndex', 'IndexInfo'))) { + if($accessobject->check_view_access(array('Indexer', 'CreateIndex', 'IndexInfo'))) { $menuitems['fulltext'] = array('link'=>"#", 'label'=>'fullsearch'); - if ($this->check_access('Indexer')) + if ($accessobject->check_view_access('Indexer')) $menuitems['fulltext']['children']['update_fulltext_index'] = array('link'=>"../out/out.Indexer.php", 'label'=>'update_fulltext_index'); - if ($this->check_access('CreateIndex')) + if ($accessobject->check_view_access('CreateIndex')) $menuitems['fulltext']['children']['create_fulltext_index'] = array('link'=>"../out/out.CreateIndex.php", 'label'=>'create_fulltext_index'); - if ($this->check_access('IndexInfo')) + if ($accessobject->check_view_access('IndexInfo')) $menuitems['fulltext']['children']['fulltext_info'] = array('link'=>"../out/out.IndexInfo.php", 'label'=>'fulltext_info'); } } - if($this->check_access(array('BackupTools', 'LogManagement'))) { + if($accessobject->check_view_access(array('BackupTools', 'LogManagement'))) { $menuitems['backup_log_management'] = array('link'=>"#", 'label'=>'backup_log_management'); - if ($this->check_access('BackupTools')) + if ($accessobject->check_view_access('BackupTools')) $menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.BackupTools.php", 'label'=>'backup_tools'); if ($this->params['logfileenable']) - if ($this->check_access('LogManagement')) + if ($accessobject->check_view_access('LogManagement')) $menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.LogManagement.php", 'label'=>'log_management'); } - if($this->check_access(array('Statistic', 'Charts', 'Timeline', 'ObjectCheck', 'ExtensionMgr', 'Info'))) { + if($accessobject->check_view_access(array('Statistic', 'Charts', 'Timeline', 'ObjectCheck', 'ExtensionMgr', 'Info'))) { $menuitems['misc'] = array('link'=>"#", 'label'=>'misc'); - if ($this->check_access('ImportFS')) + if ($accessobject->check_view_access('ImportFS')) $menuitems['misc']['children']['import_fs'] = array('link'=>"../out/out.ImportFS.php", 'label'=>'import_fs'); - if ($this->check_access('Statistic')) + if ($accessobject->check_view_access('Statistic')) $menuitems['misc']['children']['folders_and_documents_statistic'] = array('link'=>"../out/out.Statistic.php", 'label'=>'folders_and_documents_statistic'); - if ($this->check_access('Charts')) + if ($accessobject->check_view_access('Charts')) $menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>'charts'); - if ($this->check_access('Timeline')) + if ($accessobject->check_view_access('Timeline')) $menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>'timeline'); - if ($this->check_access('SchedulerTaskMgr')) + if ($accessobject->check_view_access('SchedulerTaskMgr')) $menuitems['misc']['children']['schedulertaskmgr'] = array('link'=>"../out/out.SchedulerTaskMgr.php", 'label'=>'scheduler_task_mgr'); - if ($this->check_access('ObjectCheck')) + if ($accessobject->check_view_access('ObjectCheck')) $menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>'objectcheck'); - if ($this->check_access('ExpiredDocuments')) + if ($accessobject->check_view_access('ExpiredDocuments')) $menuitems['misc']['children']['documents_expired'] = array('link'=>"../out/out.ExpiredDocuments.php", 'label'=>'documents_expired'); - if ($this->check_access('ExtensionMgr')) + if ($accessobject->check_view_access('ExtensionMgr')) $menuitems['misc']['children']['extension_manager'] = array('link'=>"../out/out.ExtensionMgr.php", 'label'=>'extension_manager'); - if ($this->check_access('ClearCache')) + if ($accessobject->check_view_access('ClearCache')) $menuitems['misc']['children']['clear_cache'] = array('link'=>"../out/out.ClearCache.php", 'label'=>'clear_cache'); - if ($this->check_access('Info')) + if ($accessobject->check_view_access('Info')) $menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>'version_info'); } - if($this->check_access(array('Hooks'))) { + if($accessobject->check_view_access(array('Hooks'))) { $menuitems['debug'] = array('link'=>"#", 'label'=>'debug'); - if ($this->check_access('Hooks')) + if ($accessobject->check_view_access('Hooks')) $menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>'list_hooks'); } From 4e0cf697cbb88d28e31a9a5187518bf56f110800 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:14:34 +0100 Subject: [PATCH 254/467] set 'onepage' in view --- out/out.MyDocuments.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php index d4f73fd67..26c564ae1 100644 --- a/out/out.MyDocuments.php +++ b/out/out.MyDocuments.php @@ -56,6 +56,7 @@ if($view) { $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } From 21e1efc1473d6a396fab1baf9261d2f3b0f9d19d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:17:04 +0100 Subject: [PATCH 255/467] set 'onepage' in view --- out/out.ApprovalSummary.php | 1 + out/out.ReviewSummary.php | 1 + 2 files changed, 2 insertions(+) diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index 370234205..6132b73e8 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -41,6 +41,7 @@ if($view) { $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index 370234205..6132b73e8 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -41,6 +41,7 @@ if($view) { $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } From d2382f437ce1bc1dc7f1ce15928dfa180def60f5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:37:52 +0100 Subject: [PATCH 256/467] set 'onepage' for view --- out/out.ReceiptSummary.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php index 00d8ed5ae..2d51e49e8 100644 --- a/out/out.ReceiptSummary.php +++ b/out/out.ReceiptSummary.php @@ -46,6 +46,7 @@ if($view) { $view->setParam('previewconverters', $settings->_converters['preview']); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('accessobject', $accessop); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } From 55727bd1a23af7737c22b7b5e847ff426cd6f835 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:47:57 +0100 Subject: [PATCH 257/467] do not use $this->check_access() anymore --- views/bootstrap/class.Acl.php | 7 +- views/bootstrap/class.RoleMgr.php | 3 +- views/bootstrap/class.Tasks.php | 3 +- views/bootstrap/class.UserList.php | 3 +- views/bootstrap/class.UsrMgr.php | 12 +-- views/bootstrap/class.ViewDocument.php | 114 ++++++++++++------------- 6 files changed, 73 insertions(+), 69 deletions(-) diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php index d20321f25..8ccd96601 100644 --- a/views/bootstrap/class.Acl.php +++ b/views/bootstrap/class.Acl.php @@ -133,6 +133,7 @@ $(document).ready( function() { $dms = $this->params['dms']; $user = $this->params['user']; $selrole = $this->params['selrole']; + $accessobject = $this->params['accessobject']; if($selrole) { $this->contentHeading(getMLText("role_info")); @@ -148,11 +149,11 @@ $(document).ready( function() { echo "
              ".htmlspecialchars($currUser->getComment()).""; echo ""; echo "
      "; echo ""; echo "\n"; @@ -682,69 +682,69 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
        "; if ($file_exists){ - if($accessop->check_controller_access('Download', array('action'=>'version'))) { + if($accessobject->check_controller_access('Download', array('action'=>'version'))) { print "
      • getVersion()."\">".getMLText("download")."
        • "; } - if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) { + if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) { if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes))) print "
      • getVersion()."\">" . getMLText("view_online") . "
        • "; } } print "
      "; print "
        "; - if($this->check_access('EditOnline')) - if($accessop->mayEditVersion($document)) { + if($accessobject->check_view_access('EditOnline')) + if($accessobject->mayEditVersion($document)) { print "
      • ".$this->html_link('EditOnline', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("edit_version"), false, true)."
        • "; } /* Only admin has the right to remove version in any case or a regular * user if enableVersionDeletion is on */ - if($accessop->check_controller_access('RemoveVersion')) - if($accessop->mayRemoveVersion($document)) { + if($accessobject->check_controller_access('RemoveVersion')) + if($accessobject->mayRemoveVersion($document)) { print "
      • ".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("rm_version"), false, true)."
        • "; } - if($accessop->check_controller_access('OverrideContentStatus')) - if($accessop->mayOverrideStatus($document)) { + if($accessobject->check_controller_access('OverrideContentStatus')) + if($accessobject->mayOverrideStatus($document)) { print "
      • ".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("change_status"), false, true)."
        • "; } - if($enablereceiptworkflow && $accessop->check_controller_access('SetRecipients')) - if($accessop->maySetRecipients($document)) { + if($enablereceiptworkflow && $accessobject->check_controller_access('SetRecipients')) + if($accessobject->maySetRecipients($document)) { print "
      • ".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("change_recipients"), false, true)."
        • "; } - if($enablerevisionworkflow && $accessop->check_controller_access('SetRevisors')) - if($accessop->maySetRevisors($document)) { + if($enablerevisionworkflow && $accessobject->check_controller_access('SetRevisors')) + if($accessobject->maySetRevisors($document)) { print "
      • ".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("change_revisors"), false, true)."
        • "; } if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { // Allow changing reviewers/approvals only if not reviewed - if($accessop->check_controller_access('SetReviewersApprovers')) - if($accessop->maySetReviewersApprovers($document)) { + if($accessobject->check_controller_access('SetReviewersApprovers')) + if($accessobject->maySetReviewersApprovers($document)) { print "
      • ".$this->html_link('SetReviewersApprovers', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("change_assignments"), false, true)."
        • "; } } else { - if($accessop->check_controller_access('SetWorkflow')) - if($accessop->maySetWorkflow($document)) { + if($accessobject->check_controller_access('SetWorkflow')) + if($accessobject->maySetWorkflow($document)) { if(!$workflow) { print "
      • ".$this->html_link('SetWorkflow', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("set_workflow"), false, true)."
        • "; } } } /* - if($accessop->maySetExpires($document)) { + if($accessobject->maySetExpires($document)) { print "
      • ".$this->html_link('SetExpires', array('documentid'=>$documentid), array(), "".getMLText("set_expiry"), false, true)."
        • "; } */ - if($accessop->check_controller_access('AddToTransmittal')) + if($accessobject->check_controller_access('AddToTransmittal')) if($dms->getAllTransmittals($user)) { - if($this->check_access('AddToTransmittal')) + if($accessobject->check_view_access('AddToTransmittal')) print "
      • ".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("add_to_transmittal"), false, true)."
        • "; } - if($accessop->check_controller_access('EditComment')) - if($accessop->mayEditComment($document)) { + if($accessobject->check_controller_access('EditComment')) + if($accessobject->mayEditComment($document)) { print "
      • ".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("edit_comment"), false, true)."
        • "; } - if($accessop->check_controller_access('EditAttributes')) - if($accessop->mayEditAttributes($document)) { + if($accessobject->check_controller_access('EditAttributes')) + if($accessobject->mayEditAttributes($document)) { print "
      • ".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "".getMLText("edit_attributes"), false, true)."
        • "; } @@ -881,7 +881,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print htmlspecialchars($r["comment"]); if($r['file']) { echo "
        "; - if($accessop->check_controller_access('Download', array('action'=>'run'))) { + if($accessobject->check_controller_access('Download', array('action'=>'run'))) { echo " ".getMLText('download').""; } } @@ -891,11 +891,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($accesserr) echo "
      • ".$accesserr."
        • "; - if($accessop->mayReview($document)) { + if($accessobject->mayReview($document)) { if ($is_reviewer) { if ($r["status"]==0) { print "
      • ".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."
        • "; - } elseif ($accessop->mayUpdateReview($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))){ + } elseif ($accessobject->mayUpdateReview($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))){ print "
      • ".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
        • "; } } @@ -973,7 +973,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print htmlspecialchars($a["comment"]); if($a['file']) { echo "
        "; - if($accessop->check_controller_access('Download', array('action'=>'run'))) { + if($accessobject->check_controller_access('Download', array('action'=>'run'))) { echo " ".getMLText('download').""; } } @@ -983,11 +983,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($accesserr) echo "
      • ".$accesserr."
        • "; - if($accessop->mayApprove($document)) { + if($accessobject->mayApprove($document)) { if ($is_approver) { if ($a['status'] == 0) { print "
      • ".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."
        • "; - } elseif ($accessop->mayUpdateApproval($document, $updateUser) && (($a["status"]==1)||($a["status"]==-1))){ + } elseif ($accessobject->mayUpdateApproval($document, $updateUser) && (($a["status"]==1)||($a["status"]==-1))){ print "
      • ".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
        • "; } } @@ -1045,7 +1045,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
        "; - if ($user_is_involved && $this->check_access('WorkflowGraph')) + if ($user_is_involved && $accessobject->check_view_access('WorkflowGraph')) echo "
        "; else echo "
        "; @@ -1233,7 +1233,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } $this->contentContainerEnd(); echo "
        "; - if ($user_is_involved && $this->check_access('WorkflowGraph')) { + if ($user_is_involved && $accessobject->check_view_access('WorkflowGraph')) { echo "
        "; ?> @@ -1322,11 +1322,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
      ".($parent ? '' : '')."".($parent ? '' : '')."".getMLText("name"); print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; From 120fd46bfd48d5c89f400533bb01bb096236aa15 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 10:10:08 +0100 Subject: [PATCH 226/467] adding conf for editorconfig --- .editorconfig | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..9f5028851 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +trim_trailing_whitespaces = true +indent_style = tab +indent_size = 4 From 7932349bf66daab5c3f8c825183384404e975202 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 10:11:06 +0100 Subject: [PATCH 227/467] set indent_size to 2 --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 9f5028851..072c0c22b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,4 +5,4 @@ charset = utf-8 end_of_line = lf trim_trailing_whitespaces = true indent_style = tab -indent_size = 4 +indent_size = 2 From 3c26142744de4f4c3bfb7747eec39730d3051776 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 12:06:41 +0100 Subject: [PATCH 228/467] onePageMode can be turned on/off --- inc/inc.ClassSettings.php | 4 ++++ op/op.Settings.php | 1 + out/out.ViewFolder.php | 2 +- views/bootstrap/class.Settings.php | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 5561d2fd4..564f4adda 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -125,6 +125,8 @@ class Settings { /* {{{ */ var $_enableConverting = false; // default style var $_theme = "bootstrap"; + // experimental one page mode for ViewFolder page + var $_onePageMode = false; // Workaround for page titles that go over more than 2 lines. var $_titleDisplayHack = true; // enable/disable automatic email notification @@ -433,6 +435,7 @@ class Settings { /* {{{ */ if(trim(strval($tab["availablelanguages"]))) $this->_availablelanguages = explode(',',strval($tab["availablelanguages"])); $this->_theme = strval($tab["theme"]); + $this->_onePageMode = Settings::boolVal($tab["onePageMode"]); if(isset($tab["previewWidthList"])) $this->_previewWidthList = intval($tab["previewWidthList"]); if(isset($tab["previewWidthMenuList"])) @@ -786,6 +789,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "language", $this->_language); $this->setXMLAttributValue($node, "availablelanguages", implode(',', $this->_availablelanguages)); $this->setXMLAttributValue($node, "theme", $this->_theme); + $this->setXMLAttributValue($node, "onePageMode", $this->_onePageMode); $this->setXMLAttributValue($node, "previewWidthList", $this->_previewWidthList); $this->setXMLAttributValue($node, "previewWidthMenuList", $this->_previewWidthMenuList); $this->setXMLAttributValue($node, "previewWidthDetail", $this->_previewWidthDetail); diff --git a/op/op.Settings.php b/op/op.Settings.php index b02ee237c..ae396169a 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -64,6 +64,7 @@ if ($action == "saveSettings") else $settings->_availablelanguages = $_POST["availablelanguages"]; $settings->_theme = $_POST["theme"]; + $settings->_onePageMode = $_POST["onePageMode"]; $settings->_previewWidthList = $_POST["previewWidthList"]; $settings->_previewWidthMenuList = $_POST["previewWidthMenuList"]; $settings->_previewWidthDropFolderList = $_POST["previewWidthDropFolderList"]; diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index c7d2a4853..3ddf922ef 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -96,7 +96,7 @@ if($view) { $view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage); $view->setParam('offset', $offset); $view->setParam('limit', $limit); - $view->setParam('onepage', true); // do most navigation by reloading areas of pages with ajax + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index a83cdf384..5bf83d692 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -271,6 +271,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigOption('settings_available_languages', 'availablelanguages', getAvailableLanguages(), true, true); ?> showConfigOption('settings_language', 'language', getAvailableLanguages(), false, true); ?> showConfigOption('settings_theme', 'theme', UI::getStyles(), false, false); ?> +showConfigCheckbox('settings_onePageMode', 'onePageMode'); ?> showConfigText('settings_previewWidthList', 'previewWidthList'); ?> showConfigText('settings_previewWidthMenuList', 'previewWidthMenuList'); ?> showConfigText('settings_previewWidthDropFolderList', 'previewWidthDropFolderList'); ?> From 28b2c0249909a5ce870a94bb4991c158ab45a374 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 12:07:37 +0100 Subject: [PATCH 229/467] add keys settings_onePageMode and settings_onePageMode_desc --- languages/ar_EG/lang.inc | 2 ++ languages/bg_BG/lang.inc | 2 ++ languages/ca_ES/lang.inc | 2 ++ languages/cs_CZ/lang.inc | 2 ++ languages/de_DE/lang.inc | 4 +++- languages/el_GR/lang.inc | 2 ++ languages/en_GB/lang.inc | 4 +++- languages/es_ES/lang.inc | 2 ++ languages/fr_FR/lang.inc | 2 ++ languages/hr_HR/lang.inc | 2 ++ languages/hu_HU/lang.inc | 2 ++ languages/it_IT/lang.inc | 2 ++ languages/ko_KR/lang.inc | 2 ++ languages/lo_LA/lang.inc | 2 ++ languages/nl_NL/lang.inc | 2 ++ languages/pl_PL/lang.inc | 2 ++ languages/pt_BR/lang.inc | 2 ++ languages/ro_RO/lang.inc | 2 ++ languages/ru_RU/lang.inc | 2 ++ languages/sk_SK/lang.inc | 2 ++ languages/sv_SE/lang.inc | 2 ++ languages/tr_TR/lang.inc | 2 ++ languages/uk_UA/lang.inc | 2 ++ languages/zh_CN/lang.inc | 2 ++ languages/zh_TW/lang.inc | 2 ++ 25 files changed, 52 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index f0919a9e9..6a99a05a9 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1375,6 +1375,8 @@ URL: [url]', 'settings_Notification' => '', 'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 7cfe1f6ca..83741c002 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -1238,6 +1238,8 @@ $text = array( 'settings_Notification' => 'Настройка за известяване', 'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.', 'settings_no_content_dir' => 'Каталог със съдържанието', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Частичен размер на файла', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 0c8622a4b..01bcbb405 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -1243,6 +1243,8 @@ URL: [url]', 'settings_Notification' => '', 'settings_notwritable' => '', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 87cb4ae30..bc0faaec4 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1454,6 +1454,8 @@ Jméno: [username] 'settings_Notification' => 'Nastavení upozornění', 'settings_notwritable' => 'Konfigurace nemůže být uložena, protože se do konfiguračního souboru nedá zapsat.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Přepsat typ MimeType', 'settings_overrideMimeType_desc' => 'Přepsat MimeType dodaný prohlížečem, pokud je nahrán soubor. Nový MimeType je určen samotným SeedDMS.', 'settings_partitionSize' => 'Částečná velikost souboru', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 21dcce1ca..0add1a8b1 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2697), dgrutsch (22) +// Translators: Admin (2699), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -1464,6 +1464,8 @@ Name: [username] 'settings_Notification' => 'Benachrichtigungen-Einstellungen', 'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => 'Einseiten-Modus', +'settings_onePageMode_desc' => 'Der Einseiten-Modus schaltet javascript auf der ViewFolder-Seite ein, der die Ordner- und Dokumentenliste, die Navigation, etc. aktualisiert, wenn auf einen Ordner geklickt wird.', 'settings_overrideMimeType' => 'Überschreibe MimeType', 'settings_overrideMimeType_desc' => 'Überschreibe den MimeType, der vom Browser beim Hochladen einer Datei übertragen wird. Der neue MimeType wird von SeedDMS selbst ermittelt.', 'settings_partitionSize' => 'Partitionsgröße', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index c72b6c47e..82a7b9a2b 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -1249,6 +1249,8 @@ URL: [url]', 'settings_Notification' => '', 'settings_notwritable' => '', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index c2c459f38..b48452290 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1791), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1793), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1459,6 +1459,8 @@ Name: [username] 'settings_Notification' => 'Notification settings', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => 'One page mode', +'settings_onePageMode_desc' => 'One page mode will turn on javascript code on the ViewFolder page, which updates the folder/document list, navigation, etc. when clicking on a folder or changing the sort parameter.', 'settings_overrideMimeType' => 'Override MimeType', 'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.', 'settings_partitionSize' => 'Partial filesize', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index bc2d627d9..3aa3b6912 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -1390,6 +1390,8 @@ URL: [url]', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', 'settings_no_content_dir' => 'Carpeta de contenidos', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Anular MimeType', 'settings_overrideMimeType_desc' => 'Permitir que SeedDMS fije el tipo MIME sobreescribiendo el que haya definido el navegador durante el proceso de carga de un archivo.', 'settings_partitionSize' => 'Tamaño de fichero parcial', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 9cb33d667..0c8661165 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -1443,6 +1443,8 @@ Nom : [username] 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', 'settings_no_content_dir' => 'Répertoire de contenu', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Passer outre le type MIME', 'settings_overrideMimeType_desc' => 'Ne pas tenir compte du type MIME envoyé par le navigateur quand un fichier est téléversé. Le type MIME sera déterminé par SeedDMS.', 'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 14b61726a..b806dde70 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1411,6 +1411,8 @@ Internet poveznica: [url]', 'settings_Notification' => 'Postavke bilježenja', 'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.', 'settings_no_content_dir' => 'Mapa sadržaja', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Premosti tip datoteke', 'settings_overrideMimeType_desc' => 'Premošćivanje tipa datoteke određenog od strane pretraživača ako je datoteka učitana. Novi tip datoteke se određuje od strane DMS sustava.', 'settings_partitionSize' => 'Veličina djelomične datoteke', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 6e68cf456..fbce10eaf 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -1389,6 +1389,8 @@ URL: [url]', 'settings_Notification' => 'Értesítés beállításai', 'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.', 'settings_no_content_dir' => 'Tartalom könyvtár', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Részleges fájlméret', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index f4674863b..4cdcff3f9 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1445,6 +1445,8 @@ Name: [username] 'settings_Notification' => 'Impostazioni di notifica', 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.', 'settings_no_content_dir' => 'Cartella contenitore', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Ignora MimeType', 'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.', 'settings_partitionSize' => 'Dimensione file parziale', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index ed9171373..6f6c35321 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1405,6 +1405,8 @@ URL : [url]', 'settings_Notification' => '알림 설정', 'settings_notwritable' => '구성값을 저장할 수 없습니다 구성 파일에 쓰기 권한이 없습니다.', 'settings_no_content_dir' => '내용 디렉토리', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'MIME 타입 재정의', 'settings_overrideMimeType_desc' => '파일이 업로드 되는 경우, 브라우저에 의해 제공되는 MIME 타입을 재정의 합니다. 새로운 MIME 타입은 SeedDMS에 의해 결정 됩니다.', 'settings_partitionSize' => '조각 파일 크기', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index e53d12553..bdd3107b9 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -1438,6 +1438,8 @@ URL: [url]', 'settings_Notification' => 'ການຕັ້ງຄ່າການແຈ້ງເຕືອນ', 'settings_notwritable' => 'ການກຳນົດຄ່າທີ່ບໍ່ສາມາດບັນທືກໄດ້ຍ້ອນວ່າໄຟລກຳນົດຄ່າບໍ່ສາມາດຂຽນໄດ້', 'settings_no_content_dir' => 'ຜູ້ກຳກັບເນື້ອຫາ', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'ชนิดละครใบ้แทนที่', 'settings_overrideMimeType_desc' => 'แทนที่ ชนิดละครใบ้ ที่จัดส่งโดยเบราว์เซอร์ถ้าไฟล์ถูกอัปโหลด ชนิดละครใบ้ใหม่จะถูกกำหนดโดย SeedDMS เอง.', 'settings_partitionSize' => 'ໄຟລບາງສ່ວນ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 20bc78f30..980e33d72 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1435,6 +1435,8 @@ Name: [username] 'settings_Notification' => 'Notificatie instellingen', 'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.', 'settings_no_content_dir' => 'Inhoud map', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Override MimeType', 'settings_overrideMimeType_desc' => 'Override MimeType', 'settings_partitionSize' => 'Partitie-grootte', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 75913e9ef..12e0d82b8 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1369,6 +1369,8 @@ URL: [url]', 'settings_Notification' => 'Ustawienia powiadomień', 'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.', 'settings_no_content_dir' => 'Katalog treści', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Rozmiar części pliku', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 46e715528..2f1f1609c 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -1457,6 +1457,8 @@ Nome: [username] 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', 'settings_no_content_dir' => 'Diretório de conteúdo', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Substituir MimeType', 'settings_overrideMimeType_desc' => 'Substitua o MimeType entregue pelo navegador, se um arquivo for carregado. O novo MimeType é determinado pelo próprio SeedDMS.', 'settings_partitionSize' => 'Tamanho de arquivo parcial', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index eae81c265..98d53cc2a 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1412,6 +1412,8 @@ URL: [url]', 'settings_Notification' => 'Setările de notificare', 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.', 'settings_no_content_dir' => 'Director conținut', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Suprascrie MMimeType', 'settings_overrideMimeType_desc' => 'Suprascrie MimeType expus de browser, dacă un fișier este încărcat. MimeType este determinat de SeedDMS.', 'settings_partitionSize' => 'Dimensiune fișier parțială', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 94cc06907..9b1f3f640 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -1419,6 +1419,8 @@ URL: [url]', 'settings_Notification' => 'Настройки извещения', 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.', 'settings_no_content_dir' => 'Каталог содержимого', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Переопределить mime тип', 'settings_overrideMimeType_desc' => 'Переопределение mime типа предоставленного браузером, если файл загружен. Новый mime тип определяется самой SeedDMS.', 'settings_partitionSize' => 'Частичный размер файла', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 752d1e628..92b62ea7a 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -1459,6 +1459,8 @@ Meno: [username] 'settings_Notification' => 'Nastavenia notifikácií', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Override MimeType', 'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.', 'settings_partitionSize' => 'Čiastočná veľkosť súboru', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 327b150f0..b8649998f 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1432,6 +1432,8 @@ Kommentar: [comment]', 'settings_Notification' => 'Meddelandeinställningar', 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.', 'settings_no_content_dir' => 'Mapp för innehåll', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Åsido Mediatyp (Mime)', 'settings_overrideMimeType_desc' => 'Åsidosätta MimeType levererad av webbläsaren, om en fil överförs. Den nya Mediatyp bestäms av SeedDMS själv.', 'settings_partitionSize' => 'Uppdelad filstorlek', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 63b1ba7a3..3d546bb16 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1391,6 +1391,8 @@ URL: [url]', 'settings_Notification' => 'Bildirim ayarları', 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.', 'settings_no_content_dir' => 'İçerik dizini', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Kısmi dosya boyutu', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 2d6dc128c..90ee03d4d 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -1412,6 +1412,8 @@ URL: [url]', 'settings_Notification' => 'Налаштування сповіщення', 'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.', 'settings_no_content_dir' => 'Каталог вмісту', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Перевизначити mime тип', 'settings_overrideMimeType_desc' => 'Перевизначення mime типу наданого браузером, якщо файл завантажений. Новий mime тип визначається самою SeedDMS.', 'settings_partitionSize' => 'Частковий розмір файлу', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 6b1896a55..b2e4a8ac8 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -1393,6 +1393,8 @@ URL: [url]', 'settings_Notification' => '通知设置', 'settings_notwritable' => '设置_不可写', 'settings_no_content_dir' => '内容目录', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '覆盖Mime Type', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 14e0e47e3..7f878c1d1 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -1242,6 +1242,8 @@ URL: [url]', 'settings_Notification' => '通知設置', 'settings_notwritable' => '', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', From 9820d9b7f3cdd87d05ae26a69d0dad05f1964279 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2019 19:54:42 +0100 Subject: [PATCH 230/467] set data-name for folder/document table rows --- views/bootstrap/class.Bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index c933ea73d..95b11d2ea 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2245,7 +2245,7 @@ $(document).ready( function() { */ function documentListRowStart($document, $class='') { /* {{{ */ $docID = $document->getID(); - return "
      "; - if($this->check_access(array('UsrMgr', 'RemoveUser'))) { + if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) { echo "
      "; - if($this->check_access('UsrMgr')) + if($accessobject->check_view_access('UsrMgr')) echo "getID()."\"> "; - if($this->check_access('RemoveUser')) + if($accessobject->check_view_access('RemoveUser')) echo "getID()."\">"; echo "
      "; } diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php index 9011f70e4..15c797e89 100644 --- a/views/bootstrap/class.RoleMgr.php +++ b/views/bootstrap/class.RoleMgr.php @@ -73,6 +73,7 @@ $(document).ready( function() { $user = $this->params['user']; $selrole = $this->params['selrole']; $settings = $this->params['settings']; + $accessobject = $this->params['accessobject']; if($selrole) { $this->contentHeading(getMLText("role_info")); @@ -88,7 +89,7 @@ $(document).ready( function() { echo "
      ".htmlspecialchars($currUser->getComment()).""; echo "      		"; - if($this->check_access(array('UsrMgr', 'RemoveUser'))) { + if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) { echo "
      "; echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '', false); echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '', false); diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php index 53c8c6656..7f85f7556 100644 --- a/views/bootstrap/class.Tasks.php +++ b/views/bootstrap/class.Tasks.php @@ -227,6 +227,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { function menuTasks() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $accessobject = $this->params['accessobject']; $tasks = $this->__myTasks(); if(!$tasks) @@ -320,7 +321,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $content .= " \n"; $content .= " \n"; } - if ($this->check_access('MyDocuments')) { + if ($accessobject->check_view_access('MyDocuments')) { $content .= "
    • \n"; $content .= "
    • ".getMLText("my_documents")."
      • \n"; } diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php index 263922b07..e6dbb43fc 100644 --- a/views/bootstrap/class.UserList.php +++ b/views/bootstrap/class.UserList.php @@ -38,6 +38,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style { $httproot = $this->params['httproot']; $quota = $this->params['quota']; $pwdexpiration = $this->params['pwdexpiration']; + $accessobject = $this->params['accessobject']; $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); @@ -104,7 +105,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style { } echo "
      		"; - if($this->check_access(array('UsrMgr', 'RemoveUser'))) { + if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) { echo "
      "; echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '', false); echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '', false); diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index 89f39d80b..5257c23c6 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -194,6 +194,7 @@ $(document).ready( function() { $quota = $this->params['quota']; $undeluserids = $this->params['undeluserids']; $enableemail = $this->params['enableemail']; + $accessobject = $this->params['accessobject']; if($seluser) { ?> @@ -205,7 +206,7 @@ $(document).ready( function() {
        getID(), $undeluserids) && $this->check_access('RemoveUser')) { + if(!in_array($seluser->getID(), $undeluserids) && $accessobject->check_view_access('RemoveUser')) { $menuitems['removeuser'] = array('link'=>$this->html_url('RemoveUser', array('userid'=>$seluser->getID())), 'label'=>' '.getMLText("rm_user")); } $menuitems['removeuserfromprozess'] = array('link'=>$this->html_url('RemoveUserFromProcesses', array('userid'=>$seluser->getID())), 'label'=>' '.getMLText("rm_user_from_processes")); @@ -248,7 +249,6 @@ $(document).ready( function() { $undeluserids = $this->params['undeluserids']; $workflowmode = $this->params['workflowmode']; $quota = $this->params['quota']; - $accessop = $this->params['accessobject']; ?>
        params['undeluserids']; $workflowmode = $this->params['workflowmode']; $quota = $this->params['quota']; - $accessop = $this->params['accessobject']; + $accessobject = $this->params['accessobject']; $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); @@ -616,17 +616,17 @@ $(document).ready( function() { ); ?>
        -check_view_access($this, array('action'=>'actionmenu'))) { ?> +check_view_access($this, array('action'=>'actionmenu'))) { ?>
        getID()."\"" : "") ?>>
        -check_view_access($this, array('action'=>'info'))) { ?> +check_view_access($this, array('action'=>'info'))) { ?>
        getID()."\"" : "") ?>>
      contentContainerStart(); ?> -check_view_access($this, array('action'=>'form'))) { ?> +check_view_access($this, array('action'=>'form'))) { ?>
      getID()."\"" : "") ?>>
      diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 365b02065..e1c733b18 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -359,8 +359,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if(!$showfullpreview) return; - $accessop = $this->params['accessobject']; - if($accessop->check_controller_access('ViewOnline', array('action'=>'version'))) { + $accessobject = $this->params['accessobject']; + if($accessobject->check_controller_access('ViewOnline', array('action'=>'version'))) { $latestContent = $this->callHook('documentLatestContent', $document); if($latestContent === null) $latestContent = $document->getLatestContent(); @@ -444,7 +444,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $folder = $this->params['folder']; $document = $this->params['document']; - $accessop = $this->params['accessobject']; + $accessobject = $this->params['accessobject']; $viewonlinefiletypes = $this->params['viewonlinefiletypes']; $enableownerrevapp = $this->params['enableownerrevapp']; $enableownerreceipt = $this->params['enableownerreceipt']; @@ -535,7 +535,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if(is_string($txt)) echo $txt; $this->documentInfos(); - if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) { + if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) { $this->preview(); } ?> @@ -614,11 +614,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); if ($file_exists) { if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes))) { - if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) { + if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) { print "getVersion()."\">"; } } else { - if($accessop->check_controller_access('Download', array('action'=>'version'))) { + if($accessobject->check_controller_access('Download', array('action'=>'version'))) { print "getVersion()."\">"; } } @@ -629,7 +629,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } if ($file_exists) { - if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run'))) + if($accessobject->check_controller_access('Download', array('action'=>'run')) || $accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) print ""; } print "
        "; if($accesserr) echo "
      • ".$accesserr."
        • "; - if($accessop->mayReceipt($document)) { + if($accessobject->mayReceipt($document)) { if ($is_recipient) { if($r["status"]==0) { print "
      • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."
        • "; - } elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) { + } 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'), getMLText("edit"), false, true)."
        • "; } } @@ -1340,7 +1340,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
      contentContainerEnd(); - if($accessop->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) { + 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']; ?> @@ -1448,7 +1448,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
        "; if($accesserr) echo "
      • ".$accesserr."
        • "; - if($accessop->mayRevise($document)) { + if($accessobject->mayRevise($document)) { if ($is_recipient && $r["status"]==0) { print "
      • ".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."
        • "; } elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){ @@ -1505,11 +1505,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print ""; if($file_exists) { if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes))) { - if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) { + if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) { print "getVersion()."\">"; } } else { - if($accessop->check_controller_access('Download', array('action'=>'version'))) { + if($accessobject->check_controller_access('Download', array('action'=>'version'))) { print "getVersion()."\">"; } } @@ -1521,7 +1521,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } if($file_exists) { - if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run'))) + if($accessobject->check_controller_access('Download', array('action'=>'run')) || $accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) print "\n"; } print "\n"; @@ -1560,11 +1560,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print ""; print "
          "; if ($file_exists){ - if($accessop->check_controller_access('Download', array('action'=>'version'))) { + if($accessobject->check_controller_access('Download', array('action'=>'version'))) { print "
        • getVersion()."\">".getMLText("download").""; } if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes))) - if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) { + if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) { print "
        • getVersion()."\">" . getMLText("view_online") . ""; } print "
        "; @@ -1573,15 +1573,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { /* Only admin has the right to remove version in any case or a regular * user if enableVersionDeletion is on */ - if($accessop->mayRemoveVersion($document)) { + if($accessobject->mayRemoveVersion($document)) { print "
      • ".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "".getMLText("rm_version"), false, true)."
        • "; } - if($accessop->check_controller_access('AddToTransmittal')) + if($accessobject->check_controller_access('AddToTransmittal')) print "
      • ".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "".getMLText("add_to_transmittal"), false, true)."
        • "; - if($accessop->mayEditComment($document)) { + if($accessobject->mayEditComment($document)) { print "
      • ".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "".getMLText("edit_comment"), false, true)."
        • "; } - if($accessop->mayEditAttributes($document)) { + if($accessobject->mayEditAttributes($document)) { print "
      • ".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "".getMLText("edit_attributes"), false, true)."
        • "; } print "
      • ".$this->html_link('DocumentVersionDetail', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "".getMLText("details"), false, true)."
        • "; @@ -1630,11 +1630,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $previewer->createPreview($file, $previewwidthdetail); if($file_exists) { if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) { - if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) { + if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) { print "getID()."\">"; } } else { - if($accessop->check_controller_access('Download', array('action'=>'file'))) { + if($accessobject->check_controller_access('Download', array('action'=>'file'))) { print "getID()."\">"; } } @@ -1645,7 +1645,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">"; } if($file_exists) { - if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run'))) + if($accessobject->check_controller_access('Download', array('action'=>'run')) || $accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) print ""; } print ""; @@ -1669,11 +1669,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
          "; if ($file_exists) { - if($accessop->check_controller_access('Download', array('action'=>'file'))) { + if($accessobject->check_controller_access('Download', array('action'=>'file'))) { print "
        • getID()."\">".getMLText('download')."
          • "; } if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) { - if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) { + if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) { print "
        • getID()."\">" . getMLText("view_online") . "
          • "; } } @@ -1692,7 +1692,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } else printMLText("no_attached_files"); - if($accessop->check_controller_access('AddFile')) { + if($accessobject->check_controller_access('AddFile')) { if ($document->getAccessMode($user) >= M_READWRITE){ print "
          • ".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."
          \n"; } From 3012fc52e5df5b8b6bea76ad5f38a0e407ce90ec Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 15:09:40 +0100 Subject: [PATCH 258/467] include "inc/inc.ClassAccessOperation.php" --- out/out.Login.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.Login.php b/out/out.Login.php index ca47cee0d..e1ee7d0df 100644 --- a/out/out.Login.php +++ b/out/out.Login.php @@ -26,6 +26,7 @@ require_once("inc/inc.Utils.php"); require_once("inc/inc.Language.php"); require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); +require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; From 84550836c8b7f67ff080f0865ad0191f5b79e6a1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 17:17:51 +0100 Subject: [PATCH 259/467] started new version 5.1.14 --- CHANGELOG | 4 ++++ inc/inc.Version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 66d9ed9b8..7eaa60ff3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.14 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.13 -------------------------------------------------------------------------------- diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 868cb1499..bd2c1d827 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.1.13"; + public $_number = "5.1.14"; private $_string = "SeedDMS"; function __construct() { From 833ff8f7dac1f5f5d953eef08dc86034f7b42752 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 17:50:26 +0100 Subject: [PATCH 260/467] do not allow adding events and showing tasks --- views/bootstrap/class.Bootstrap.php | 2 +- views/bootstrap/class.Calendar.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 478fecb97..021f6f69d 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -334,7 +334,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo " \n"; echo "
        \n"; - if($this->params['enablemenutasks']) { + if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) { echo "
        "; echo "
        "; // echo "
          \n"; diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php index 8e49920b6..381a904f7 100644 --- a/views/bootstrap/class.Calendar.php +++ b/views/bootstrap/class.Calendar.php @@ -224,6 +224,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { } /* }}} */ function js() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; $strictformcheck = $this->params['strictformcheck']; header('Content-Type: application/javascript'); ?> @@ -232,6 +234,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { $('#calendar').fullCalendar({ height: $(window).height()-210, locale: 'params['session']->getLanguage(), 0, 2); ?>', +isGuest()) { ?> customButtons: { addEventButton: { text: '', @@ -241,6 +244,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { } } }, + header: { left: 'prev,next today addEventButton', center: 'title', From 85157a8bfe1258ca5c7e5e6ac4c848cea526dbe2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 18:12:26 +0100 Subject: [PATCH 261/467] no access on some more scripts --- inc/inc.ClassAccessOperation.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index b4d44aae4..51a53626a 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -452,7 +452,6 @@ class SeedDMS_AccessOperation { 'ForcePasswordChange', 'GroupView', 'Help', - 'Info', 'KeywordChooser', 'Login', 'ManageNotify', @@ -489,14 +488,11 @@ class SeedDMS_AccessOperation { 'SetRevisors', 'SetWorkflow', 'SubstituteUser', - 'TimelineFeed', - 'Timeline', 'TransmittalMgr', 'TriggerWorkflow', 'UpdateDocument', 'UserDefaultKeywords', 'UserImage', - 'UserList', 'UsrView', 'ViewDocument', 'ViewEvent', From 4b55bc4fd8edc91c80622e6c7b33212128b2db52 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 18:14:43 +0100 Subject: [PATCH 262/467] allow add to transmittals with only read access on document --- out/out.AddToTransmittal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php index a8d528eff..a6602608e 100644 --- a/out/out.AddToTransmittal.php +++ b/out/out.AddToTransmittal.php @@ -45,7 +45,7 @@ if (!is_object($document)) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); } -if ($document->getAccessMode($user) < M_ALL) { +if ($document->getAccessMode($user) < M_READ) { UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied")); } From 89d5c988184543d9f84f26fb720b04d777eb2ab4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 18:15:10 +0100 Subject: [PATCH 263/467] set onepage for view --- out/out.TransmittalMgr.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php index b43453423..2e7c789ff 100644 --- a/out/out.TransmittalMgr.php +++ b/out/out.TransmittalMgr.php @@ -52,6 +52,7 @@ if($view) { $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewconverters', $settings->_converters['preview']); $view->setParam('accessobject', $accessop); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } From 154c3c2118b701a327c869802fcac9efa2583d3c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 19:22:23 +0100 Subject: [PATCH 264/467] set 'onepage' in factory --- inc/inc.ClassUI.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index c4ab1dd90..d22e1ec07 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -136,6 +136,7 @@ class UI extends UI_Default { $view->setParam('showmissingtranslations', $settings->_showMissingTranslations); $view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod); $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('onepage', $settings->_onePageMode); foreach($decorators as $extname=>$decorator) { $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$decorator['file']; require($filename); From 04f9edbb39080be92ae46c6bd48f90d8ddc9e268 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 19:39:47 +0100 Subject: [PATCH 265/467] make download button primary --- views/bootstrap/class.TransmittalMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php index 6b38414f1..d966a2f62 100644 --- a/views/bootstrap/class.TransmittalMgr.php +++ b/views/bootstrap/class.TransmittalMgr.php @@ -301,7 +301,7 @@ $(document).ready( function() { } } print "\n\n"; - print "getID()."\">".getMLText('download').""; + print "getID()."\">".getMLText('download').""; } } } /* }}} */ From 5a877f959cfda3e37dd3fb120ec9c03fb2510dc0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 21 Nov 2019 10:50:59 +0100 Subject: [PATCH 266/467] edit warning because content is replaced --- views/bootstrap/class.EditOnline.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php index 80c316d35..04f3b3f06 100644 --- a/views/bootstrap/class.EditOnline.php +++ b/views/bootstrap/class.EditOnline.php @@ -123,6 +123,9 @@ $this->contentHeading(getMLText("content")); echo htmlspecialchars(file_get_contents($dms->contentDir . $version->getPath()), ENT_SUBSTITUTE); ?> +warningMsg(getMLText('edit_online_warning')); +?> Date: Thu, 21 Nov 2019 10:51:17 +0100 Subject: [PATCH 267/467] allow mimetype to specify documents which can be edited online --- inc/inc.ClassAccessOperation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index 43a30f2e8..af9dff37b 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -67,7 +67,7 @@ class SeedDMS_AccessOperation { $version = $this->obj->getContentByVersion($vno); else $version = $this->obj->getLatestContent(); - if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes)) + if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getMimeType()), $this->settings->_editOnlineFileTypes)) return false; if ($this->obj->getAccessMode($this->user) == M_ALL || $this->user->isAdmin()) { return true; From 750d02e1e82bc152224a83a0c352e1ad4aaf37ca Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 21 Nov 2019 10:52:11 +0100 Subject: [PATCH 268/467] add note for 5.1.14 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 7eaa60ff3..cbdd42c47 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 5.1.14 -------------------------------------------------------------------------------- +- allow mimetype to specify documents which can be edited online -------------------------------------------------------------------------------- Changes in version 5.1.13 From 7d9de047bdbfb76215953d23bc9104c35b09f6b2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:31:56 +0100 Subject: [PATCH 269/467] add legacy access rights for groups --- inc/inc.ClassAccessOperation.php | 178 +++++++++++++++++-------------- 1 file changed, 96 insertions(+), 82 deletions(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index e03c3f3f4..0584f0a6e 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -406,7 +406,7 @@ class SeedDMS_AccessOperation { return false; } /* }}} */ - protected function check_view_lecacy_access($view, $get=array()) { /* {{{ */ + protected function check_view_legacy_access($view, $get=array()) { /* {{{ */ if($this->user->isAdmin()) return true; @@ -419,86 +419,100 @@ class SeedDMS_AccessOperation { } else { return false; } - if(array_intersect($scripts, array( - 'AddDocument', - 'AddEvent', - 'AddFile', - 'AddSubFolder', - 'AddToTransmittal', - 'ApprovalSummary', - 'ApproveDocument', - 'Calendar', - 'CategoryChooser', - 'ChangePassword', - 'CheckInDocument', - 'Clipboard', - 'DocumentAccess', - 'DocumentChooser', - 'DocumentNotify', - 'DocumentVersionDetail', - 'DropFolderChooser', - 'EditAttributes', - 'EditComment', - 'EditDocumentFile', - 'EditDocument', - 'EditEvent', - 'EditFolder', - 'EditOnline', - 'EditUserData', - 'ErrorDlg', - 'FolderAccess', - 'FolderChooser', - 'FolderNotify', - 'ForcePasswordChange', - 'GroupView', - 'Help', - 'KeywordChooser', - 'Login', - 'ManageNotify', - 'MoveDocument', - 'MoveFolder', - 'MyAccount', - 'MyDocuments', - 'OpensearchDesc', - 'OverrideContentStatus', - 'PasswordForgotten', - 'PasswordSend', - 'ReceiptDocument', - 'ReceiptSummary', - 'RemoveDocumentFile', - 'RemoveDocument', - 'RemoveEvent', - 'RemoveFolderFiles', - 'RemoveFolder', - 'RemoveTransmittal', - 'RemoveVersion', - 'RemoveWorkflowFromDocument', - 'ReturnFromSubWorkflow', - 'ReviewDocument', - 'ReviewSummary', - 'ReviseDocument', - 'RewindWorkflow', - 'RunSubWorkflow', - 'SearchForm', - 'Search', - 'Session', - 'SetExpires', - 'SetRecipients', - 'SetReviewersApprovers', - 'SetRevisors', - 'SetWorkflow', - 'SubstituteUser', - 'TransmittalMgr', - 'TriggerWorkflow', - 'UpdateDocument', - 'UserDefaultKeywords', - 'UserImage', - 'UsrView', - 'ViewDocument', - 'ViewEvent', - 'ViewFolder', - 'WorkflowGraph', - 'WorkflowSummary'))) + + if($this->user->isGuest()) { + $user_allowed = array( + 'Calendar', + 'ErrorDlg', + 'Help', + 'Login', + 'Search', + 'ViewDocument', + 'ViewFolder', + ); + } else { + $user_allowed = array( + 'AddDocument', + 'AddEvent', + 'AddFile', + 'AddSubFolder', + 'AddToTransmittal', + 'ApprovalSummary', + 'ApproveDocument', + 'Calendar', + 'CategoryChooser', + 'ChangePassword', + 'CheckInDocument', + 'Clipboard', + 'DocumentAccess', + 'DocumentChooser', + 'DocumentNotify', + 'DocumentVersionDetail', + 'DropFolderChooser', + 'EditAttributes', + 'EditComment', + 'EditDocumentFile', + 'EditDocument', + 'EditEvent', + 'EditFolder', + 'EditOnline', + 'EditUserData', + 'ErrorDlg', + 'FolderAccess', + 'FolderChooser', + 'FolderNotify', + 'ForcePasswordChange', + 'GroupView', + 'Help', + 'KeywordChooser', + 'Login', + 'ManageNotify', + 'MoveDocument', + 'MoveFolder', + 'MyAccount', + 'MyDocuments', + 'OpensearchDesc', + 'OverrideContentStatus', + 'PasswordForgotten', + 'PasswordSend', + 'ReceiptDocument', + 'ReceiptSummary', + 'RemoveDocumentFile', + 'RemoveDocument', + 'RemoveEvent', + 'RemoveFolderFiles', + 'RemoveFolder', + 'RemoveTransmittal', + 'RemoveVersion', + 'RemoveWorkflowFromDocument', + 'ReturnFromSubWorkflow', + 'ReviewDocument', + 'ReviewSummary', + 'ReviseDocument', + 'RewindWorkflow', + 'RunSubWorkflow', + 'Search', + 'Session', + 'SetExpires', + 'SetRecipients', + 'SetReviewersApprovers', + 'SetRevisors', + 'SetWorkflow', + 'SubstituteUser', + 'TransmittalMgr', + 'TriggerWorkflow', + 'UpdateDocument', + 'UserDefaultKeywords', + 'UserImage', + 'UsrView', + 'ViewDocument', + 'ViewEvent', + 'ViewFolder', + 'WorkflowGraph', + 'WorkflowSummary'); + } + + if(array_intersect($scripts, $user_allowed)) return true; return false; @@ -524,7 +538,7 @@ class SeedDMS_AccessOperation { */ function check_view_access($view, $get=array()) { /* {{{ */ if(!$this->settings->_advancedAcl) { - return $this->check_view_lecacy_access($view, $get); + return $this->check_view_legacy_access($view, $get); } if(is_string($view)) { $scripts = array($view); From 893a8d6d8dd099936ad253276b9d617bdff2d83b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:32:32 +0100 Subject: [PATCH 270/467] return json even in case of an error --- op/op.EditOnline.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/op/op.EditOnline.php b/op/op.EditOnline.php index b19eb420b..7277f5a1e 100644 --- a/op/op.EditOnline.php +++ b/op/op.EditOnline.php @@ -28,28 +28,38 @@ include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); +if (!$accessop->check_controller_access('EditOnline', $_POST)) { + echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'))); + exit; +} + if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) { - UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'))); + exit; } $documentid = $_POST["documentid"]; $document = $dms->getDocument($documentid); if (!is_object($document)) { - UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); + echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'))); + exit; } $folder = $document->getFolder(); $docPathHTML = getFolderPathHTML($folder, true). " / ".$document->getName().""; if ($document->getAccessMode($user, 'editOnline') < M_READWRITE) { - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); + echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'))); + exit; } if($document->isLocked()) { $lockingUser = $document->getLockingUser(); if (($lockingUser->getID() != $user->getID()) && ($document->getAccessMode($user, 'editOnline') != M_ALL)) { - UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())))); + echo json_encode(array('success'=>false, 'message'=>getMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName()))))); + exit; } } From b3cc272941e9316cea36c216de88b4ba6bde40be Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:33:13 +0100 Subject: [PATCH 271/467] check access --- op/op.LockDocument.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/op/op.LockDocument.php b/op/op.LockDocument.php index a72b873fa..b4937e706 100644 --- a/op/op.LockDocument.php +++ b/op/op.LockDocument.php @@ -40,6 +40,11 @@ if (!is_object($document)) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); } +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); +if (!$accessop->check_controller_access('LockDocument', $_POST)) { + UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied")); +} + $folder = $document->getFolder(); $docPathHTML = getFolderPathHTML($folder, true). " / ".$document->getName().""; From 684f27ef8790071d7513fb539620eab4e286d491 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:34:12 +0100 Subject: [PATCH 272/467] fix output of group name --- views/bootstrap/class.ApprovalSummary.php | 2 +- views/bootstrap/class.ReceiptSummary.php | 2 +- views/bootstrap/class.ReviewSummary.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index e804fbe61..5a56c1748 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -148,7 +148,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); - print "".getApprovalStatusText($st["status"])."
          ".$st["date"]."
          ". htmlspecialchars($moduser->getFullName()) ."          "; + print "".getApprovalStatusText($st["status"])."
          ".$st["date"]."
          ". htmlspecialchars($modgroup->getName()) ."          "; echo $this->documentListRowEnd($document); } } diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php index 6e7bd8df5..40305389d 100644 --- a/views/bootstrap/class.ReceiptSummary.php +++ b/views/bootstrap/class.ReceiptSummary.php @@ -140,7 +140,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style { $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); echo "getID()."\" class=\"table-row-document".$class."\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">"; echo $this->documentListRow($document, $previewer, true, $st['version']); - print "".getReceiptStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($moduser->getFullName()) ."          "; + print "".getReceiptStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($modgroup->getName()) ."          "; echo ""; } } diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index 2d58207c5..41e6a3ea0 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -151,7 +151,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { // print ""; echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); - print "".getReviewStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($moduser->getFullName()) ."          "; + print "".getReviewStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($modgroup->getName()) ."          "; print "\n"; } } From 79aa6c079c3ee83d3344957c0944c67ed456a9c9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:35:05 +0100 Subject: [PATCH 273/467] replace check for guest by generic acl check --- views/bootstrap/class.Bootstrap.php | 59 ++++++++++++++++------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 8bef887e2..38c64f423 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -359,7 +359,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo "
        • \n"; echo " ".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' \n"; echo "
            \n"; - if (!$this->params['user']->isGuest()) { +// if (!$this->params['user']->isGuest()) { $menuitems = array(); if ($accessobject->check_view_access('MyDocuments')) $menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'my_documents'); @@ -379,7 +379,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } echo "
          • \n"; } - } +// } $showdivider = false; if($this->params['enablelanguageselector']) { $showdivider = true; @@ -421,16 +421,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo " \n"; echo "
          \n"; - if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) { - echo "
          "; - echo "
          "; -// echo "
            \n"; -// echo "
          • \n"; -// echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array())); -// echo "
            • \n"; -// echo "
          \n"; - echo "
          "; - //$this->addFooterJS('checkTasks();'); + if($this->params['enablemenutasks']) { + if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) { + echo "
          "; + echo "
          "; + // echo "
            \n"; + // echo "
          • \n"; + // echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array())); + // echo "
            • \n"; + // echo "
          \n"; + echo "
          "; + //$this->addFooterJS('checkTasks();'); + } } if($this->params['dropfolderdir'] && $this->params['enabledropfolderlist']) { @@ -587,7 +589,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo "
            \n"; $menuitems = array(); - if ($accessMode == M_READ && !$this->params['user']->isGuest()) { + if ($accessMode == M_READ) { if ($accessobject->check_view_access('FolderNotify')) $menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_notify'); } @@ -611,7 +613,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; } $menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>'edit_existing_notify'); } - if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) { + if ($accessobject->check_view_access('Indexer') && $this->params['enablefullsearch']) { $menuitems['index_folder'] = array('link'=>"../out/out.Indexer.php?folderid=". $folderID."&showtree=".showtree(), 'label'=>'index_folder'); } @@ -638,7 +640,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if ($accessMode >= M_READWRITE) { if (!$document->isLocked()) { $menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document'); - $menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document'); + if($accessobject->check_controller_access('LockDocument')) + $menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document'); if($document->isCheckedOut()) $menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>'checkin_document'); else { @@ -653,7 +656,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $lockingUser = $document->getLockingUser(); if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) { $menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document'); - $menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document'); + if($accessobject->check_controller_access('UnlockDocument')) + $menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document'); if($document->isCheckedOut()) { $menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>'checkin_document'); } else { @@ -665,20 +669,22 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document'); } } - if($this->params['accessobject']->maySetExpires($document)) { - $menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires'); - // $menuitems[''] = array('link'=>"", 'label'=>''); + if($accessobject->maySetExpires($document)) { + if ($accessobject->check_view_access('SetExpires')) + $menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires'); } } if ($accessMode == M_ALL) { - $menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document'); + if ($accessobject->check_view_access('RemoveDocument')) + $menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document'); if ($accessobject->check_view_access('DocumentAccess')) $menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access'); } - if ($accessMode >= M_READ && !$this->params['user']->isGuest()) { - $menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify'); + if ($accessMode >= M_READ) { + if ($accessobject->check_view_access('DocumentNotify')) + $menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify'); } - if ($this->params['user']->isAdmin()) { + if ($accessobject->check_view_access('TransferDocument')) { $menuitems['transfer_document'] = array('link'=>"../out/out.TransferDocument". $docid, 'label'=>'transfer_document'); } @@ -712,7 +718,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo "
              \n"; $menuitems = array(); - if ($this->params['user']->isAdmin() || !$this->params['disableselfedit']) + if ($accessobject->check_view_access('EditUserData') || !$this->params['disableselfedit']) $menuitems['edit_user_details'] = array('link'=>"../out/out.EditUserData.php", 'label'=>'edit_user_details'); if (!$this->params['user']->isAdmin()) @@ -881,7 +887,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo "
            • ".getMLText("week_view")."
              • \n"; echo "
            • ".getMLText("month_view")."
              • \n"; echo "
            • ".getMLText("year_view")."
              • \n"; - if (!$this->params['user']->isGuest()) echo "
            • ".getMLText("add_event")."
              • \n"; + if($accessobject->check_view_access(array('AddEvent'))) + echo "
            • ".getMLText("add_event")."
              • \n"; echo "
            \n"; echo "
        \n"; return; @@ -894,7 +901,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo "
          \n"; $menuitems = array(); - if (!$this->params['user']->isGuest()) + if($accessobject->check_view_access(array('AddEvent'))) $menuitems['addevent'] = array('link'=>"../out/out.AddEvent.php", 'label'=>'add_event'); /* Check if hook exists because otherwise callHook() will override $menuitems */ From 0d4c970029cc534ce110eb31a0b64884f68625c6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:35:59 +0100 Subject: [PATCH 274/467] replace check for guest by generic acl check --- views/bootstrap/class.ViewDocument.php | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index e1c733b18..ab2675a66 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -1736,9 +1736,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } print "\n\n"; } - else printMLText("no_linked_files"); + else $this->infoMsg(getMLText("no_linked_files")); - if (!$user->isGuest()){ + if ($accessobject->check_view_access('AddDocumentLink')){ $this->contentContainerStart(); ?>
          @@ -1818,28 +1818,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($user->isAdmin()) { $timeline = $latestContent->getDocument()->getTimeline(); if($timeline) { - /* - $this->contentHeading(getMLText("timeline")); - foreach($timeline as &$item) { - switch($item['type']) { - case 'add_version': - $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'])); - break; - case 'add_file': - $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName())); - break; - case 'status_change': - $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status']))); - break; - default: - $msg = $this->callHook('getTimelineMsg', $latestContent->getDocument(), $item); - if(!is_string($msg)) - $msg = '???'; - } - $item['msg'] = $msg; - } - */ -// $this->printTimeline('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d')); $this->printTimelineHtml(300); } } From cbac16773da93af6b7fdcd63405831a34e84a7b2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:36:32 +0100 Subject: [PATCH 275/467] more checking for access rights --- op/op.UnlockDocument.php | 5 +++++ out/out.RemoveDocument.php | 4 ++++ out/out.SetExpires.php | 4 ++++ out/out.TransferDocument.php | 5 +++-- views/bootstrap/class.EditOnline.php | 7 ++++++- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/op/op.UnlockDocument.php b/op/op.UnlockDocument.php index 7af019958..693fe3d02 100644 --- a/op/op.UnlockDocument.php +++ b/op/op.UnlockDocument.php @@ -38,6 +38,11 @@ if (!is_object($document)) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); } +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); +if (!$accessop->check_controller_access('LockDocument', $_POST)) { + UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied")); +} + $folder = $document->getFolder(); $docPathHTML = getFolderPathHTML($folder, true). " / ".$document->getName().""; diff --git a/out/out.RemoveDocument.php b/out/out.RemoveDocument.php index 4e36a1278..69cc1cc54 100644 --- a/out/out.RemoveDocument.php +++ b/out/out.RemoveDocument.php @@ -43,6 +43,10 @@ if (!is_object($document)) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); } +if (!$accessop->check_view_access($view, $_GET)) { + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); +} + if ($document->getAccessMode($user) < M_ALL) { UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied")); } diff --git a/out/out.SetExpires.php b/out/out.SetExpires.php index e829e3a10..91154de8f 100644 --- a/out/out.SetExpires.php +++ b/out/out.SetExpires.php @@ -44,6 +44,10 @@ if (!is_object($document)) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); } +if (!$accessop->check_view_access($view, $_GET)) { + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); +} + if(!$accessop->maySetExpires($document)) { UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied")); } diff --git a/out/out.TransferDocument.php b/out/out.TransferDocument.php index bfaea3b43..198d46330 100644 --- a/out/out.TransferDocument.php +++ b/out/out.TransferDocument.php @@ -32,8 +32,9 @@ require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); -if (!$user->isAdmin()) { - UI::exitError(getMLText("document"),getMLText("access_denied")); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); +if (!$accessop->check_view_access($view, $_GET)) { + UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax); } if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php index 04f3b3f06..7c0ce25a4 100644 --- a/views/bootstrap/class.EditOnline.php +++ b/views/bootstrap/class.EditOnline.php @@ -95,6 +95,7 @@ $(document).ready(function() { $cachedir = $this->params['cachedir']; $previewwidthlist = $this->params['previewWidthList']; $previewwidthdetail = $this->params['previewWidthDetail']; + $accessobject = $this->params['accessobject']; $set = 'markdown'; //default or markdown $skin = 'simple'; // simple or markitup @@ -124,9 +125,13 @@ $this->contentHeading(getMLText("content")); ?> warningMsg(getMLText('edit_online_warning')); + if($accessobject->check_controller_access('EditOnline')) { + echo $this->warningMsg(getMLText('edit_online_warning')); ?> + \n"; From bf6490f9040beb8c3621ebd5695d4f6760e93058 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:38:41 +0100 Subject: [PATCH 276/467] fix output of group name --- views/bootstrap/class.ApprovalSummary.php | 2 +- views/bootstrap/class.ReviewSummary.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index bff1f59dc..4bb77f2f7 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -137,7 +137,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); - print "".getApprovalStatusText($st["status"])."
          ".$st["date"]."
          ". htmlspecialchars($moduser->getFullName()) ."          "; + print "".getApprovalStatusText($st["status"])."
          ".$st["date"]."
          ". htmlspecialchars($modgroup->getName()) ."          "; echo $this->documentListRowEnd($document); } } diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index 19e23496b..b15fb03df 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -142,7 +142,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { // print ""; echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); - print "".getReviewStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($moduser->getFullName()) ."          "; + print "".getReviewStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($modgroup->getName()) ."          "; print "\n"; } } From 24f030f1c70f52197f40ae7f3c8104573ddf2e29 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:50:52 +0100 Subject: [PATCH 277/467] add method printClickDocumentJs() adds js for catching the event when clicking on a document row and onepage mode is on --- views/bootstrap/class.Bootstrap.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 021f6f69d..ac090e338 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2238,6 +2238,19 @@ $(document).ready( function() { "; } /* }}} */ + function printClickDocumentJs() { /* {{{ */ + $onepage = $this->params['onepage']; + if($onepage) { +?> +/* catch click on a document row in the list folders and documents */ +$('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { + attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; + window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; +}); + Date: Mon, 25 Nov 2019 09:51:39 +0100 Subject: [PATCH 278/467] use new method printClickDocumentJs() --- views/bootstrap/class.ApprovalSummary.php | 1 + views/bootstrap/class.ReviewSummary.php | 1 + views/bootstrap/class.ViewFolder.php | 8 +++----- views/bootstrap/class.WorkflowSummary.php | 8 ++++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index 4bb77f2f7..8050aa283 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -41,6 +41,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { 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')); $this->printDeleteDocumentButtonJs(); + $this->printClickDocumentJs(); } /* }}} */ function show() { /* {{{ */ diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index b15fb03df..de95a0646 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -41,6 +41,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { 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')); $this->printDeleteDocumentButtonJs(); + $this->printClickDocumentJs(); } /* }}} */ function show() { /* {{{ */ diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 3feed0202..307520b73 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -189,11 +189,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) scrollTop: 200 }, 200); }); -/* catch click on a document row in the list folders and documents */ -$('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { - attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; - window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; -}); +printClickDocumentJs(); +?> $('body').on('click', '.order-btn', function(ev) { ev.preventDefault(); var element = $(this); diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php index d0711044a..f013a8c1b 100644 --- a/views/bootstrap/class.WorkflowSummary.php +++ b/views/bootstrap/class.WorkflowSummary.php @@ -36,6 +36,14 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + 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')); + + $this->printDeleteDocumentButtonJs(); + $this->printClickDocumentJs(); + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; From 10f6606efaa510af72d6b1ddac23e5d1e86a2622 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 11:50:11 +0100 Subject: [PATCH 279/467] add RevisionSummary to list of lecacy access rights --- inc/inc.ClassAccessOperation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index 0584f0a6e..ae780d6fa 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -489,6 +489,7 @@ class SeedDMS_AccessOperation { 'ReviewDocument', 'ReviewSummary', 'ReviseDocument', + 'RevisionSummary', 'RewindWorkflow', 'RunSubWorkflow', 'Search', From e4b934ea76143358a680803bc63e23fbe6fc04f5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 11:51:08 +0100 Subject: [PATCH 280/467] add js code for one page mode --- views/bootstrap/class.MyDocuments.php | 1 + views/bootstrap/class.ReceiptSummary.php | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 2743deb94..a5cc83e5c 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -38,6 +38,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ header('Content-Type: application/javascript'); + $this->printClickDocumentJs(); ?> $(document).ready( function() { $('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){ diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php index 40305389d..0176d30fe 100644 --- a/views/bootstrap/class.ReceiptSummary.php +++ b/views/bootstrap/class.ReceiptSummary.php @@ -36,6 +36,14 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + 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')); + + $this->printDeleteDocumentButtonJs(); + $this->printClickDocumentJs(); + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; From 28676c8065990ac7e2f08c4faf48958121f63608 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 11:52:14 +0100 Subject: [PATCH 281/467] show empty pic if no access --- op/op.Preview.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op/op.Preview.php b/op/op.Preview.php index 3b0903b84..5b1fed579 100644 --- a/op/op.Preview.php +++ b/op/op.Preview.php @@ -49,6 +49,8 @@ if (!is_object($document)) { } if ($document->getAccessMode($user) < M_READ) { + header('Content-Type: image/svg+xml'); + readfile('../views/'.$theme.'/images/empty.svg'); exit; } From 293e26c74715bc90d0ecb8521a436ab5026ee004 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 20:48:11 +0100 Subject: [PATCH 282/467] add access checks for summaries, add Revision summary --- out/out.RevisionSummary.php | 56 +++++++ views/bootstrap/class.Bootstrap.php | 6 + views/bootstrap/class.RevisionSummary.php | 176 ++++++++++++++++++++++ 3 files changed, 238 insertions(+) create mode 100644 out/out.RevisionSummary.php create mode 100644 views/bootstrap/class.RevisionSummary.php diff --git a/out/out.RevisionSummary.php b/out/out.RevisionSummary.php new file mode 100644 index 000000000..91140afd7 --- /dev/null +++ b/out/out.RevisionSummary.php @@ -0,0 +1,56 @@ +$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); +if (!$accessop->check_view_access($view, $_GET)) { + UI::exitError(getMLText("my_documents"),getMLText("access_denied")); +} + +if ($user->isGuest()) { + UI::exitError(getMLText("my_documents"),getMLText("access_denied")); +} + +if($view) { + $view->setParam('showtree', showtree()); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); + $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('accessobject', $accessop); + $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax + $view($_GET); + exit; +} + +?> diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 990d8610a..6722eb165 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -757,12 +757,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $menuitems['inprocess'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'documents_in_process'); $menuitems['all_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'all_documents'); if($this->params['workflowmode'] == 'traditional' || $this->params['workflowmode'] == 'traditional_only_approval') { + if ($accessobject->check_view_access('ReviewSummary')) $menuitems['review_summary'] = array('link'=>"../out/out.ReviewSummary.php", 'label'=>'review_summary'); + if ($accessobject->check_view_access('ApprovalSummary')) $menuitems['approval_summary'] = array('link'=>"../out/out.ApprovalSummary.php", 'label'=>'approval_summary'); } else { + if ($accessobject->check_view_access('WorkflowSummary')) $menuitems['workflow_summary'] = array('link'=>"../out/out.WorkflowSummary.php", 'label'=>'workflow_summary'); } + if ($accessobject->check_view_access('ReceiptSummary')) $menuitems['receipt_summary'] = array('link'=>"../out/out.ReceiptSummary.php", 'label'=>'receipt_summary'); + if ($accessobject->check_view_access('RevisionSummary')) + $menuitems['revision_summary'] = array('link'=>"../out/out.RevisionSummary.php", 'label'=>'revision_summary'); /* Check if hook exists because otherwise callHook() will override $menuitems */ if($this->hasHook('mydocumentsNavigationBar')) diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php new file mode 100644 index 000000000..7fa86ebc5 --- /dev/null +++ b/views/bootstrap/class.RevisionSummary.php @@ -0,0 +1,176 @@ + + * @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"); + +/** + * Include class to preview documents + */ +require_once("SeedDMS/Preview.php"); + +/** + * Class which outputs the html page for ReviewSummary 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_RevisionSummary extends SeedDMS_Bootstrap_Style { + + function js() { /* {{{ */ + 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')); + + $this->printDeleteDocumentButtonJs(); + $this->printClickDocumentJs(); + } /* }}} */ + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; + $xsendfile = $this->params['xsendfile']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); + $previewer->setConverters($previewconverters); + + $this->htmlAddHeader(''."\n", 'js'); + + $this->htmlStartPage(getMLText("my_documents")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("my_documents"), "my_documents"); + + echo "
          \n"; + echo "
          \n"; + $this->contentHeading(getMLText("revision_summary")); +// $this->contentContainerStart(); + + // TODO: verificare scadenza + + // Get document list for the current user. + $revisionStatus = $user->getRevisionStatus(); + + // reverse order + $revisionStatus["indstatus"]=array_reverse($revisionStatus["indstatus"],true); + $revisionStatus["grpstatus"]=array_reverse($revisionStatus["grpstatus"],true); + + $printheader=true; + $iRev = array(); + foreach ($revisionStatus["indstatus"] as $st) { + $document = $dms->getDocument($st['documentID']); + $version = $document->getContentByVersion($st['version']); + $moduser = $dms->getUser($st['required']); + + if ($document && $version) { + + if ($printheader){ + print ""; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n\n\n"; + $printheader=false; + } + $sammel[] = array($document->getID(), $version->getVersion); + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); + echo $this->documentListRowStart($document, $class); + echo $this->documentListRow($document, $previewer, true, $st['version']); + print ""; + print ""; + echo $this->documentListRowEnd($document); + } + } + if ($st["status"]!=-2) { + $iRev[] = $st["documentID"]; + } + } + if (!$printheader) { + echo "\n
          ".getMLText("name")."".getMLText("status")."".getMLText("action")."".getMLText("last_update")."".getMLText("next_revision_abbr")."
          ".getRevisionStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($moduser->getFullName()) ."          		".$version->getRevisionDate()."
          "; + } else { + printMLText("no_revision_needed"); + } + +// $this->contentContainerEnd(); + echo "
          \n"; + echo "
          \n"; + $this->contentHeading(getMLText("group_revision_summary")); +// $this->contentContainerStart(); + + $printheader=true; + foreach ($revisionStatus["grpstatus"] as $st) { + $document = $dms->getDocument($st['documentID']); + $version = $document->getContentByVersion($st['version']); + $modgroup = $dms->getGroup($st['required']); + + if (!in_array($st["documentID"], $iRev) && $document && $version) { + + if ($printheader){ + print ""; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n\n\n"; + $printheader=false; + } + + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); +// print ""; + echo $this->documentListRowStart($document, $class); + echo $this->documentListRow($document, $previewer, true, $st['version']); + print ""; + print "\n"; + } + } + } + if (!$printheader) { + echo "\n
          ".getMLText("name")."".getMLText("status")."".getMLText("action")."".getMLText("last_update")."
          ".getReviewStatusText($st['status'])."
          ".$st["date"]."
          ". htmlspecialchars($modgroup->getName()) ."
          "; + }else{ + printMLText("no_revision_needed"); + } + +// $this->contentContainerEnd(); + echo "
          \n"; + echo "
          \n"; + $this->contentEnd(); + $this->htmlEndPage(); + } /* }}} */ +} +?> From 4775fdcd6c64259a97d1bb34e8402e44f8e10377 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:32:39 +0100 Subject: [PATCH 283/467] save field 'created' instead of time() in addDocument() --- SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php index 7ca9663a3..7cac5d7e9 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php @@ -96,7 +96,7 @@ class SeedDMS_SQLiteFTS_Indexer { if(!$this->_conn) return false; - $sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".time().")"; + $sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".$doc->getFieldValue('created')/*time()*/.")"; $res = $this->_conn->exec($sql); if($res === false) { return false; From 469d9c5759098278456c54d3d5e90e98a7e42414 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:33:08 +0100 Subject: [PATCH 284/467] new version 1.0.11 --- SeedDMS_SQLiteFTS/package.xml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml index ed2256393..fdac846ba 100644 --- a/SeedDMS_SQLiteFTS/package.xml +++ b/SeedDMS_SQLiteFTS/package.xml @@ -11,11 +11,11 @@ uwe@steinmann.cx yes - 2018-04-11 + 2019-11-28 - 1.0.10 - 1.0.10 + 1.0.11 + 1.0.11 stable @@ -23,7 +23,8 @@ GPL License -IndexedDocument() remembers cmd and mimetype +Set 'created' in index to creation date of indexed content (was set to current +timestamp) @@ -226,5 +227,21 @@ allow conversion commands for mimetypes with wildcards execWithTimeout() reads data from stderr and saves it into error msg + + 2018-04-11 + + + 1.0.10 + 1.0.10 + + + stable + stable + + GPL License + +IndexedDocument() remembers cmd and mimetype + + From 7bb511f8917db3d802737f1deb2262968e9b9c62 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:33:37 +0100 Subject: [PATCH 285/467] fix comparison of creation date, show number of tasks in queue --- views/bootstrap/class.Indexer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php index fc35be2bc..5fb16c326 100644 --- a/views/bootstrap/class.Indexer.php +++ b/views/bootstrap/class.Indexer.php @@ -63,6 +63,7 @@ function check_queue() { beforeSend: function() { queue_count++; // Add request to the counter $('.queue-bar').css('width', (queue_count*100/MAX_REQUESTS)+'%'); + $('.queue-bar').text(queue_count + '/' + MAX_REQUESTS); }, error: function(xhr, textstatus) { noty({ @@ -162,7 +163,7 @@ $(document).ready( function() { $created = 0; } $content = $document->getLatestContent(); - if($created > $content->getDate() && !$forceupdate) { + if($created >= $content->getDate() && !$forceupdate) { echo $indent."getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">document unchanged"; } else { $index->delete($hit->id); From 413bbad19606139cecd24b54ec591eeaba91fef7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:34:17 +0100 Subject: [PATCH 286/467] add entries for 5.1.14 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cbdd42c47..6fae41425 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes in version 5.1.14 -------------------------------------------------------------------------------- - allow mimetype to specify documents which can be edited online +- show number of indexing tasks in bar +- fix comparison of last indexing time with creation date of document content -------------------------------------------------------------------------------- Changes in version 5.1.13 From 87d1df5d034495bef6b4212c8bf49deca6ffa8b4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 11:20:46 +0100 Subject: [PATCH 287/467] propperly check for passed parameter 'node', pass orderby to view --- out/out.FolderChooser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/out/out.FolderChooser.php b/out/out.FolderChooser.php index 8e764e5a9..ffea48194 100644 --- a/out/out.FolderChooser.php +++ b/out/out.FolderChooser.php @@ -29,7 +29,7 @@ require_once("inc/inc.ClassUI.php"); require_once("inc/inc.Authentication.php"); if(isset($_GET['action']) && $_GET['action'] == 'subtree') { - if (isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) { + if (!isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) { $nodeid = $settings->_rootFolderID; } else { $nodeid = intval($_GET["node"]); @@ -48,9 +48,9 @@ if(isset($_GET['action']) && $_GET['action'] == 'subtree') { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rootfolderid'=>$settings->_rootFolderID)); if($view) { + $view->setParam('orderby', $settings->_sortFoldersDefault); if(isset($_GET['action']) && $_GET['action'] == 'subtree') { $view->setParam('node', $node); - $view->setParam('orderby', $settings->_sortFoldersDefault); } else { $view->setParam('form', $form); $view->setParam('mode', $mode); From 1763bd1bae147e20457e5ffd7c9e121fc43190a0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 11:21:40 +0100 Subject: [PATCH 288/467] take 'orderby' into account --- views/bootstrap/class.FolderChooser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.FolderChooser.php b/views/bootstrap/class.FolderChooser.php index 73beaf5c4..ded83b32c 100644 --- a/views/bootstrap/class.FolderChooser.php +++ b/views/bootstrap/class.FolderChooser.php @@ -52,6 +52,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $mode = $this->params['mode']; + $orderby = $this->params['orderby']; $exclude = $this->params['exclude']; $form = $this->params['form']; $rootfolderid = $this->params['rootfolderid']; @@ -59,7 +60,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style { // $this->htmlStartPage(getMLText("choose_target_folder")); // $this->contentContainerStart(); if(1) { - $this->printNewTreeNavigationHtml($rootfolderid, $mode, 0, $form); + $this->printNewTreeNavigationHtml($rootfolderid, $mode, 0, $form, ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby); echo ''."\n"; } else { $this->printNewTreeNavigation($rootfolderid, $mode, 0, $form); From fd4a821fa8ff4aeec5be98be69d0adb3e523d417 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 17:07:47 +0100 Subject: [PATCH 289/467] better checking for existing value --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index ac090e338..ef4d5adc0 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -906,7 +906,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; (!empty($value['type']) ? ' type="'.$value['type'].'"' : ''). (!empty($value['id']) ? ' id="'.$value['id'].'"' : ''). (!empty($value['name']) ? ' name="'.$value['name'].'"' : ''). - (is_string($value['value']) || !empty($value['value']) ? ' value="'.$value['value'].'"' : ''). + ((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : ''). (!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : ''). (!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : ''). (!empty($value['checked']) ? ' checked' : ''). From a75d337912d20d4a917be7a199d8240cd932b352 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 17:48:54 +0100 Subject: [PATCH 290/467] fix menu item for 2 factor auth --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 14d0fb5e2..b82fd9e02 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -726,7 +726,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $menuitems['edit_notify'] = array('link'=>"../out/out.ManageNotify.php", 'label'=>'edit_existing_notify'); - $menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'edit_existing_notify'); + $menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'2_factor_auth'); if ($this->params['enableusersview']){ if ($accessobject->check_view_access('UsrView')) From d82b59f173d538705f1da0c8195dbf26d2057f05 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 17:49:27 +0100 Subject: [PATCH 291/467] add filter field, placeholder in input filter field --- views/bootstrap/class.SubstituteUser.php | 2 +- views/bootstrap/class.UserList.php | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php index 7ac8a5f14..8cd982193 100644 --- a/views/bootstrap/class.SubstituteUser.php +++ b/views/bootstrap/class.SubstituteUser.php @@ -56,7 +56,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style { $this->contentHeading(getMLText("substitute_user")); ?> - + diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php index e6dbb43fc..4cc9317f6 100644 --- a/views/bootstrap/class.UserList.php +++ b/views/bootstrap/class.UserList.php @@ -31,6 +31,19 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ +?> + $(document).ready(function(){ + $("#myInput").on("keyup", function() { + var value = $(this).val().toLowerCase(); + $("#myTable tbody tr").filter(function() { + $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1) + }); + }); + }); +params['dms']; $user = $this->params['user']; @@ -49,7 +62,8 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style { $sessionmgr = new SeedDMS_SessionMgr($dms->getDB()); ?> -
          + +
          Date: Thu, 28 Nov 2019 09:15:26 +0100 Subject: [PATCH 292/467] fix documentation for rewriteRevisionLog() --- SeedDMS_Core/Core/inc.ClassDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 56603dba3..826a0ca11 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -4272,7 +4272,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * This method was added for importing an xml dump. * * @param array $revisionlog new status log with the newest log entry first. - * @return boolean true on success, otherwise false + * @return boolean 0 on success, otherwise a negativ error number */ function rewriteRevisionLog($revisions) { /* {{{ */ $db = $this->_document->_dms->getDB(); From 3011f96372e20792720d7fa0379b436735c876f6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 09:16:23 +0100 Subject: [PATCH 293/467] add optional parameter $newuser to removeFromProcesses() if set, the process will be transfered to a new user --- SeedDMS_Core/Core/inc.ClassUser.php | 31 +++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 63714308a..9b3cab382 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -899,7 +899,8 @@ class SeedDMS_Core_User { /* {{{ */ * * This method adds another log entry to the reviews and approvals * which indicates the user has been deleted from the process. By default it will - * do so for each review/approval regardless of its current state. So even + * do so for each review/approval regardless of its current state unless + * the user has been removed already (status=-2). So even * reviews/approvals already processed by the user will be added the log * entry. Only if the last log entry was a removal already, it will not be * added a second time. @@ -907,24 +908,42 @@ class SeedDMS_Core_User { /* {{{ */ * @param object $user the user doing the removal (needed for entry in * review and approve log). * @param array $states remove user only from reviews/approvals in one of the states - * If passing array(0), the method will operate on reviews/approval which - * has not been touched. + * e.g. if passing array('review'=>array(0)), the method will operate on + * reviews which has not been touched yet. * @return boolean true on success or false in case of an error */ - private function __removeFromProcesses($user, $states = array()) { /* {{{ */ + private function __removeFromProcesses($user, $states = array(), $newuser=null) { /* {{{ */ $db = $this->_dms->getDB(); $reviewStatus = $this->getReviewStatus(); +// var_dump($newuser); +// print_r($reviewStatus);exit; + $db->startTransaction(); foreach ($reviewStatus["indstatus"] as $ri) { if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) { $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". "VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')"; $res=$db->getResult($queryStr); if(!$res) { + $db->rollbackTransaction(); return false; } + /* Only reviews not done already can be transferred to a new user */ + if($newuser && $ri['status'] == 0) { + if($doc = $this->_dms->getDocument($ri['documentID'])) { + if($version = $doc->getContentByVersion($ri['version'])) { + $ret = $version->addIndReviewer($newuser, $user); + /* returns -3 if the user is already a reviewer */ + if($ret != 0 && $ret != -3) { + $db->rollbackTransaction(); + return false; + } + } + } + } } } + $db->commitTransaction(); $approvalStatus = $this->getApprovalStatus(); foreach ($approvalStatus["indstatus"] as $ai) { @@ -975,11 +994,11 @@ class SeedDMS_Core_User { /* {{{ */ * @param array $states remove user only from reviews/approvals in one of the states * @return boolean true on success or false in case of an error */ - public function removeFromProcesses($user, $states=array()) { /* {{{ */ + public function removeFromProcesses($user, $states=array(), $newuser=null) { /* {{{ */ $db = $this->_dms->getDB(); $db->startTransaction(); - if(!$this->__removeFromProcesses($user, $states)) { + if(!$this->__removeFromProcesses($user, $states, $newuser)) { $db->rollbackTransaction(); return false; } From babba864a18893bcd70b285abe5218f3b8839635 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 09:17:32 +0100 Subject: [PATCH 294/467] fix error msg --- out/out.TransferObjects.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/out/out.TransferObjects.php b/out/out.TransferObjects.php index 1118a1305..37b6be1c2 100644 --- a/out/out.TransferObjects.php +++ b/out/out.TransferObjects.php @@ -45,7 +45,7 @@ if (!is_object($rmuser)) { } if ($rmuser->getID()==$user->getID()) { - UI::exitError(getMLText("transfer_objects"),getMLText("cannot_delete_yourself")); + UI::exitError(getMLText("transfer_objects"),getMLText("cannot_transfer_your_objects")); } $allusers = $dms->getAllUsers($settings->_sortUsersInList); From dabf821b6a0d9a368a70a3fa8be7cbbcc600d83d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 09:18:01 +0100 Subject: [PATCH 295/467] do not run documentListRow(Start|End) if lastContent is null --- views/bootstrap/class.Bootstrap.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index b82fd9e02..86cf25c6e 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2477,9 +2477,6 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; $docID = $document->getID(); - if(!$skipcont) - $content .= $this->documentListRowStart($document); - if($version) { $latestContent = $this->callHook('documentContent', $document, $version); if($latestContent === null) @@ -2491,6 +2488,9 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e } if($latestContent) { + if(!$skipcont) + $content .= $this->documentListRowStart($document); + $previewer->createPreview($latestContent); $version = $latestContent->getVersion(); $status = $latestContent->getStatus(); @@ -2610,9 +2610,9 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e } $content .= ""; $content .= ""; + if(!$skipcont) + $content .= $this->documentListRowEnd($document); } - if(!$skipcont) - $content .= $this->documentListRowEnd($document); return $content; } /* }}} */ From 809f224e7d36ed8eb8505b4d76849597ac431262 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 09:18:42 +0100 Subject: [PATCH 296/467] processes can be transfered to a new user currently only for reviews --- op/op.UsrMgr.php | 7 ++++++- out/out.RemoveUserFromProcesses.php | 3 +++ .../class.RemoveUserFromProcesses.php | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index d5619115c..1fd903e1a 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -205,6 +205,11 @@ else if ($action == "removefromprocesses") { UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_yourself")); } + $userToAssign = $dms->getUser($_POST["assignTo"]); + if (!is_object($userToAssign)) { + UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id")); + } + $userToRemove = $dms->getUser($userid); if (!is_object($userToRemove)) { UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id")); @@ -219,7 +224,7 @@ else if ($action == "removefromprocesses") { $_POST["status"]["receipt"] = array(); if(!isset($_POST["status"]["revision"])) $_POST["status"]["revision"] = array(); - if (!$userToRemove->removeFromProcesses($user, $_POST['status'])) { + if (!$userToRemove->removeFromProcesses($user, $_POST['status'], $userToAssign)) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } diff --git a/out/out.RemoveUserFromProcesses.php b/out/out.RemoveUserFromProcesses.php index 682c84219..db093a08b 100644 --- a/out/out.RemoveUserFromProcesses.php +++ b/out/out.RemoveUserFromProcesses.php @@ -48,8 +48,11 @@ if ($rmuser->getID()==$user->getID()) { UI::exitError(getMLText("rm_user"),getMLText("cannot_delete_yourself")); } +$allusers = $dms->getAllUsers($settings->_sortUsersInList); + if($view) { $view->setParam('rmuser', $rmuser); + $view->setParam('allusers', $allusers); $view->setParam('accessobject', $accessop); $view($_GET); exit; diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index 23bfcd13d..abb541416 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -31,6 +31,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $rmuser = $this->params['rmuser']; + $allusers = $this->params['allusers']; $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); @@ -51,6 +52,23 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { isGuest() || ($currUser->getID() == $rmuser->getID()) ) + continue; + + if ($rmuser && $currUser->getID()==$rmuser->getID()) $selected=$count; + $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName())); + } + $this->formField( + getMLText("transfer_process_to_user"), + array( + 'element'=>'select', + 'name'=>'assignTo', + 'class'=>'chzn-select', + 'options'=>$options + ) + ); $reviewStatus = $rmuser->getReviewStatus(); $tmpr = array(); $cr = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); From 89c0ca9b886ddac508d216b23c13f5fba1405883 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 10:00:52 +0100 Subject: [PATCH 297/467] new function getBaseUrl() returns the protocol and host part of the url where seeddms is available --- inc/inc.Utils.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 82bc8c0fc..52b3102f2 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -589,6 +589,15 @@ function sendFile($filename) { /* {{{ */ } } /* }}} */ +/** + * Return protocol and host of url + * + * @return string + */ +function getBaseUrl() { /* {{{ */ + return "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST']; +} /* }}} */ + class SeedDMS_CSRF { protected $secret; From c3ab4648905da921e09939d0116101c156ffcffc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 10:01:59 +0100 Subject: [PATCH 298/467] use new function getBaseUrl() --- op/op.AddDocument.php | 8 ++++---- op/op.AddFile.php | 2 +- op/op.AddFile2.php | 2 +- op/op.AddMultiDocument.php | 2 +- op/op.AddSubFolder.php | 2 +- op/op.Ajax.php | 10 +++++----- op/op.ApproveDocument.php | 8 ++++---- op/op.DocumentAccess.php | 8 ++++---- op/op.DocumentNotify.php | 6 +++--- op/op.EditAttributes.php | 4 ++-- op/op.EditComment.php | 2 +- op/op.EditDocument.php | 10 +++++----- op/op.EditFolder.php | 8 ++++---- op/op.EditOnline.php | 2 +- op/op.FolderAccess.php | 10 +++++----- op/op.FolderNotify.php | 6 +++--- op/op.ManageNotify.php | 2 +- op/op.MoveClipboard.php | 4 ++-- op/op.MoveDocument.php | 2 +- op/op.MoveFolder.php | 2 +- op/op.OverrideContentStatus.php | 2 +- op/op.PasswordForgotten.php | 4 ++-- op/op.RemoveDocument.php | 2 +- op/op.RemoveDocumentFile.php | 2 +- op/op.RemoveFolder.php | 2 +- op/op.RemoveVersion.php | 4 ++-- op/op.RemoveWorkflowFromDocument.php | 2 +- op/op.ReturnFromSubWorkflow.php | 2 +- op/op.ReviewDocument.php | 4 ++-- op/op.RewindWorkflow.php | 2 +- op/op.RunSubWorkflow.php | 2 +- op/op.SetReviewersApprovers.php | 16 ++++++++-------- op/op.SetWorkflow.php | 2 +- op/op.TransferDocument.php | 2 +- op/op.TriggerWorkflow.php | 4 ++-- op/op.UpdateDocument.php | 10 +++++----- op/op.UpdateDocument2.php | 4 ++-- op/op.UsrMgr.php | 2 +- 38 files changed, 84 insertions(+), 84 deletions(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index 84176ecda..5cc09cc88 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -407,7 +407,7 @@ for ($file_num=0;$file_numgetFullName(); $params['comment'] = $comment; $params['version_comment'] = $version_comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -427,7 +427,7 @@ for ($file_num=0;$file_numgetFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { @@ -450,7 +450,7 @@ for ($file_num=0;$file_numgetFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -471,7 +471,7 @@ for ($file_num=0;$file_numgetFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.AddFile.php b/op/op.AddFile.php index 944028eea..8b3a8022a 100644 --- a/op/op.AddFile.php +++ b/op/op.AddFile.php @@ -116,7 +116,7 @@ for ($file_num=0;$file_numgetName(); $params['username'] = $user->getFullName(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php index 4774189ff..ae05026db 100644 --- a/op/op.AddFile2.php +++ b/op/op.AddFile2.php @@ -109,7 +109,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['document'] = $document->getName(); $params['username'] = $user->getFullName(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.AddMultiDocument.php b/op/op.AddMultiDocument.php index a4e843138..9bcbd0dcf 100644 --- a/op/op.AddMultiDocument.php +++ b/op/op.AddMultiDocument.php @@ -243,7 +243,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['username'] = $user->getFullName(); $params['comment'] = $comment; $params['version_comment'] = $version_comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index 3d3d42019..f0284d1cb 100644 --- a/op/op.AddSubFolder.php +++ b/op/op.AddSubFolder.php @@ -133,7 +133,7 @@ if(!$subFolder = $controller->run()) { $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 727d0516e..52362f4be 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -459,7 +459,7 @@ switch($command) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); @@ -801,7 +801,7 @@ switch($command) { $params['username'] = $user->getFullName(); $params['comment'] = ''; $params['version_comment'] = ''; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -821,7 +821,7 @@ switch($command) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { @@ -844,7 +844,7 @@ switch($command) { $params['version'] = 1; $params['comment'] = ''; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -865,7 +865,7 @@ switch($command) { $params['version'] = 1; $params['comment'] = ''; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php index eaceec753..597573814 100644 --- a/op/op.ApproveDocument.php +++ b/op/op.ApproveDocument.php @@ -113,7 +113,7 @@ if ($_POST["approvalType"] == "ind") { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); @@ -151,7 +151,7 @@ else if ($_POST["approvalType"] == "grp") { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); @@ -186,7 +186,7 @@ if ($_POST["approvalStatus"]==-1){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { @@ -238,7 +238,7 @@ if ($_POST["approvalStatus"]==-1){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php index eddf47ef1..76b48018f 100644 --- a/op/op.DocumentAccess.php +++ b/op/op.DocumentAccess.php @@ -157,7 +157,7 @@ if ($action == "setowner") { $params['username'] = $user->getFullName(); $params['old_owner'] = $oldowner->getFullName(); $params['new_owner'] = $newowner->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -182,7 +182,7 @@ else if ($action == "notinherit") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -205,7 +205,7 @@ else if ($action == "inherit") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -227,7 +227,7 @@ else if ($action == "setdefault") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php index 0226ea7a3..eb546a241 100644 --- a/op/op.DocumentNotify.php +++ b/op/op.DocumentNotify.php @@ -107,7 +107,7 @@ if ($action == "delnotify"){ $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -150,7 +150,7 @@ else if ($action == "addnotify") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -184,7 +184,7 @@ else if ($action == "addnotify") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php index dce009239..4397351a6 100644 --- a/op/op.EditAttributes.php +++ b/op/op.EditAttributes.php @@ -105,7 +105,7 @@ if($oldattributes) { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -133,7 +133,7 @@ if($newattributes) { $params['attribute_new_value'] = $attribute->getValue(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditComment.php b/op/op.EditComment.php index 1444cf63e..7dec214f7 100644 --- a/op/op.EditComment.php +++ b/op/op.EditComment.php @@ -100,7 +100,7 @@ if (($oldcomment = $version->getComment()) != $comment) { $params['username'] = $user->getFullName(); $params['new_comment'] = $comment; $params['old_comment'] = $oldcomment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index 3de8cb97a..5c3a66d4f 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -144,7 +144,7 @@ if ($oldname != $name) { $params['old_name'] = $oldname; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -173,7 +173,7 @@ if ($oldcomment != $comment) { $params['old_comment'] = $oldcomment; $params['new_comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -200,7 +200,7 @@ if ($expires != $oldexpires) { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -234,7 +234,7 @@ if($oldattributes) { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -261,7 +261,7 @@ if($newattributes) { $params['attribute_new_value'] = $attribute->getValue(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index c2f2afc57..050d6b3f5 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -97,7 +97,7 @@ if($oldname != $name) { $params['old_name'] = $oldname; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -123,7 +123,7 @@ if($oldcomment != $comment) { $params['old_comment'] = $oldcomment; $params['new_comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -152,7 +152,7 @@ if($oldattributes) { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -179,7 +179,7 @@ if($newattributes) { $params['attribute_new_value'] = $attribute->getValue(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditOnline.php b/op/op.EditOnline.php index b19eb420b..c0dc2d401 100644 --- a/op/op.EditOnline.php +++ b/op/op.EditOnline.php @@ -75,7 +75,7 @@ if($lc->getChecksum() == SeedDMS_Core_File::checksum($tmpfname)) { $params['comment'] = $document->getComment(); $params['version'] = $lc->getVersion(); $params['version_comment'] = $lc->getComment(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php index f5ad80519..6ee5d3e8c 100644 --- a/op/op.FolderAccess.php +++ b/op/op.FolderAccess.php @@ -137,7 +137,7 @@ if ($action == "setowner") { $params['username'] = $user->getFullName(); $params['old_owner'] = $oldOwner->getFullName(); $params['new_owner'] = $newOwner->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -168,7 +168,7 @@ else if ($action == "notinherit") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -191,7 +191,7 @@ else if ($action == "notinherit") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -230,7 +230,7 @@ else if ($action == "inherit") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -257,7 +257,7 @@ else if ($action == "setdefault") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php index 67c7a75bd..aa9f235b5 100644 --- a/op/op.FolderNotify.php +++ b/op/op.FolderNotify.php @@ -102,7 +102,7 @@ if ($action == "delnotify") { $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -145,7 +145,7 @@ else if ($action == "addnotify") { $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -180,7 +180,7 @@ else if ($action == "addnotify") { $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php index c58d7d665..738b67530 100644 --- a/op/op.ManageNotify.php +++ b/op/op.ManageNotify.php @@ -119,7 +119,7 @@ if ($_GET["type"]=="document"){ $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.MoveClipboard.php b/op/op.MoveClipboard.php index cb93bf4b9..d675e5c6a 100644 --- a/op/op.MoveClipboard.php +++ b/op/op.MoveClipboard.php @@ -70,7 +70,7 @@ foreach($clipboard['docs'] as $documentid) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -117,7 +117,7 @@ foreach($clipboard['folders'] as $folderid) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php index 21682eb3d..54a93683f 100644 --- a/op/op.MoveDocument.php +++ b/op/op.MoveDocument.php @@ -87,7 +87,7 @@ if ($targetid != $oldFolder->getID()) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index 8a3c44d57..84090c704 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -85,7 +85,7 @@ if ($folder->setParent($targetFolder)) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index afee7561a..6f8dba701 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -86,7 +86,7 @@ if ($overrideStatus != $overallStatus["status"]) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.PasswordForgotten.php b/op/op.PasswordForgotten.php index 13da84f85..c51794fc1 100644 --- a/op/op.PasswordForgotten.php +++ b/op/op.PasswordForgotten.php @@ -62,8 +62,8 @@ if($user) { $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $params['hash'] = $hash; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ChangePassword.php?hash=".$hash; - $params['url_prefix'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot; + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ChangePassword.php?hash=".$hash; + $params['url_prefix'] = getBaseUrl().$settings->_httpRoot; $emailobj->toIndividual($settings->_smtpSendFrom, $user, $subject, $message, $params); } } diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php index 05cda0d28..bfd19b701 100644 --- a/op/op.RemoveDocument.php +++ b/op/op.RemoveDocument.php @@ -106,7 +106,7 @@ if ($notifier){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php index 9887c5dd2..70dd02765 100644 --- a/op/op.RemoveDocumentFile.php +++ b/op/op.RemoveDocumentFile.php @@ -75,7 +75,7 @@ if (!$document->removeDocumentFile($fileid)) { $params = array(); $params['document'] = $document->getName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php index 0f11fa0c1..86276b8f0 100644 --- a/op/op.RemoveFolder.php +++ b/op/op.RemoveFolder.php @@ -99,7 +99,7 @@ if ($notifier) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index e8fb5f596..41ce8d429 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -91,7 +91,7 @@ if (count($document->getContent())==1) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); @@ -168,7 +168,7 @@ else { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $userrecipients, $subject, $message, $params); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach($grouprecipients as $grp) { diff --git a/op/op.RemoveWorkflowFromDocument.php b/op/op.RemoveWorkflowFromDocument.php index c42153f67..64a64eda5 100644 --- a/op/op.RemoveWorkflowFromDocument.php +++ b/op/op.RemoveWorkflowFromDocument.php @@ -84,7 +84,7 @@ if($version->removeWorkflow($user)) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.ReturnFromSubWorkflow.php b/op/op.ReturnFromSubWorkflow.php index 4d5837ba2..0fb7d377d 100644 --- a/op/op.ReturnFromSubWorkflow.php +++ b/op/op.ReturnFromSubWorkflow.php @@ -98,7 +98,7 @@ if($version->returnFromSubWorkflow($user, $transition, $_POST["comment"])) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index 5b874370b..d41f07a39 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -111,7 +111,7 @@ if ($_POST["reviewType"] == "ind") { $params['status'] = getReviewStatusText($_POST["reviewStatus"]); $params['comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -265,7 +265,7 @@ if ($_POST["reviewStatus"]==-1){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach ($docApprovalStatus as $dastat) { if ($dastat["status"] == 0) { diff --git a/op/op.RewindWorkflow.php b/op/op.RewindWorkflow.php index 08b2a58c2..6b1648a89 100644 --- a/op/op.RewindWorkflow.php +++ b/op/op.RewindWorkflow.php @@ -83,7 +83,7 @@ if($version->rewindWorkflow()) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.RunSubWorkflow.php b/op/op.RunSubWorkflow.php index 9a968efcf..9775a5677 100644 --- a/op/op.RunSubWorkflow.php +++ b/op/op.RunSubWorkflow.php @@ -92,7 +92,7 @@ if($version->runSubWorkflow($subworkflow)) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index d009b026d..353452b52 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -140,7 +140,7 @@ foreach ($pIndRev as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -206,7 +206,7 @@ if (count($reviewIndex["i"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -252,7 +252,7 @@ foreach ($pGrpRev as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -310,7 +310,7 @@ if (count($reviewIndex["g"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -372,7 +372,7 @@ foreach ($pIndApp as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -430,7 +430,7 @@ if (count($approvalIndex["i"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -476,7 +476,7 @@ foreach ($pGrpApp as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -534,7 +534,7 @@ if (count($approvalIndex["g"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.SetWorkflow.php b/op/op.SetWorkflow.php index f7219e577..006767a90 100644 --- a/op/op.SetWorkflow.php +++ b/op/op.SetWorkflow.php @@ -87,7 +87,7 @@ if ($notifier) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { diff --git a/op/op.TransferDocument.php b/op/op.TransferDocument.php index 0bc50493e..9072c1f9f 100644 --- a/op/op.TransferDocument.php +++ b/op/op.TransferDocument.php @@ -80,7 +80,7 @@ if ($notifier){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php index 5c572f08d..330b525cc 100644 --- a/op/op.TriggerWorkflow.php +++ b/op/op.TriggerWorkflow.php @@ -94,7 +94,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -114,7 +114,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $usersinformed = array(); $groupsinformed = array(); diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 654c192c2..c8fa1759b 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -314,7 +314,7 @@ default: $params['username'] = $user->getFullName(); $params['comment'] = $document->getComment(); $params['version_comment'] = $content->getComment(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -337,7 +337,7 @@ default: $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { @@ -360,7 +360,7 @@ default: $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -381,7 +381,7 @@ default: $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -402,7 +402,7 @@ default: $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php index 88aa4d3c5..342160127 100644 --- a/op/op.UpdateDocument2.php +++ b/op/op.UpdateDocument2.php @@ -184,7 +184,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['username'] = $user->getFullName(); $params['comment'] = $document->getComment(); $params['version_comment'] = $contentResult->getContent()->getComment(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -209,7 +209,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index e955f3a85..403c64cff 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -293,7 +293,7 @@ else if ($action == "sendlogindata" && $settings->_enableEmail) { $params['username'] = $newuser->getFullName(); $params['login'] = $newuser->getLogin(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php"; + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php"; $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toIndividual($user, $newuser, $subject, $message, $params); From df095c63a34fb16f4c37d29236d71bf0a5e6632c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 10:06:48 +0100 Subject: [PATCH 299/467] use getBaseUrl() --- op/op.CheckInDocument.php | 10 +++++----- op/op.ReviewDocument.php | 2 +- op/op.ReviseDocument.php | 4 ++-- op/op.SetRecipients.php | 8 ++++---- op/op.SetRevisors.php | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php index 37ee48e08..fd0e40ead 100644 --- a/op/op.CheckInDocument.php +++ b/op/op.CheckInDocument.php @@ -276,7 +276,7 @@ else $params['username'] = $user->getFullName(); $params['comment'] = $document->getComment(); $params['version_comment'] = $contentResult->getContent()->getComment(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -296,7 +296,7 @@ else $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { @@ -319,7 +319,7 @@ else $params['version'] = $contentResult->getContent()->getVersion(); $params['comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -340,7 +340,7 @@ else $params['version'] = $contentResult->getContent()->getVersion(); $params['comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -410,7 +410,7 @@ else $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index fd4b9e050..d78d45ecd 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -144,7 +144,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) { $params['folder_path'] = $folder->getFolderPathPlain(); $params['status'] = getReviewStatusText(S_REJECTED); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php index d3fb84d2c..5b43e6d0d 100644 --- a/op/op.ReviseDocument.php +++ b/op/op.ReviseDocument.php @@ -109,7 +109,7 @@ if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") { $params['status'] = getRevisionStatusText($_POST["revisionStatus"]); $params['comment'] = strip_tags($_POST['comment']); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -133,7 +133,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) { $params['folder_path'] = $folder->getFolderPathPlain(); $params['status'] = getRevisionStatusText(S_REJECTED); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php index 3ccf5918e..70e10450e 100644 --- a/op/op.SetRecipients.php +++ b/op/op.SetRecipients.php @@ -137,7 +137,7 @@ foreach ($pIndRev as $p) { $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["i"][$p]->getFullName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -196,7 +196,7 @@ if (count($receiptIndex["i"]) > 0) { $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["i"][$rx]->getFullName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -244,7 +244,7 @@ foreach ($pGrpRev as $p) { $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["g"][$p]->getName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -299,7 +299,7 @@ if (count($receiptIndex["g"]) > 0) { $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["g"][$rx]->getName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php index 60f963da2..3c782d23f 100644 --- a/op/op.SetRevisors.php +++ b/op/op.SetRevisors.php @@ -135,7 +135,7 @@ foreach ($pIndRev as $p) { $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["i"][$p]->getFullName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -194,7 +194,7 @@ if (count($revisionIndex["i"]) > 0) { $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["i"][$rx]->getFullName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -242,7 +242,7 @@ foreach ($pGrpRev as $p) { $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["g"][$p]->getName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -297,7 +297,7 @@ if (count($revisionIndex["g"]) > 0) { $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["g"][$rx]->getName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; From 5fdae931b13aecfb742e4b83c7d10e661c8e730d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 10:22:47 +0100 Subject: [PATCH 300/467] use getBaseUrl() --- inc/inc.ClassEmailUtils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassEmailUtils.php b/inc/inc.ClassEmailUtils.php index a36672304..e1882290b 100644 --- a/inc/inc.ClassEmailUtils.php +++ b/inc/inc.ClassEmailUtils.php @@ -42,7 +42,7 @@ class SeedDMS_EmailUtils { return(str_replace( array('###SITENAME###', '###HTTP_ROOT###', '###URL_PREFIX###'), - array($settings->_siteName, $settings->_httpRoot, "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot), + array($settings->_siteName, $settings->_httpRoot, getBaseUrl().$settings->_httpRoot), $text)); } /* }}} */ From 1593ca5f345ed4f0f2a9324003c1d73b9590acfe Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 13:48:50 +0100 Subject: [PATCH 301/467] removeFromProcess() can transfer to new user for all processes --- SeedDMS_Core/Core/inc.ClassUser.php | 68 ++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 9b3cab382..5c0870e62 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -897,27 +897,34 @@ class SeedDMS_Core_User { /* {{{ */ /** * Remove user from all processes * - * This method adds another log entry to the reviews and approvals + * This method adds another log entry to the reviews, approvals, receptions, revisions, * which indicates the user has been deleted from the process. By default it will - * do so for each review/approval regardless of its current state unless + * do so for each review/approval/reception/revision regardless of its current state unless * the user has been removed already (status=-2). So even - * reviews/approvals already processed by the user will be added the log + * reviews/approvals/receptions/revisions already processed by the user will be added the log * entry. Only if the last log entry was a removal already, it will not be * added a second time. + * This behaviour can be changed by passing a list of states in the optional + * argument $states. Only reviews, etc. in the given state will be affected. + * This allows to remove the user only if the review, etc. has not been done + * (state = 0). + * + * The last optional parameter $newuser is for replacing the user currently in + * charge by another user. * * @param object $user the user doing the removal (needed for entry in * review and approve log). * @param array $states remove user only from reviews/approvals in one of the states * e.g. if passing array('review'=>array(0)), the method will operate on * reviews which has not been touched yet. + * @param object user who is take over the processes * @return boolean true on success or false in case of an error */ private function __removeFromProcesses($user, $states = array(), $newuser=null) { /* {{{ */ $db = $this->_dms->getDB(); + /* Get a list of all reviews, even those of older document versions */ $reviewStatus = $this->getReviewStatus(); -// var_dump($newuser); -// print_r($reviewStatus);exit; $db->startTransaction(); foreach ($reviewStatus["indstatus"] as $ri) { if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) { @@ -945,41 +952,92 @@ class SeedDMS_Core_User { /* {{{ */ } $db->commitTransaction(); + /* Get a list of all approvals, even those of older document versions */ $approvalStatus = $this->getApprovalStatus(); + $db->startTransaction(); foreach ($approvalStatus["indstatus"] as $ai) { if($ai['status'] != -2 && (!isset($states['approval']) || in_array($ai['status'], $states['approval']))) { $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ". "VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')"; $res=$db->getResult($queryStr); if(!$res) { + $db->rollbackTransaction(); return false; } + /* Only approvals not done already can be transferred to a new user */ + if($newuser && $ai['status'] == 0) { + if($doc = $this->_dms->getDocument($ai['documentID'])) { + if($version = $doc->getContentByVersion($ai['version'])) { + $ret = $version->addIndReviewer($newuser, $user); + /* returns -3 if the user is already a reviewer */ + if($ret != 0 && $ret != -3) { + $db->rollbackTransaction(); + return false; + } + } + } + } } } + $db->commitTransaction(); + /* Get a list of all receptions, even those of older document versions */ $receiptStatus = $this->getReceiptStatus(); + $db->startTransaction(); foreach ($receiptStatus["indstatus"] as $ri) { if($ri['status'] != -2 && (!isset($states['receipt']) || in_array($ri['status'], $states['receipt']))) { $queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ". "VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')"; $res=$db->getResult($queryStr); if(!$res) { + $db->rollbackTransaction(); return false; } + /* Only receptions not done already can be transferred to a new user */ + if($newuser && $ri['status'] == 0) { + if($doc = $this->_dms->getDocument($ri['documentID'])) { + if($version = $doc->getContentByVersion($ri['version'])) { + $ret = $version->addIndRecipient($newuser, $user); + /* returns -3 if the user is already a recipient */ + if($ret != 0 && $ret != -3) { + $db->rollbackTransaction(); + return false; + } + } + } + } } } + $db->commitTransaction(); + /* Get a list of all revisions, even those of older document versions */ $revisionStatus = $this->getRevisionStatus(); + $db->startTransaction(); foreach ($revisionStatus["indstatus"] as $ri) { if($ri['status'] != -2 && (!isset($states['revision']) || in_array($ri['status'], $states['revision']))) { $queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ". "VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')"; $res=$db->getResult($queryStr); if(!$res) { + $db->rollbackTransaction(); return false; } + /* Only revisions not done already can be transferred to a new user */ + if($newuser && $ri['status'] == 0) { + if($doc = $this->_dms->getDocument($ri['documentID'])) { + if($version = $doc->getContentByVersion($ri['version'])) { + $ret = $version->addIndRevisor($newuser, $user); + /* returns -3 if the user is already a revisor */ + if($ret != 0 && $ret != -3) { + $db->rollbackTransaction(); + return false; + } + } + } + } } } + $db->commitTransaction(); return true; } /* }}} */ From 769b9e5beb7407234ab8dd6232cd20cdb0151be3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 14:07:19 +0100 Subject: [PATCH 302/467] add changes for 6.0.7 --- CHANGELOG | 3 ++- SeedDMS_Core/package.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 393743349..7665534b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,13 +3,14 @@ -------------------------------------------------------------------------------- - fix editing of document attachments - make receipt summary look like approval/review summary -- merge changes up to 5.1.12 +- merge changes up to 5.1.14 - do not show the updating user in a revision workflow if the status is 0 this is misleading because the user starting the revision workflow is the one first accessing the document - rejection of document receipts are turned off by default, but can be turned on in the settings - documents in DocumentChooser are sorted by name +- instead of just removing a user from all processes it can be replace by a new user -------------------------------------------------------------------------------- Changes in version 6.0.6 diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 9447260fe..da9eaf00c 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -28,6 +28,7 @@ SeedDMS_Core_Document::getTimeline() returns revision only for latest content add callback onSetStatus in SeedDMS_Core_DocumentContent::setStatus() add new list type 'DueRevision' in SeedDMS_Core_DMS::getDocumentList() a revision can also be started if some revisors have already reviewed the document +remove a user from all its process can also be used to set a new user From ca7bb77386a2ce3317e0358a7bf99cd40c8846a5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 14:27:30 +0100 Subject: [PATCH 303/467] better formating of checkboxes --- views/bootstrap/class.RemoveUserFromProcesses.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index ec202ce24..c28dcdcfd 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -91,7 +91,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"]))) + 'field_wrap' => array('") ) ); ?> @@ -108,7 +108,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"]))) + 'field_wrap' => array('") ) ); ?> @@ -125,7 +125,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"]))) + 'field_wrap' => array('") ) ); ?> @@ -143,7 +143,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"]))) + 'field_wrap' => array('") ) ); ?> @@ -160,7 +160,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"]))) + 'field_wrap' => array('") ) ); ?> @@ -177,7 +177,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"]))) + 'field_wrap' => array('") ) ); ?> From cbaa038c55ad375093a360d56104ceaa4085603d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 15:01:36 +0100 Subject: [PATCH 304/467] use formField() instead of plain html --- .../class.RemoveUserFromProcesses.php | 154 ++++++++++++------ 1 file changed, 105 insertions(+), 49 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index 1fd49ea71..fa0ef2c53 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -230,68 +230,124 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { -
          -
          - -
          -
          +formField( + getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[receipt][]', + 'value'=>'0', + 'checked'=>true + ), + array( + 'field_wrap' => array('") + ) + ); +?> -
          -
          - -
          -
          +formField( + getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[receipt][]', + 'value'=>'1', + 'checked'=>true + ), + array( + 'field_wrap' => array('") + ) + ); +?> -
          -
          - -
          -
          +formField( + getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[receipt][]', + 'value'=>'-1', + 'checked'=>true + ), + array( + 'field_wrap' => array('") + ) + ); +?> -
          -
          - -
          -
          +formField( + getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[revision][]', + 'value'=>'0', + 'checked'=>true + ), + array( + 'field_wrap' => array('") + ) + ); +?> -
          -
          - -
          -
          +formField( + getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[revision][]', + 'value'=>'-3', + 'checked'=>true + ), + array( + 'field_wrap' => array('") + ) + ); +?> -
          -
          - -
          -
          +formField( + getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[revision][]', + 'value'=>'1', + 'checked'=>true + ), + array( + 'field_wrap' => array('") + ) + ); +?> -
          -
          - -
          -
          +formField( + getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[revision][]', + 'value'=>'-1', + 'checked'=>true + ), + array( + 'field_wrap' => array('") + ) + ); +?> Date: Wed, 4 Dec 2019 19:31:02 +0100 Subject: [PATCH 305/467] menu item does not need a href if it has children --- views/bootstrap/class.Bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index ef4d5adc0..18fae8448 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -473,14 +473,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);; foreach($menuitems as $menuitem) { if(!empty($menuitem['children'])) { echo "
        • \n"; - echo " ".getMLText($menuitem['label'])." \n"; + echo " ".getMLText($menuitem['label'])." \n"; echo " \n"; } else { - echo "
        • ".getMLText($menuitem['label'])."
          • "; + echo "
        • ".getMLText($menuitem['label'])."
          • "; } } } /* }}} */ From 6d604d2d60c468b95471492d293f70d78f3091dd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 6 Dec 2019 15:23:38 +0100 Subject: [PATCH 306/467] set icon for video/webm --- views/bootstrap/class.Bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 18fae8448..7af9f1bb4 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -983,6 +983,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $icons["rar"] = "package.svg"; $icons["mpg"] = "video.svg"; $icons["avi"] = "video.svg"; + $icons["webm"] = "video.svg"; $icons["ods"] = "office-spreadsheet.svg"; $icons["ots"] = "office-spreadsheet.svg"; $icons["sxc"] = "office-spreadsheet.svg"; From 583ce13bfc778976c978d0e938a5a79177048af7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Dec 2019 06:20:11 +0100 Subject: [PATCH 307/467] set video icon for .mkv files --- views/bootstrap/class.Bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 7af9f1bb4..75f75ffa1 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -984,6 +984,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $icons["mpg"] = "video.svg"; $icons["avi"] = "video.svg"; $icons["webm"] = "video.svg"; + $icons["mkv"] = "video.svg"; $icons["ods"] = "office-spreadsheet.svg"; $icons["ots"] = "office-spreadsheet.svg"; $icons["sxc"] = "office-spreadsheet.svg"; From 658d00fe42d01f24d581e69e965c12a5aca4a008 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Dec 2019 06:20:31 +0100 Subject: [PATCH 308/467] allow preview of video/x-matroska videos --- views/bootstrap/class.ViewDocument.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 27461d1a1..c77a156ea 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -370,6 +370,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { case 'video/avi': case 'video/msvideo': case 'video/x-msvideo': + case 'video/x-matroska': $this->contentHeading(getMLText("preview")); ?>           "; $content .= "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; print "\n"; $list = $extmgr->getExtensionList(); foreach($list as $re) { @@ -279,7 +316,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { echo ""; echo ""; echo ""; - } + } echo "
          "; $content .= "
          "; - if($subFolder->getAccessMode($user) >= M_ALL) { + $subFolderAccessMode = $subFolder->getAccessMode($user); + if($subFolderAccessMode >= M_ALL) { $content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true); } else { $content .= ''; } - if($subFolder->getAccessMode($user) >= M_READWRITE) { + if($subFolderAccessMode >= M_READWRITE) { $content .= ''; } else { $content .= ''; From 167c8a41e3bf96da42a45a4dde776976beb40068 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 14:27:58 +0100 Subject: [PATCH 314/467] allow 4 arguments passed to hook --- inc/inc.ClassControllerCommon.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php index 618fc1ca3..4c3749f54 100644 --- a/inc/inc.ClassControllerCommon.php +++ b/inc/inc.ClassControllerCommon.php @@ -203,6 +203,9 @@ class SeedDMS_Controller_Common { foreach($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp)] as $hookObj) { if (method_exists($hookObj, $hook)) { switch(func_num_args()) { + case 4: + $result = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3)); + break; case 3: $result = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2)); break; From d27d4f118d0cf6cb9021663801184d2c6bb643c1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 14:59:23 +0100 Subject: [PATCH 315/467] add entries for 5.1.14 --- CHANGELOG | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6fae41425..91805b81b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,8 +2,11 @@ Changes in version 5.1.14 -------------------------------------------------------------------------------- - allow mimetype to specify documents which can be edited online -- show number of indexing tasks in bar +- show number of indexing tasks in progress bar - fix comparison of last indexing time with creation date of document content +- new hooks leftContentPre and leftContentPost +- minimize sql queries when fetching sub folders and documents of a folder +- custom attributes can be validated in a hook -------------------------------------------------------------------------------- Changes in version 5.1.13 From a0661536b331ff6f057722d5b3bf7a01c8407482 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 15:00:04 +0100 Subject: [PATCH 316/467] move attribute validation into controller and call hook --- controllers/class.AddDocument.php | 29 +++++++++++++++++++++++++++ controllers/class.AddSubFolder.php | 16 +++++++++++++++ controllers/class.EditDocument.php | 32 ++++++++++++++++++------------ controllers/class.EditFolder.php | 5 +++++ op/op.AddDocument.php | 14 ++++++++++++- op/op.AddSubFolder.php | 2 ++ op/op.EditDocument.php | 10 ++++++++-- op/op.EditFolder.php | 10 ++++++++-- 8 files changed, 100 insertions(+), 18 deletions(-) diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php index ff61cafaf..1d9b6393a 100644 --- a/controllers/class.AddDocument.php +++ b/controllers/class.AddDocument.php @@ -56,7 +56,36 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $reqversion = $this->getParam('reqversion'); $version_comment = $this->getParam('versioncomment'); $attributes = $this->getParam('attributes'); + foreach($attributes as $attrdefid=>$attribute) { + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { + return false; + } + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } + } elseif($attrdef->getMinValues() > 0) { + $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); + return false; + } + } + } $attributes_version = $this->getParam('attributesversion'); + foreach($attributes_version as $attrdefid=>$attribute) { + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { + return false; + } + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } + } + } + } $workflow = $this->getParam('workflow'); $notificationgroups = $this->getParam('notificationgroups'); $notificationusers = $this->getParam('notificationusers'); diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php index 0d6582855..71f86f5b6 100644 --- a/controllers/class.AddSubFolder.php +++ b/controllers/class.AddSubFolder.php @@ -40,6 +40,22 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common { $comment = $this->getParam('comment'); $sequence = $this->getParam('sequence'); $attributes = $this->getParam('attributes'); + foreach($attributes as $attrdefid=>$attribute) { + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { + return false; + } + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } + } elseif($attrdef->getMinValues() > 0) { + $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); + return false; + } + } + } $notificationgroups = $this->getParam('notificationgroups'); $notificationusers = $this->getParam('notificationusers'); diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php index 6d8714df4..d84ceae8d 100644 --- a/controllers/class.EditDocument.php +++ b/controllers/class.EditDocument.php @@ -116,22 +116,28 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common { $oldattributes = $document->getAttributes(); if($attributes) { foreach($attributes as $attrdefid=>$attribute) { - $attrdef = $dms->getAttributeDefinition($attrdefid); - if($attribute) { - if(!$attrdef->validate($attribute)) { - $this->errormsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute); - return false; - } + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } - if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) { - if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute)) + if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) { + if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute)) + return false; + } + } elseif($attrdef->getMinValues() > 0) { + $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); + } elseif(isset($oldattributes[$attrdefid])) { + if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid))) + return false; + } + } else { + if($ret === false) return false; } - } elseif($attrdef->getMinValues() > 0) { - $this->errormsg = getMLText("attr_min_values", array("attrname"=>$attrdef->getName())); - } elseif(isset($oldattributes[$attrdefid])) { - if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid))) - return false; } } } diff --git a/controllers/class.EditFolder.php b/controllers/class.EditFolder.php index f41399fe5..02c6d1163 100644 --- a/controllers/class.EditFolder.php +++ b/controllers/class.EditFolder.php @@ -51,6 +51,7 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common { if($attributes) { foreach($attributes as $attrdefid=>$attribute) { $attrdef = $dms->getAttributeDefinition($attrdefid); + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute); @@ -67,6 +68,10 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common { if(!$folder->removeAttribute($dms->getAttributeDefinition($attrdefid))) return false; } + } else { + if($ret === false) + return false; + } } } foreach($oldattributes as $attrdefid=>$oldattribute) { diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index 5cc09cc88..a82105aa5 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -93,6 +93,7 @@ if(isset($_POST["attributes"])) $attributes = $_POST["attributes"]; else $attributes = array(); +/* Has been moved to controller foreach($attributes as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { if($attribute) { @@ -105,11 +106,13 @@ foreach($attributes as $attrdefid=>$attribute) { } } } + */ if(isset($_POST["attributes_version"])) $attributes_version = $_POST["attributes_version"]; else $attributes_version = array(); +/* Has been moved to controller foreach($attributes_version as $attrdefid=>$attribute) { $attrdef = $dms->getAttributeDefinition($attrdefid); if($attribute) { @@ -119,6 +122,7 @@ foreach($attributes_version as $attrdefid=>$attribute) { } } } + */ $reqversion = (int)$_POST["reqversion"]; if ($reqversion<1) $reqversion=1; @@ -387,7 +391,15 @@ for ($file_num=0;$file_numsetParam('defaultaccessdocs', $settings->_defaultAccessDocs); if(!$document = $controller->run()) { - UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText($controller->getErrorMsg())); + $err = $controller->getErrorMsg(); + if(is_string($err)) + $errmsg = getMLText($err); + elseif(is_array($err)) { + $errmsg = getMLText($err[0], $err[1]); + } else { + $errmsg = $err; + } + UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),$errmsg); } else { // Send notification to subscribers of folder. if($notifier) { diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index f0284d1cb..19012dd46 100644 --- a/op/op.AddSubFolder.php +++ b/op/op.AddSubFolder.php @@ -67,6 +67,7 @@ if(isset($_POST["attributes"])) $attributes = $_POST["attributes"]; else $attributes = array(); +/* foreach($attributes as $attrdefid=>$attribute) { $attrdef = $dms->getAttributeDefinition($attrdefid); if($attribute) { @@ -78,6 +79,7 @@ foreach($attributes as $attrdefid=>$attribute) { UI::exitError(getMLText("folder_title", array("foldername" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName()))); } } + */ /* Check if additional notification shall be added */ $notusers = array(); diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index 5c3a66d4f..a8ef4fbc4 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -127,9 +127,15 @@ $controller->setParam('expires', $expires); $controller->setParam('sequence', $sequence); $controller->setParam('attributes', $attributes); if(!$controller->run()) { - if($controller->getErrorMsg()) { - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $controller->getErrorMsg()); + $err = $controller->getErrorMsg(); + if(is_string($err)) + $errmsg = getMLText($err); + elseif(is_array($err)) { + $errmsg = getMLText($err[0], $err[1]); + } else { + $errmsg = $err; } + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg); } if ($oldname != $name) { diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 050d6b3f5..6ea93f654 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -80,9 +80,15 @@ $controller->setParam('comment', $comment); $controller->setParam('sequence', $sequence); $controller->setParam('attributes', $attributes); if(!$controller->run()) { - if($controller->getErrorMsg()) { - UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())), $controller->getErrorMsg()); + $err = $controller->getErrorMsg(); + if(is_string($err)) + $errmsg = getMLText($err); + elseif(is_array($err)) { + $errmsg = getMLText($err[0], $err[1]); + } else { + $errmsg = $err; } + UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())), $errmsg); } if($oldname != $name) { From 058fc1217e21263ed0d03295fd6548b6e46756f1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 17:39:05 +0100 Subject: [PATCH 317/467] fix validation of attributes --- controllers/class.AddDocument.php | 16 ++++++++++------ controllers/class.AddSubFolder.php | 8 +++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php index 1d9b6393a..2b9942c86 100644 --- a/controllers/class.AddDocument.php +++ b/controllers/class.AddDocument.php @@ -58,9 +58,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $attributes = $this->getParam('attributes'); foreach($attributes as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { - if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { - return false; - } + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); @@ -70,20 +68,26 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); return false; } + } else { + if($ret === false) + return false; + } } } $attributes_version = $this->getParam('attributesversion'); foreach($attributes_version as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { - if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { - return false; - } + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); return false; } } + } else { + if($ret === false) + return false; + } } } $workflow = $this->getParam('workflow'); diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php index 71f86f5b6..539dcec12 100644 --- a/controllers/class.AddSubFolder.php +++ b/controllers/class.AddSubFolder.php @@ -42,9 +42,7 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common { $attributes = $this->getParam('attributes'); foreach($attributes as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { - if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { - return false; - } + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); @@ -54,6 +52,10 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common { $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); return false; } + } else { + if($ret === false) + return false; + } } } $notificationgroups = $this->getParam('notificationgroups'); From c332e0393b0591df1357b57c35d67c670aac5811 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 09:03:59 +0100 Subject: [PATCH 318/467] add new config variable noDocumentFormFields used for hiding some fields like comment, keywords, categories, ... --- inc/inc.ClassSettings.php | 6 ++ op/op.Settings.php | 4 ++ out/out.AddDocument.php | 1 + out/out.EditDocument.php | 1 + views/bootstrap/class.AddDocument.php | 11 +++- views/bootstrap/class.EditDocument.php | 84 +++++++++++++++++++++----- views/bootstrap/class.Settings.php | 1 + 7 files changed, 92 insertions(+), 16 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 564f4adda..35ed72a4b 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -70,6 +70,9 @@ class Settings { /* {{{ */ var $_defaultAccessDocs = ''; // Strict form checking var $_strictFormCheck = false; + // list of form fields which are visible by default but can be explixitly + // turn off (comment, keywords, categories, sequence, expiration, owner + var $_noDocumentFormFields = array(); // Path to where SeedDMS is located var $_rootDir = null; // Path to SeedDMS_Core @@ -455,6 +458,8 @@ class Settings { /* {{{ */ $node = $xml->xpath('/configuration/site/edition'); $tab = $node[0]->attributes(); $this->_strictFormCheck = Settings::boolVal($tab["strictFormCheck"]); + if(trim(strval($tab["noDocumentFormFields"]))) + $this->_noDocumentFormFields = explode(',',strval($tab["noDocumentFormFields"])); $this->setViewOnlineFileTypesFromString(strval($tab["viewOnlineFileTypes"])); $this->setEditOnlineFileTypesFromString(strval($tab["editOnlineFileTypes"])); $this->_enableConverting = Settings::boolVal($tab["enableConverting"]); @@ -802,6 +807,7 @@ class Settings { /* {{{ */ // XML Path: /configuration/site/edition $node = $this->getXMLNode($xml, '/configuration/site', 'edition'); $this->setXMLAttributValue($node, "strictFormCheck", $this->_strictFormCheck); + $this->setXMLAttributValue($node, "noDocumentFormFields", implode(',', $this->_noDocumentFormFields)); $this->setXMLAttributValue($node, "viewOnlineFileTypes", $this->getViewOnlineFileTypesToString()); $this->setXMLAttributValue($node, "editOnlineFileTypes", $this->getEditOnlineFileTypesToString()); $this->setXMLAttributValue($node, "enableConverting", $this->_enableConverting); diff --git a/op/op.Settings.php b/op/op.Settings.php index ae396169a..be279b10f 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -76,6 +76,10 @@ if ($action == "saveSettings") // SETTINGS - SITE - EDITION $settings->_strictFormCheck = getBoolValue("strictFormCheck"); + if(empty($_POST["noDocumentFormFields"])) + $settings->_noDocumentFormFields = array(); + else + $settings->_noDocumentFormFields = $_POST["noDocumentFormFields"]; $settings->setViewOnlineFileTypesFromString($_POST["viewOnlineFileTypes"]); $settings->setEditOnlineFileTypesFromString($_POST["editOnlineFileTypes"]); $settings->_enableConverting = getBoolValue("enableConverting"); diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php index 82a68ec8e..0cc16f138 100644 --- a/out/out.AddDocument.php +++ b/out/out.AddDocument.php @@ -56,6 +56,7 @@ if($settings->_quota > 0) { if($view) { $view->setParam('folder', $folder); $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('nodocumentformfields', $settings->_noDocumentFormFields); $view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload); $view->setParam('enablemultiupload', $settings->_enableMultiUpload); $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); diff --git a/out/out.EditDocument.php b/out/out.EditDocument.php index a4cfd8e72..f7ffa2318 100644 --- a/out/out.EditDocument.php +++ b/out/out.EditDocument.php @@ -59,6 +59,7 @@ $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'orderby'=>$settings->_sortFoldersDefault)); if($view) { + $view->setParam('nodocumentformfields', $settings->_noDocumentFormFields); $view->setParam('defaultposition', $settings->_defaultDocPosition); $view->setParam('accessobject', $accessop); $view($_GET); diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 156ba0904..b97e45d08 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -154,6 +154,7 @@ $(document).ready(function() { $enableownerrevapp = $this->params['enableownerrevapp']; $enableselfrevapp = $this->params['enableselfrevapp']; $strictformcheck = $this->params['strictformcheck']; + $nodocumentformfields = $this->params['nodocumentformfields']; $dropfolderdir = $this->params['dropfolderdir']; $dropfolderfile = $this->params['dropfolderfile']; $workflowmode = $this->params['workflowmode']; @@ -202,6 +203,7 @@ $(document).ready(function() { 'required'=>false ) ); + if(!$nodocumentformfields || !in_array('comment', $nodocumentformfields)) $this->formField( getMLText("comment"), array( @@ -212,10 +214,12 @@ $(document).ready(function() { 'required'=>$strictformcheck ) ); + if(!$nodocumentformfields || !in_array('keywords', $nodocumentformfields)) $this->formField( getMLText("keywords"), $this->getKeywordChooserHtml('form1') ); + if(!$nodocumentformfields || !in_array('categories', $nodocumentformfields)) { $options = array(); $categories = $dms->getDocumentCategories(); foreach($categories as $category) { @@ -232,7 +236,11 @@ $(document).ready(function() { 'options'=>$options ) ); - $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "
          ".getMLText('order_by_sequence_off') : '')); + } + if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) { + $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "
          ".getMLText('order_by_sequence_off') : '')); + } + if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { if($presetexpiration) { if(!($expts = strtotime($presetexpiration))) $expts = false; @@ -259,6 +267,7 @@ $(document).ready(function() { getMLText("expires"), $this->getDateChooser(($expts ? date('Y-m-d', $expts) : ''), "expdate", $this->params['session']->getLanguage()) ); + } if($user->isAdmin()) { $options = array(); $allUsers = $dms->getAllUsers($sortusersinlist); diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index 937245c4b..c0a6977ca 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -71,6 +71,7 @@ $(document).ready( function() { $document = $this->params['document']; $attrdefs = $this->params['attrdefs']; $strictformcheck = $this->params['strictformcheck']; + $nodocumentformfields = $this->params['nodocumentformfields']; $orderby = $this->params['orderby']; $this->htmlAddHeader(''."\n", 'js'); @@ -101,21 +102,46 @@ $(document).ready( function() { 'required'=>true ) ); - $this->formField( - getMLText("comment"), - array( - 'element'=>'textarea', - 'name'=>'comment', - 'rows'=>4, - 'cols'=>80, - 'value'=>htmlspecialchars($document->getComment()), - 'required'=>$strictformcheck - ) - ); - $this->formField( - getMLText("keywords"), - $this->getKeywordChooserHtml('form1', $document->getKeywords()) - ); + if(!$nodocumentformfields || !in_array('comment', $nodocumentformfields)) { + $this->formField( + getMLText("comment"), + array( + 'element'=>'textarea', + 'name'=>'comment', + 'rows'=>4, + 'cols'=>80, + 'value'=>htmlspecialchars($document->getComment()), + 'required'=>$strictformcheck + ) + ); + } else { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'comment', + 'value'=>htmlspecialchars($document->getComment()), + ) + ); + } + if(!$nodocumentformfields || !in_array('keywords', $nodocumentformfields)) { + $this->formField( + getMLText("keywords"), + $this->getKeywordChooserHtml('form1', $document->getKeywords()) + ); + } else { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'keywords', + 'value'=>htmlspecialchars($document->getKeywords()), + ) + ); + } + if(!$nodocumentformfields || !in_array('categories', $nodocumentformfields)) { $options = array(); $categories = $dms->getDocumentCategories(); foreach($categories as $category) { @@ -132,6 +158,21 @@ $(document).ready( function() { 'options'=>$options ) ); + } else { + $categories = $document->getCategories(); + foreach($categories as $category) { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'categories[]', + 'value'=>htmlspecialchars($category->getId()), + ) + ); + } + } + if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { $options = array(); $options[] = array('never', getMLText('does_not_expire')); $options[] = array('date', getMLText('expire_by_date'), $expdate != ''); @@ -152,9 +193,22 @@ $(document).ready( function() { getMLText("expires"), $this->getDateChooser($expdate, "expdate", $this->params['session']->getLanguage()) ); + } else { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'expdate', + 'value'=>$expdate, + ) + ); + } + if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) { if ($folder->getAccessMode($user) > M_READ) { $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s'), $document->getID()).($orderby != 's' ? "
          ".getMLText('order_by_sequence_off') : '')); } + } if($attrdefs) { foreach($attrdefs as $attrdef) { $arr = $this->callHook('editDocumentAttribute', $document, $attrdef); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 5bf83d692..9ca469a16 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -286,6 +286,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> showConfigHeadline('settings_Edition'); ?> showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?> +showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment'), true, true); ?> showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?> showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?> showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?> From 223c44c96557720dea06b3a1585ef36f48b52e65 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 09:07:02 +0100 Subject: [PATCH 319/467] various minor updates and new keys --- languages/ar_EG/lang.inc | 8 ++++++++ languages/bg_BG/lang.inc | 8 ++++++++ languages/ca_ES/lang.inc | 8 ++++++++ languages/cs_CZ/lang.inc | 12 ++++++++++-- languages/de_DE/lang.inc | 12 ++++++++++-- languages/el_GR/lang.inc | 12 ++++++++++-- languages/en_GB/lang.inc | 12 ++++++++++-- languages/es_ES/lang.inc | 8 ++++++++ languages/fr_FR/lang.inc | 8 ++++++++ languages/hr_HR/lang.inc | 14 +++++++++++--- languages/hu_HU/lang.inc | 12 ++++++++++-- languages/it_IT/lang.inc | 8 ++++++++ languages/ko_KR/lang.inc | 8 ++++++++ languages/lo_LA/lang.inc | 8 ++++++++ languages/nl_NL/lang.inc | 8 ++++++++ languages/pl_PL/lang.inc | 38 +++++++++++++++++++++++--------------- languages/pt_BR/lang.inc | 8 ++++++++ languages/ro_RO/lang.inc | 14 +++++++++++--- languages/ru_RU/lang.inc | 8 ++++++++ languages/sk_SK/lang.inc | 24 ++++++++++++++++-------- languages/sv_SE/lang.inc | 8 ++++++++ languages/tr_TR/lang.inc | 8 ++++++++ languages/uk_UA/lang.inc | 8 ++++++++ languages/zh_CN/lang.inc | 8 ++++++++ languages/zh_TW/lang.inc | 16 ++++++++++++---- 25 files changed, 243 insertions(+), 43 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index fe76d37c6..f5d76fb4b 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -454,6 +454,7 @@ URL: [url]', 'edit_folder_props' => 'تعديل مجلد', 'edit_group' => 'تعديل مجموعة', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'تعديل المستخدم', @@ -601,6 +602,7 @@ URL: [url]', 'group_members' => 'أعضاء المجموعة', 'group_receipt_summary' => '', 'group_review_summary' => 'ملخص مراجعة المجموعة', +'group_revision_summary' => '', 'guest_login' => 'الدخول كضيف', 'guest_login_disabled' => 'دخول ضيف غير متاح.', 'hash' => '', @@ -804,6 +806,7 @@ Parent folder: [folder_path] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - مجلد جديد', 'new_user_image' => 'صورة جديدة', +'next_revision_abbr' => '', 'next_state' => 'حالة جديدة', 'nl_NL' => 'الهولندي', 'no' => 'لا', @@ -1033,6 +1036,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1385,6 +1389,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ', @@ -1550,6 +1556,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1771,6 +1778,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف يحتوى معلومات الاصدار لمجمل مجلد النظام. بعد الانشاء كل ملف سيتم حفظه داخل المجلد الخاص به', 'versioning_info' => 'معلومات الاصدار', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'تم مسح الاصدار', 'version_deleted_email_body' => 'تم مسح الاصدار Document: [name] diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index a35fb8e69..5e6d58808 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -407,6 +407,7 @@ $text = array( 'edit_folder_props' => 'Редактирай папка', 'edit_group' => 'Редактирай група', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Редактирай потребител', @@ -530,6 +531,7 @@ $text = array( 'group_members' => 'Членове на групата', 'group_receipt_summary' => '', 'group_review_summary' => 'Сводка по рецензирането на групи', +'group_revision_summary' => '', 'guest_login' => 'Влез като гост', 'guest_login_disabled' => 'Входът като гост изключен', 'hash' => '', @@ -717,6 +719,7 @@ $text = array( 'new_subfolder_email_body' => '', 'new_subfolder_email_subject' => '', 'new_user_image' => 'Ново изображение', +'next_revision_abbr' => '', 'next_state' => 'Ново състояние', 'nl_NL' => 'Холандски', 'no' => 'Не', @@ -909,6 +912,7 @@ $text = array( 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1248,6 +1252,8 @@ $text = array( 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Не е намерено', 'settings_Notification' => 'Настройка за известяване', 'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.', @@ -1413,6 +1419,7 @@ $text = array( 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1625,6 +1632,7 @@ $text = array( 'versioning_file_creation_warning' => 'Тази операция ще създаде файл с версия за всяка папка. След създаване файлът ще бъде съхранен в каталога на документите.', 'versioning_info' => 'Информация за версиите', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'Версията е премахната', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index d7b84ca99..6ade3b629 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -412,6 +412,7 @@ URL: [url]', 'edit_folder_props' => 'Editar directori', 'edit_group' => 'Editar grup...', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuari...', @@ -535,6 +536,7 @@ URL: [url]', 'group_members' => 'Membres del grup', 'group_receipt_summary' => '', 'group_review_summary' => 'Resum del grup revisor', +'group_revision_summary' => '', 'guest_login' => 'Accés com a invitat', 'guest_login_disabled' => 'El compte d\'invitat està deshabilitat.', 'hash' => '', @@ -722,6 +724,7 @@ URL: [url]', 'new_subfolder_email_body' => '', 'new_subfolder_email_subject' => '', 'new_user_image' => 'Nova imatge', +'next_revision_abbr' => '', 'next_state' => '', 'nl_NL' => 'Holandès', 'no' => 'No', @@ -914,6 +917,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1253,6 +1257,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', @@ -1418,6 +1424,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1630,6 +1637,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Amb aquesta operació podeu crear un fitxer que contingui la informació de versions d\'una carpeta del DMS completa. Després de la creació, tots els fitxers es guardaran a la carpeta de documents.', 'versioning_info' => 'Informació de versions', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'Versió eliminada', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 48e05feb7..93cbd0d66 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1527), kreml (579) +// Translators: Admin (1528), kreml (579) $text = array( '2_factor_auth' => 'dvoufaktorové ověření', @@ -485,6 +485,7 @@ Odkaz je platný do [valid]. 'edit_folder_props' => 'Upravit složku', 'edit_group' => 'Upravit skupinu', 'edit_online' => 'Upravit online', +'edit_online_warning' => '', 'edit_task' => 'Upravit úkol', 'edit_transmittal_props' => 'Upravit vlastnosti přenosu', 'edit_user' => 'Upravit uživatele', @@ -553,7 +554,7 @@ URL: [url]', 'extension_loading' => 'Načítání rozšíření', 'extension_manager' => 'Správa rozšíření', 'extension_mgr_installed' => 'Instalováno', -'extension_mgr_no_upload' => '', +'extension_mgr_no_upload' => 'Nahrání nového rozšíření není možné, jelikož do složky rozšíření nelze zapisovat.', 'extension_mgr_repository' => 'Dostupný', 'extension_version_list' => 'Verze', 'february' => 'Únor', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Členové skupiny', 'group_receipt_summary' => 'Přehled potvrzení přijímání do skupiny', 'group_review_summary' => 'Souhrn recenzí skupiny', +'group_revision_summary' => '', 'guest_login' => 'Přihlásit se jako host', 'guest_login_disabled' => 'Přihlášení jako host je vypnuté.', 'hash' => 'Hash', @@ -842,6 +844,7 @@ Uživatel: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nová složka', 'new_user_image' => 'Nový obrázek', +'next_revision_abbr' => '', 'next_state' => 'Nový stav', 'nl_NL' => 'Holandština', 'no' => 'Ne', @@ -1107,6 +1110,7 @@ URL: [url]', 'revision_status' => 'Status revize', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revizoři', 'revisor_already_assigned' => 'Uživatel je již přiřazen jako revizor.', 'revisor_already_removed' => 'Revizor byl již z revizního procesu odstraněn nebo již dokument revidoval.', @@ -1464,6 +1468,8 @@ Jméno: [username] 'settings_maxUploadSize' => 'Maximální velikost nahraných souborů', 'settings_maxUploadSize_desc' => 'Toto je maximální velikost nahraných souborů. Bude mít vliv na verze dokumentů a přílohy.', 'settings_more_settings' => 'Konfigurovat další nastavení. Výchozí přihlášení: admin / admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nenalezeno', 'settings_Notification' => 'Nastavení upozornění', 'settings_notwritable' => 'Konfigurace nemůže být uložena, protože se do konfiguračního souboru nedá zapsat.', @@ -1629,6 +1635,7 @@ Jméno: [username] 'splash_edit_group' => 'Skupina uložena', 'splash_edit_role' => 'Role uložena', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Uživatel uložen', 'splash_error_add_to_transmittal' => 'Chyba při přidávání dokumentu k přenosu', 'splash_error_rm_download_link' => 'Chyba při odstranění odkazu ke stažení', @@ -1850,6 +1857,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Pomocí této operace můžete vytvořit soubor obsahující informace o verzování celé složky DMS. Po vytvoření bude každý soubor uložen uvnitř složky dokumentů.', 'versioning_info' => 'Info verzování', 'versiontolow' => 'Příliš nízká verze', +'version_comment' => '', 'version_deleted_email' => 'Verze smazána', 'version_deleted_email_body' => 'Verze smazána Dokument: [name] diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ac3564de0..ab04466e2 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2717), dgrutsch (22) +// Translators: Admin (2726), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -484,6 +484,7 @@ Der Link ist bis zum [valid] gültig. 'edit_folder_props' => 'Bearbeiten', 'edit_group' => 'Gruppe bearbeiten', 'edit_online' => 'Online editieren', +'edit_online_warning' => 'Mit dem Speichern wird die aktuellen Version des Dokuments überschrieben. Es wird keine neue Version angelegt.', 'edit_task' => 'Task editieren', 'edit_transmittal_props' => 'Attribute der Dokumentenliste bearbeiten', 'edit_user' => 'Benutzer bearbeiten', @@ -638,6 +639,7 @@ URL: [url]', 'group_members' => 'Gruppenmitglieder', 'group_receipt_summary' => 'Übersicht Gruppenbestätigungen', 'group_review_summary' => 'Übersicht Gruppenprüfungen', +'group_revision_summary' => 'Übersicht Gruppenwiederholungsprüfungen', 'guest_login' => 'Als Gast anmelden', 'guest_login_disabled' => 'Anmeldung als Gast ist gesperrt.', 'hash' => 'Hash-Wert', @@ -840,6 +842,7 @@ Benutzer: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [folder_name] - Neuer Ordner', 'new_user_image' => 'Neues Bild', +'next_revision_abbr' => 'Nächste Wieder.-Prüf.', 'next_state' => 'Neuer Status', 'nl_NL' => 'Niederländisch', 'no' => 'Nein', @@ -1117,6 +1120,7 @@ Kommentar: [comment] Benutzer: [username] URL: [url]', 'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe erteilen', +'revision_summary' => 'Übersicht Wiederholungsprüfungen', 'revisors' => 'Wiederholungsprüfer', 'revisor_already_assigned' => 'Benutzer bereits als Wiederholungsprüfer eingetragen.', 'revisor_already_removed' => 'Wiederholungsprüfer wurde bereits vom Prozess ausgeschlossen oder hat das Dokument bereits geprüft.', @@ -1317,7 +1321,7 @@ Name: [username] 'settings_dropFolderDir_desc' => 'Dieses Verzeichnis kann dazu benutzt werden Dokumente auf dem Server abzulegen und von dort zu importieren anstatt sie über den Browser hochzuladen. Das Verzeichnis muss ein Unterverzeichnis mit dem Login-Namen des angemeldeten Benutzers beinhalten.', 'settings_Edition' => 'Funktions-Einstellungen', 'settings_editOnlineFileTypes' => 'Dateitypen für Online-Editieren', -'settings_editOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen können Online editiert werden (benutzen Sie ausschließlich Kleinbuchstaben).', +'settings_editOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen oder Mimetypes können Online editiert werden (benutzen Sie ausschließlich Kleinbuchstaben).', 'settings_enable2FactorAuthentication' => '2-Faktor Authentifizierung einschalten', 'settings_enable2FactorAuthentication_desc' => 'Schaltet die 2-Faktor Authentifizierung ein, welche den Google Authenticator auf dem Mobiltelefon erfordert.', 'settings_enableAcknowledgeWorkflow' => '', @@ -1474,6 +1478,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale Größe hochzuladener Dateien', 'settings_maxUploadSize_desc' => 'Dies ist die maximale Größe einer hochzuladenen Datei. Es begrenzt sowohl Dokumentenversionen als auch Anhänge.', 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin', +'settings_noFormFields' => 'Diese Felder nicht zeigen', +'settings_noFormFields_desc' => 'Diese Felder werden bei der Neuanlage und beim Bearbeiten eines Dokuments nicht angezeigt. Bestehende Werte werden beibehalten.', 'settings_notfound' => 'Nicht gefunden', 'settings_Notification' => 'Benachrichtigungen-Einstellungen', 'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.', @@ -1639,6 +1645,7 @@ Name: [username] 'splash_edit_group' => 'Gruppe gespeichert', 'splash_edit_role' => 'Rolle gespeichert', 'splash_edit_task' => 'Task gespeichert', +'splash_edit_transmittal' => 'Dokumentenliste gespeichert', 'splash_edit_user' => 'Benutzer gespeichert', 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste', 'splash_error_rm_download_link' => 'Fehler beim Löschen des Download-Links', @@ -1860,6 +1867,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Mit dieser Operation erzeugen Sie pro Dokument eine Datei, die sämtliche Versions-Informationen des Dokuments enthält. Nach Erstellung wird jede Datei im Dokumentenverzeichnis gespeichert. Die erzeugten Dateien sind für den regulären Betrieb nicht erforderlich. Sie können aber von Nutzen sein, wenn der Dokumentenbestand auf ein anderes System übertragen werden soll.', 'versioning_info' => 'Versionsinformationen', 'versiontolow' => 'Version zu niedrig', +'version_comment' => 'Kommentar der Version', 'version_deleted_email' => 'Version gelöscht', 'version_deleted_email_body' => 'Version gelöscht Dokument: [name] diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 8a12d392a..04bdd53e8 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (281) +// Translators: Admin (282) $text = array( '2_factor_auth' => '', @@ -407,6 +407,7 @@ $text = array( 'edit_folder_props' => 'Επεξεργασία φακέλου', 'edit_group' => '', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => '', @@ -530,6 +531,7 @@ $text = array( 'group_members' => 'Μέλη ομάδας', 'group_receipt_summary' => '', 'group_review_summary' => '', +'group_revision_summary' => '', 'guest_login' => '', 'guest_login_disabled' => '', 'hash' => '', @@ -728,6 +730,7 @@ User: [username] URL: [url]', 'new_subfolder_email_subject' => '', 'new_user_image' => '', +'next_revision_abbr' => '', 'next_state' => '', 'nl_NL' => 'Δανέζικα', 'no' => 'Όχι', @@ -842,7 +845,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Πρόσφατες μεταφορτώσεις', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -920,6 +923,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1259,6 +1263,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', @@ -1424,6 +1430,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1636,6 +1643,7 @@ URL: [url]', 'versioning_file_creation_warning' => '', 'versioning_info' => '', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => '', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 50e9f528f..c720e74f2 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1813), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1822), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -485,6 +485,7 @@ The link is valid until [valid]. 'edit_folder_props' => 'Edit folder', 'edit_group' => 'Edit group', 'edit_online' => 'Edit online', +'edit_online_warning' => 'Saving your changes will overwrite the content of the current version, instead of creating a new version.', 'edit_task' => 'Edit task', 'edit_transmittal_props' => 'Edit transmittal properties', 'edit_user' => 'Edit user', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Group members', 'group_receipt_summary' => 'Group receipt summary', 'group_review_summary' => 'Group review summary', +'group_revision_summary' => 'Group revision summary', 'guest_login' => 'Login as guest', 'guest_login_disabled' => 'Guest login is disabled.', 'hash' => 'Hash', @@ -842,6 +844,7 @@ User: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - New folder', 'new_user_image' => 'New image', +'next_revision_abbr' => 'Next Rev.', 'next_state' => 'New state', 'nl_NL' => 'Dutch', 'no' => 'No', @@ -1112,6 +1115,7 @@ URL: [url]', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => 'Revision summary', 'revisors' => 'Revisors', 'revisor_already_assigned' => 'User is already assigned as an revisor.', 'revisor_already_removed' => 'Revisor has already been removed from revision process or has already revised the document.', @@ -1312,7 +1316,7 @@ Name: [username] 'settings_dropFolderDir_desc' => 'This directory can be used for dropping files on the server\'s file system and importing them from there instead of uploading via the browser. The directory must contain a sub directory for each user who is allowed to import files this way.', 'settings_Edition' => 'Edition settings', 'settings_editOnlineFileTypes' => 'Edit Online File Types', -'settings_editOnlineFileTypes_desc' => 'Files with one of the following endings can be edited online (USE ONLY LOWER CASE CHARACTERS)', +'settings_editOnlineFileTypes_desc' => 'Files with one of the following endings or mime types can be edited online (USE ONLY LOWER CASE CHARACTERS)', 'settings_enable2FactorAuthentication' => 'Enable 2-factor authentication', 'settings_enable2FactorAuthentication_desc' => 'Enable/disable 2 factor authentication. The users will need the Google Authenticator on its mobile phone.', 'settings_enableAcknowledgeWorkflow' => '', @@ -1469,6 +1473,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maxium size for uploaded files', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', +'settings_noFormFields' => 'Do not show this fields', +'settings_noFormFields_desc' => 'This fields will not been show when adding or edition a document. Existing values will be kept.', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', @@ -1634,6 +1640,7 @@ Name: [username] 'splash_edit_group' => 'Group saved', 'splash_edit_role' => 'Role saved', 'splash_edit_task' => 'Task saved', +'splash_edit_transmittal' => 'Transmittal saved', 'splash_edit_user' => 'User saved', 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal', 'splash_error_rm_download_link' => 'Error when removing download link', @@ -1855,6 +1862,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'With this operation you can create a file for each document containing the versioning information of that document. After the creation every file will be saved inside the document folder. Those files are not needed for the regular operation of the dms, but could be of value if the complete repository shall be transferred to an other system.', 'versioning_info' => 'Versioning info', 'versiontolow' => 'Version to low', +'version_comment' => 'Comment of version', 'version_deleted_email' => 'Version deleted', 'version_deleted_email_body' => 'Version deleted Document: [name] diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 4a9d982fd..362cdd090 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -461,6 +461,7 @@ URL: [url]', 'edit_folder_props' => 'Editar carpeta', 'edit_group' => 'Editar grupo...', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuario...', @@ -608,6 +609,7 @@ URL: [url]', 'group_members' => 'Miembros de grupo', 'group_receipt_summary' => '', 'group_review_summary' => 'Resumen del grupo revisor', +'group_revision_summary' => '', 'guest_login' => 'Acceso como invitado', 'guest_login_disabled' => 'La cuenta de invitado está deshabilitada.', 'hash' => '', @@ -811,6 +813,7 @@ Usuario: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nueva carpeta', 'new_user_image' => 'Nueva imagen', +'next_revision_abbr' => '', 'next_state' => 'Nuevo estado', 'nl_NL' => 'Holandes', 'no' => 'No', @@ -1048,6 +1051,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1400,6 +1404,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Tamaño máximo de subida archivos', 'settings_maxUploadSize_desc' => 'Tamaño máximo de archivos a cargar. Se tomará en cuenta para versiones de documentos y anexos de correo electrónico', 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'No encontrado', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', @@ -1565,6 +1571,7 @@ URL: [url]', 'splash_edit_group' => 'Grupo guardado', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Usuario guardado', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1786,6 +1793,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Con esta operación usted puede crear un fichero que contenga la información de versiones de una carpeta del DMS completa. Después de la creación todos los ficheros se guardarán en la carpeta de documentos.', 'versioning_info' => 'Información de versiones', 'versiontolow' => 'Versión', +'version_comment' => '', 'version_deleted_email' => 'Versión eliminada', 'version_deleted_email_body' => 'Versión eliminada Documento: [name] diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index dc223ee4a..7689bf37d 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -485,6 +485,7 @@ Le lien est valide jusqu’au [valid]. 'edit_folder_props' => 'Modifier le dossier', 'edit_group' => 'Modifier un groupe', 'edit_online' => 'Modification en ligne', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Modifier les propriétés de la transmission', 'edit_user' => 'Modifier un utilisateur', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Membres du groupe', 'group_receipt_summary' => 'Vue d’ensemble groupe réception', 'group_review_summary' => 'Vue d’ensemble groupe vérification', +'group_revision_summary' => '', 'guest_login' => 'Se connecter comme invité', 'guest_login_disabled' => 'Connexion d\'invité désactivée.', 'hash' => 'Hash', @@ -842,6 +844,7 @@ Utilisateur : [username] URL : [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nouveau dossier', 'new_user_image' => 'Nouvelle image', +'next_revision_abbr' => '', 'next_state' => 'Nouvel état', 'nl_NL' => 'Danois', 'no' => 'Non', @@ -1102,6 +1105,7 @@ URL : [url]', 'revision_status' => 'État', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Réviseurs', 'revisor_already_assigned' => 'L’utilisateur est déjà attribué en tant que réviseur.', 'revisor_already_removed' => 'Le réviseur a déjà été retiré du processus de révision ou a déjà révisé le document.', @@ -1453,6 +1457,8 @@ Nom : [username] 'settings_maxUploadSize' => 'Taille max. des fichiers', 'settings_maxUploadSize_desc' => 'Taille maximale (en octets) pour les fichiers téléversés. Concerne les versions d’un document et les fichiers attachés.', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', @@ -1618,6 +1624,7 @@ Nom : [username] 'splash_edit_group' => 'Groupe modifié', 'splash_edit_role' => 'Rôle modifié', 'splash_edit_task' => 'Tâche modifiée', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Utilisateur modifié', 'splash_error_add_to_transmittal' => 'Erreur lors de l’ajout du document à la transmission', 'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement', @@ -1839,6 +1846,7 @@ URL : [url]', 'versioning_file_creation_warning' => 'Cette opération permet de créer, pour chaque document, un fichier texte contenant les informations générales et l’historique des versions du document. Chaque fichier sera enregistré dans le répertoire du document. Ces fichiers ne sont pas nécessaires au bon fonctionnement de SeedDMS, mais ils peuvent être utiles en cas de transfert des fichiers vers un autre système.', 'versioning_info' => 'Versions', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'Version supprimée', 'version_deleted_email_body' => 'Version supprimée Document: [name] diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 0ebfc4e25..87535ebb7 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1223), marbanas (16) +// Translators: Admin (1225), marbanas (16) $text = array( '2_factor_auth' => '', @@ -466,6 +466,7 @@ Internet poveznica: [url]', 'edit_folder_props' => 'Uredi mapu', 'edit_group' => 'Uredi mapu', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Izmjena postavki proslijeđivanja', 'edit_user' => 'Uredi korisnika', @@ -613,6 +614,7 @@ Internet poveznica: [url]', 'group_members' => 'Članovi grupe', 'group_receipt_summary' => 'Sažetak prijema za grupu', 'group_review_summary' => 'Sažetak pregleda grupe', +'group_revision_summary' => '', 'guest_login' => 'Prijavite se kao gost', 'guest_login_disabled' => 'Prijava "kao gost" je onemogućena.', 'hash' => '', @@ -815,6 +817,7 @@ Korisnik: [username] Internet poveznica: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nova mapa', 'new_user_image' => 'Nova slika', +'next_revision_abbr' => '', 'next_state' => 'Slijedeći status', 'nl_NL' => 'Nizozemski', 'no' => 'Ne', @@ -1069,6 +1072,7 @@ Internet poveznica: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revizori', 'revisor_already_assigned' => 'Korisnik je već dodijeljen kao revizor', 'revisor_already_removed' => 'Revizor je uklonjen iz procesa revizije ili je već revidirao dokument.', @@ -1421,6 +1425,8 @@ Internet poveznica: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nije pronađeno', 'settings_Notification' => 'Postavke bilježenja', 'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.', @@ -1586,6 +1592,7 @@ Internet poveznica: [url]', 'splash_edit_group' => 'Groupa pohranjena', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Korisnik pohranjen', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1722,8 +1729,8 @@ Internet poveznica: [url]', 'to_before_from' => 'Datum završetka ne može biti prije datuma početka', 'transfer_content' => '', 'transfer_document' => 'Prijenos dokumenta', -'transfer_no_read_access' => '', -'transfer_no_write_access' => '', +'transfer_no_read_access' => 'Korisnik nema pravo čitanja u ovom folderu', +'transfer_no_write_access' => 'Korisnik nema pravo pisanja u ovom folderu', 'transfer_objects' => '', 'transfer_objects_to_user' => '', 'transfer_to_user' => 'Prijenos korisniku', @@ -1807,6 +1814,7 @@ Internet poveznica: [url]', 'versioning_file_creation_warning' => 'Ovo radnjom možete izraditi datoteku koja sadrži informacije o verzijama cijele DMS mape. Nakon izrade, svaka datoteka će biti pohranjena unutar podatkovne mape.', 'versioning_info' => 'Info o verzijama', 'versiontolow' => 'Na nižu verziju', +'version_comment' => '', 'version_deleted_email' => 'Izbrisana verzija', 'version_deleted_email_body' => 'Izbrisana verzija Dokument: [name] diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 93408b6c4..de3034b48 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (634), ribaz (1036) +// Translators: Admin (635), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -461,6 +461,7 @@ URL: [url]', 'edit_folder_props' => 'Mappa szerkesztése', 'edit_group' => 'Csoport szerkesztése', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Felhasználó szerkesztése', @@ -608,6 +609,7 @@ URL: [url]', 'group_members' => 'Csoporttagok', 'group_receipt_summary' => '', 'group_review_summary' => 'Csoport felülvizsgálat összefoglaló', +'group_revision_summary' => '', 'guest_login' => 'Bejelentkezés vendégként', 'guest_login_disabled' => 'Vendég bejelentkezés letiltva.', 'hash' => 'hash', @@ -811,6 +813,7 @@ Felhasználó: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Új mappa', 'new_user_image' => 'Új kép', +'next_revision_abbr' => '', 'next_state' => 'Új állapot', 'nl_NL' => 'Holland', 'no' => 'Nem', @@ -1048,6 +1051,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1150,7 +1154,7 @@ URL: [url]', 'select_one' => 'Vßlasszon egyet', 'select_user' => 'Felhasználó kiválasztása', 'select_users' => 'Kattintson a felhasználó kiválasztásához', -'select_value' => '', +'select_value' => 'Érték kiválasztása', 'select_workflow' => 'Munkafolyamat választás', 'send_email' => 'email küldés', 'send_login_data' => '', @@ -1399,6 +1403,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nem található', 'settings_Notification' => 'Értesítés beállításai', 'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.', @@ -1564,6 +1570,7 @@ URL: [url]', 'splash_edit_group' => 'Csoport mentve', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Felhasználó mentve', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1785,6 +1792,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Ezzel a művelettel létrehozhat egy állományt ami tartalmazni fogja a változat információkat a teljes DMS mappáról. A létrehozás után minden állomány a dokumentum mappába lesz mentve.', 'versioning_info' => 'Változás információ', 'versiontolow' => 'Túl alacsony verzió', +'version_comment' => '', 'version_deleted_email' => 'Változat törölve', 'version_deleted_email_body' => 'Változat törölve Dokumentum: [name] diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index dc9d4d604..89127ad1d 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -478,6 +478,7 @@ Il collegamento The link è ancora valido fino a [valid]. 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', 'edit_online' => 'Modifica online', +'edit_online_warning' => '', 'edit_task' => 'Modifica attività', 'edit_transmittal_props' => 'Modifica proprietà trasmissione', 'edit_user' => 'Modifica l\'utente', @@ -625,6 +626,7 @@ URL: [url]', 'group_members' => 'Membri del gruppo', 'group_receipt_summary' => 'Panoramica delle conferme ricevute gruppo.', 'group_review_summary' => 'Dettaglio revisioni di gruppo', +'group_revision_summary' => '', 'guest_login' => 'Login come Ospite', 'guest_login_disabled' => 'Il login come Ospite è disabilitato.', 'hash' => 'Hash', @@ -828,6 +830,7 @@ Utente: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nuova sottocartella', 'new_user_image' => 'Nuova immagine', +'next_revision_abbr' => '', 'next_state' => 'Nuovo stato', 'nl_NL' => 'Olandese', 'no' => 'No', @@ -1098,6 +1101,7 @@ URL: [url]', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revisori', 'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore', 'revisor_already_removed' => 'Revisore già rimosso dal processo di riesame o ha già riesaminato il documento.', @@ -1455,6 +1459,8 @@ Name: [username] 'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare', 'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.', @@ -1620,6 +1626,7 @@ Name: [username] 'splash_edit_group' => 'Gruppo modificato', 'splash_edit_role' => 'Ruolo memorizzato', 'splash_edit_task' => 'Attività modificata', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Utente modificato', 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione', 'splash_error_rm_download_link' => 'Errore durante la rimozione del collegamento di scaricamento', @@ -1841,6 +1848,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Con questa operazione è possibile creare un file di backup delle informazioni di versione dei documenti di un\'intera cartella. Dopo la creazione ogni file viene salvato nella cartella del relativo documento.', 'versioning_info' => 'Informazioni di versione', 'versiontolow' => 'Versione obsoleta', +'version_comment' => '', 'version_deleted_email' => 'Cancellazione versione', 'version_deleted_email_body' => 'Versione cancellata Documento: [name] diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 794f3929f..bc7c0dc49 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -467,6 +467,7 @@ URL: [url]', 'edit_folder_props' => '폴더 편집', 'edit_group' => '편집 그룹', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '전송 속성 편집', 'edit_user' => '사용자 편집', @@ -614,6 +615,7 @@ URL: [url]', 'group_members' => '카페 회원', 'group_receipt_summary' => '그룹 접수 요약', 'group_review_summary' => '그룹 검토 요약', +'group_revision_summary' => '', 'guest_login' => '게스트로 로그인', 'guest_login_disabled' => '고객 로그인을 사용할 수 없습니다.', 'hash' => '해시', @@ -817,6 +819,7 @@ URL: [url]', URL [url]', 'new_subfolder_email_subject' => '[sitename] : [name] - 새 폴더', 'new_user_image' => '새로운 이미지', +'next_revision_abbr' => '', 'next_state' => '새 상태', 'nl_NL' => '네덜란드', 'no' => '아니오', @@ -1063,6 +1066,7 @@ URL: [url]', 'revision_status' => '상태', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '감사', 'revisor_already_assigned' => '이미 감사가 선임이 된 사용자.', 'revisor_already_removed' => '감사는 문서의 개정을 과정에서 삭제했거나 이미 개정을 완료 했습니다.', @@ -1415,6 +1419,8 @@ URL : [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '찾을 수 없음', 'settings_Notification' => '알림 설정', 'settings_notwritable' => '구성값을 저장할 수 없습니다 구성 파일에 쓰기 권한이 없습니다.', @@ -1580,6 +1586,7 @@ URL : [url]', 'splash_edit_group' => '그룹 저장', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '사용자 저장', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1801,6 +1808,7 @@ URL : [url]', 'versioning_file_creation_warning' => '버전 정보가 포함 된 파일을 만들 수 있습니다. 이 작업은 전체 DMS 폴더를 작성 후 모든 파일이 문서 폴더 안에 저장됩니다.', 'versioning_info' => '버전 관리 정보', 'versiontolow' => '낮은 버전', +'version_comment' => '', 'version_deleted_email' => '버전 삭제', 'version_deleted_email_body' => '버전 삭제 문서: [name] diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 514a4673b..f244c1de9 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -471,6 +471,7 @@ URL: [url]', 'edit_folder_props' => 'ແກ້ໄຂໂຟລເດີ', 'edit_group' => 'ແກ້ໄຂກຸ່ມ', 'edit_online' => 'ແກ້ໄຂອອນລາຍ', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'ແກ້ໄຂຄຸນສົມບັດໃນການຖ່າຍທອດ', 'edit_user' => 'ແກ້ໄຂຜູ້ໃຊ້', @@ -618,6 +619,7 @@ URL: [url]', 'group_members' => 'ສະມາຊິກກຸ່ມ', 'group_receipt_summary' => 'ພາບລວມການຢືນຢັນເນື້ອຫາຂອງກຸ່ມ', 'group_review_summary' => 'ສະຫຼຸບບົດວິຈານຂອງກຸ່ມ', +'group_revision_summary' => '', 'guest_login' => 'ເຂົ້າສູ້ລະບົບໃນຖານະແຂກ', 'guest_login_disabled' => 'ການເຂົ້າສູ້ລະບົບສຳລັບບຸກຄົນທົ່ວໄປຖຶກປິດການໄຊ້ງານ', 'hash' => 'ກັນຊາ', @@ -821,6 +823,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]:[name] - ໂຟລເດີໄຫມ່', 'new_user_image' => 'ຮູບໄຫມ່', +'next_revision_abbr' => '', 'next_state' => 'ລັດໄຫມ່', 'nl_NL' => 'ດັສ', 'no' => 'ບໍ່', @@ -1091,6 +1094,7 @@ URL: [url]', 'revision_status' => 'ສະຖານະ', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'ຜູ້ປະສານງານ', 'revisor_already_assigned' => 'ກຳນົດຜູ້ໄຊ້ເປັນຜູ້ກວດສອບແລ້ວ', 'revisor_already_removed' => 'ຜູ້ກວດສອບຖືກນຳອອກຈາກຂະບວນການແກ້ໄຂ ຫຼືໄດ້ແກ້ໄຂເອກະສານແລ້ວ', @@ -1448,6 +1452,8 @@ URL: [url]', 'settings_maxUploadSize' => 'ขนาดสูงสุดสำหรับไฟล์ที่อัปโหลด.', 'settings_maxUploadSize_desc' => 'ນີ້ຄືຂະໜາດສູງສຸດສຳລັບໄຟລທີອັບໂຫລດ ຈະມີຜົນຕໍ່ເວີຊັນເອກະສານແລະ ເອກະສານແນບ', 'settings_more_settings' => 'กำหนดค่าการตั้งค่าเพิ่มเติม ค่าเริ่มต้นการเข้าสู่ระบบ: ผู้ดูแลระบบ / ผู้ดูแลระบบ.', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'ເຂົ້າລະບົບ', 'settings_Notification' => 'ການຕັ້ງຄ່າການແຈ້ງເຕືອນ', 'settings_notwritable' => 'ການກຳນົດຄ່າທີ່ບໍ່ສາມາດບັນທືກໄດ້ຍ້ອນວ່າໄຟລກຳນົດຄ່າບໍ່ສາມາດຂຽນໄດ້', @@ -1613,6 +1619,7 @@ URL: [url]', 'splash_edit_group' => 'ບັນທຶກກຸ່ມແລ້ວ', 'splash_edit_role' => 'ບັນທຶກບົດບາດແລ້ວ', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'ບັນທຶກຜູ້ໄຊ້ແລ້ວ', 'splash_error_add_to_transmittal' => 'ເກີດຂໍ້ຜິດພາດໃນຂະນະທີ່ເພີ່ມເອກະສານເພື່ອຕິດຕໍ່', 'splash_error_rm_download_link' => 'ຂໍ້ຜິດພາດໃນການລົບລິງການດາວໂຫລດ', @@ -1834,6 +1841,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'ສຳລັບການດຳເນີນງານນີ້ເຈົ້າສາມາດສ້າງໄຟລສຳລັບແຕ່ລະເອກະສານທີມີຂໍ້ມູນການກຳນົດເວີຊັ້ນຂອງເອກະສານນັ້ນ', 'versioning_info' => 'ຂໍ້ມູນການກຳນົດລຸ້ນ', 'versiontolow' => 'ເວີຊັ້ນຕຳ', +'version_comment' => '', 'version_deleted_email' => 'ລົບເວີຊັ້ນແລ້ວ', 'version_deleted_email_body' => 'ລົບເວີຊັ້ນແລ້ວ ເອກະສານ: [name] diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index ed3933853..884849f29 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -466,6 +466,7 @@ De link is geldig tot [valid]. 'edit_folder_props' => 'Wijzig Map eigenschappen', 'edit_group' => 'Wijzig Groep', 'edit_online' => 'Online bewerken', +'edit_online_warning' => '', 'edit_task' => 'Taak bewerken', 'edit_transmittal_props' => 'Opmerkingen bij verzending', 'edit_user' => 'Wijzig gebruiker', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Groepsleden', 'group_receipt_summary' => 'Overzicht van ontvangst per groep', 'group_review_summary' => 'Groep Beoordeling samenvatting', +'group_revision_summary' => '', 'guest_login' => 'Login als Gast', 'guest_login_disabled' => 'Gast login is uitgeschakeld.', 'hash' => 'Hashcode', @@ -815,6 +817,7 @@ Gebruikers: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nieuwe map', 'new_user_image' => 'Nieuwe afbeelding', +'next_revision_abbr' => '', 'next_state' => 'Nieuwe status', 'nl_NL' => 'Nederlands', 'no' => 'Nee', @@ -1084,6 +1087,7 @@ URL: [url]', 'revision_status' => 'Status revisie', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Herzieners', 'revisor_already_assigned' => 'Gebruiker is reeds herziener', 'revisor_already_removed' => 'Herziener reeds verwijderd', @@ -1445,6 +1449,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale omvang voor uploaden', 'settings_maxUploadSize_desc' => 'Dit is de maximale omvang voor te uploaden bestanden. Dat geldt voor bestanden en bijlagen.', 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Niet gevonden', 'settings_Notification' => 'Notificatie instellingen', 'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.', @@ -1610,6 +1616,7 @@ Name: [username] 'splash_edit_group' => 'Groep opgeslagen', 'splash_edit_role' => 'Rol opgeslagen', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Gebruiker opgeslagen', 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending', 'splash_error_rm_download_link' => 'Fout bij verwijderen download-link', @@ -1831,6 +1838,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Met deze handeling maakt U een bestand aan die de versie voortgang informatie van een compleet DMS bevat. Na het aanmaken wordt ieder bestand opgeslagen in de document map.', 'versioning_info' => 'Versie eigenschappen', 'versiontolow' => 'Versie voor laag', +'version_comment' => '', 'version_deleted_email' => 'Versie verwijderd', 'version_deleted_email_body' => 'Version deleted Document: [name] diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index c9bff7f10..89ab5e925 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (840), netixw (84), romi (93), uGn (112) +// Translators: Admin (854), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -454,6 +454,7 @@ URL: [url]', 'edit_folder_props' => 'Edytuj folder', 'edit_group' => 'Edytuj grupę', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Edytuj użytkownika', @@ -601,6 +602,7 @@ URL: [url]', 'group_members' => 'Członkowie grupy', 'group_receipt_summary' => '', 'group_review_summary' => 'Podsumowanie opiniowania dla grupy', +'group_revision_summary' => '', 'guest_login' => 'Zalogowany jako gość', 'guest_login_disabled' => 'Logowanie dla gościa jest wyłączone.', 'hash' => '', @@ -614,7 +616,7 @@ URL: [url]', 'hu_HU' => 'Węgierski', 'id' => 'ID', 'identical_version' => 'Nowa wersja jest identyczna z obecną', -'import' => '', +'import' => 'Import', 'importfs' => '', 'import_extension' => '', 'import_fs' => 'Import z systemu plików', @@ -804,6 +806,7 @@ Użytkownik: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nowy folder', 'new_user_image' => 'Nowy obraz', +'next_revision_abbr' => '', 'next_state' => 'Nowy status', 'nl_NL' => 'holenderski', 'no' => 'Nie', @@ -1027,6 +1030,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1164,7 +1168,7 @@ URL: [url]', 'settings_autoLoginUser_desc' => '', 'settings_available_languages' => 'Dostępne języki', 'settings_available_languages_desc' => 'Tylko wybrane języki zostaną załadowane i będą widoczne w kontrolce wyboru języka. Domyślny język zawsze jest ładowany.', -'settings_backupDir' => '', +'settings_backupDir' => 'Lokalizacja kopii zapasowej', 'settings_backupDir_desc' => '', 'settings_cacheDir' => 'Folder bufora', 'settings_cacheDir_desc' => 'Miejsce przechowywania obrazków podglądu (najlepiej wybrać katalog nie dostępny bezpośrednio dla web-serwera).', @@ -1203,8 +1207,8 @@ URL: [url]', 'settings_dbUser' => 'Nazwa użytkownika', 'settings_dbUser_desc' => 'Nazwa użytkownika uprawnionego do dostępu do bazy danych podana w procesie instalacji. Nie zmieniaj tego pola dopóki nie jest to absolutnie konieczne, na przykład podczas przenoszenia bazy danych na nowego hosta.', 'settings_dbVersion' => 'Schemat bazy danych jest za stary', -'settings_defaultAccessDocs' => '', -'settings_defaultAccessDocs_desc' => '', +'settings_defaultAccessDocs' => 'Domyślny dostęp do nowych dokumentów', +'settings_defaultAccessDocs_desc' => 'Kiedy zostanie utworzony nowy dokument, będzie to domyślne prawo dostępu.', 'settings_defaultDocPosition' => '', 'settings_defaultDocPosition_desc' => '', 'settings_defaultDocPosition_val_end' => 'koniec', @@ -1263,8 +1267,8 @@ URL: [url]', 'settings_enableLanguageSelector_desc' => 'Pokaż selektor języka dla interfejsu użytkownika po zalogowaniu To nie ma wpływu na wybór języka na stronie logowania.', 'settings_enableLargeFileUpload' => 'Zezwól na wczytywanie dużych plików', 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.', -'settings_enableMenuTasks' => '', -'settings_enableMenuTasks_desc' => '', +'settings_enableMenuTasks' => 'Włącz listę zadań w menu', +'settings_enableMenuTasks_desc' => 'Włącza /Wyłącza pozycję w menu w której znajdują się wszystkie zadania dla użytkownika. Zawiera dokumenty, które potrzebują być ocenione, zatwierdzone, i.t.d.', 'settings_enableMultiUpload' => 'Zezwól na wysyłanie wielu plików', 'settings_enableMultiUpload_desc' => '', 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów', @@ -1295,8 +1299,8 @@ URL: [url]', 'settings_enableSelfReceipt_desc' => '', 'settings_enableSelfRevApp' => 'Pozwalaj przeglądać/zatwierdzać dla zalogowanych użytkowników', 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu', -'settings_enableSessionList' => '', -'settings_enableSessionList_desc' => '', +'settings_enableSessionList' => 'Włącz listę użytkowników online w menu', +'settings_enableSessionList_desc' => 'Włącza listę obecnie zalogowanych użytkowników w menu.', 'settings_enableThemeSelector' => 'Wybór motywu', 'settings_enableThemeSelector_desc' => '', 'settings_enableUpdateReceipt' => '', @@ -1338,7 +1342,7 @@ URL: [url]', 'settings_guestID_desc' => 'ID gościa używane kiedy gość jest zalogowany (zazwyczaj nie wymaga zmiany)', 'settings_httpRoot' => 'Http Root', 'settings_httpRoot_desc' => 'Relatywna ścieżka w URL, część za domeną. Nie dołączaj przedrostka http:// ani nazwy hosta. Np. Jeśli cały URL to http://www.example.com/letodms/, wpisz \'/letodms/\'. Jeśli URL to http://www.example.com/, set \'/\'', -'settings_incItemsPerPage' => '', +'settings_incItemsPerPage' => 'Liczba wpisów załadowana na dole strony', 'settings_incItemsPerPage_desc' => '', 'settings_initialDocumentStatus' => '', 'settings_initialDocumentStatus_desc' => '', @@ -1370,15 +1374,17 @@ URL: [url]', 'settings_maxDirID_desc' => 'Maksymalna liczba podkatalogów dla katalogu nadrzędnego. Domyślnie: 0.', 'settings_maxExecutionTime' => 'Maksymalny czas wykonywania (s)', 'settings_maxExecutionTime_desc' => 'Ustawia maksymalny czas, liczony w sekundach, jaki ma na wykonanie skrypt zanim zostanie zakończony.', -'settings_maxItemsPerPage' => '', +'settings_maxItemsPerPage' => 'Maksymalna liczba wpisów na stronę', 'settings_maxItemsPerPage_desc' => '', 'settings_maxRecursiveCount' => 'Max. liczba rekurencji dokumentów/folderów', 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', -'settings_maxUploadSize' => '', -'settings_maxUploadSize_desc' => '', +'settings_maxUploadSize' => 'Maksymalny rozmiar wysyłanych plików', +'settings_maxUploadSize_desc' => 'To jest maksymalny rozmiar dla nadesłanych plików. To ustawienie wpływa również na wersje dokumentu i załączniki.', 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nie znaleziono', 'settings_Notification' => 'Ustawienia powiadomień', 'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.', @@ -1450,8 +1456,8 @@ URL: [url]', 'settings_smtpPort_desc' => 'Port serwera SMTP, domyślnie 25', 'settings_smtpSendFrom' => 'Wyślij od', 'settings_smtpSendFrom_desc' => 'Wyślij od', -'settings_smtpSendTestMail' => '', -'settings_smtpSendTestMail_desc' => '', +'settings_smtpSendTestMail' => 'Wyślij mail testowy', +'settings_smtpSendTestMail_desc' => 'Wysyła mail testowy w celu sprawdzenia obecnej konfiguracji e-mail', 'settings_smtpServer' => 'Nazwa serwera SMTP', 'settings_smtpServer_desc' => 'Nazwa hosta serwera SMTP', 'settings_smtpUser' => 'Użytkownik SMTP', @@ -1544,6 +1550,7 @@ URL: [url]', 'splash_edit_group' => 'Grupa zapisana', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Zapisano użytkownika', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1765,6 +1772,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Ta operacja utworzy plik zawierający informacje o wersjach plików z całego wskazanego folderu. Po utworzeniu, każdy plik będzie zapisany w folderze odpowiednim dla danego dokumentu.', 'versioning_info' => 'Informacje o wersjach', 'versiontolow' => 'Za niska wersja', +'version_comment' => '', 'version_deleted_email' => 'Wersja usunięta', 'version_deleted_email_body' => 'Wersja została usunięta Dokument: [name] diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 18980a55b..1ddfc6a75 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -485,6 +485,7 @@ O link é válido até [valid]. 'edit_folder_props' => 'Editar pasta', 'edit_group' => 'Editar grupo', 'edit_online' => 'Editar on-line', +'edit_online_warning' => '', 'edit_task' => 'Editar tarefa', 'edit_transmittal_props' => 'Editar propriedades de transmissão', 'edit_user' => 'Editar usuário', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Membros do Grupo', 'group_receipt_summary' => 'Resumo de recebimento de grupo', 'group_review_summary' => 'Resumo da avaliação do grupo', +'group_revision_summary' => '', 'guest_login' => 'Entre como convidado', 'guest_login_disabled' => 'O login de convidado está desativado.', 'hash' => 'Hash', @@ -841,6 +843,7 @@ Usuário: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nova pasta', 'new_user_image' => 'Nova imagem', +'next_revision_abbr' => '', 'next_state' => 'Novo estado', 'nl_NL' => 'Holandês', 'no' => 'Não', @@ -1110,6 +1113,7 @@ URL: [url]', 'revision_status' => 'Estado', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revisores', 'revisor_already_assigned' => 'O usuário já está designado como revisor.', 'revisor_already_removed' => 'Revisor já foi removido do processo de revisão ou já revisou o documento.', @@ -1467,6 +1471,8 @@ Nome: [username] 'settings_maxUploadSize' => 'Tamanho máximo para arquivos enviados.', 'settings_maxUploadSize_desc' => 'Esse é o tamanho máximo dos arquivos enviados. Ele terá efeito para versões de documentos e anexos.', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', @@ -1632,6 +1638,7 @@ Nome: [username] 'splash_edit_group' => 'Grupo salvo', 'splash_edit_role' => 'Papel salvo', 'splash_edit_task' => 'Tarefa salva', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Usuário salvo', 'splash_error_add_to_transmittal' => 'Erro ao adicionar documento à transmissão', 'splash_error_rm_download_link' => 'Erro ao remover o link de download', @@ -1853,6 +1860,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Com esta operação, você pode criar um arquivo contendo as informações de versão de uma pasta DMS inteira. Após a criação, todos os arquivos serão salvos dentro da pasta do documento.', 'versioning_info' => 'Informação de versionamento', 'versiontolow' => 'Versão para baixo', +'version_comment' => '', 'version_deleted_email' => 'Versão eliminado', 'version_deleted_email_body' => 'Versão apagada Documento: [name] diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index e0726d0ef..2651de592 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1092), balan (87) +// Translators: Admin (1094), balan (87) $text = array( '2_factor_auth' => '', @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => 'Editează folder', 'edit_group' => 'Editează grup', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Editeaza proprietatile de transmitere', 'edit_user' => 'Editează utilizator', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Membrii grupului', 'group_receipt_summary' => '', 'group_review_summary' => 'Sumar revizuiri grup', +'group_revision_summary' => '', 'guest_login' => 'Login ca oaspete', 'guest_login_disabled' => 'Logarea ca oaspete este dezactivată.', 'hash' => '', @@ -641,7 +643,7 @@ URL: [url]', 'index_folder' => 'Index folder', 'index_no_content' => '', 'index_pending' => '', -'index_waiting' => '', +'index_waiting' => 'Așteptare', 'individuals' => 'Individuals', 'individuals_in_groups' => '', 'info_recipients_tab_not_released' => '', @@ -816,6 +818,7 @@ Utilizator: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Folder nou', 'new_user_image' => 'Imagine nouă', +'next_revision_abbr' => '', 'next_state' => 'Stare nouă', 'nl_NL' => 'Olandeză', 'no' => 'Nu', @@ -1070,6 +1073,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revizuitori', 'revisor_already_assigned' => 'Utilizatorul este deja asignat ca retrimitor.', 'revisor_already_removed' => 'Retrimitorul a fost deja eliminat din procesul de revizuire sau a revizuit deja documentul.', @@ -1422,6 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nu a fost găsit', 'settings_Notification' => 'Setările de notificare', 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.', @@ -1587,6 +1593,7 @@ URL: [url]', 'splash_edit_group' => 'Grup salvat', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Utilizator salvat', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1723,7 +1730,7 @@ URL: [url]', 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere', 'transfer_content' => '', 'transfer_document' => 'Transfer document', -'transfer_no_read_access' => '', +'transfer_no_read_access' => 'Utilizatorul nu are acces de citire pentru acest folder', 'transfer_no_write_access' => 'Utilizatorul nu are drepturi de scriere pe acest dosar', 'transfer_objects' => '', 'transfer_objects_to_user' => '', @@ -1808,6 +1815,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Cu această operațiune puteți crea un fișier care conține informațiile versiunilor pentru un întreg folder DMS. După creare, fiecare fisier va fi salvat in folder-ul de documente.', 'versioning_info' => 'Informații versionare', 'versiontolow' => 'Versiunea e prea mică(veche)', +'version_comment' => '', 'version_deleted_email' => 'Versiune ștearsă', 'version_deleted_email_body' => 'Versiune ștearsă Document: [name] diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 25e863e17..ec0a04b9f 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => 'Изменить свойства', 'edit_group' => 'Изменить группу', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Редактировать группы получателей', 'edit_user' => 'Редактировать пользователя', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Члены группы', 'group_receipt_summary' => 'Обзор подтверждений получения группой', 'group_review_summary' => 'Сводка по рецензированию группы', +'group_revision_summary' => '', 'guest_login' => 'Войти как гость', 'guest_login_disabled' => 'Гостевой вход отключён', 'hash' => '', @@ -815,6 +817,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]: новый каталог «[name]»', 'new_user_image' => 'Новое изображение', +'next_revision_abbr' => '', 'next_state' => 'Новое состояние', 'nl_NL' => 'Dutch', 'no' => 'Нет', @@ -1077,6 +1080,7 @@ URL: [url]', 'revision_status' => 'Состояние ревизии', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Ревизор', 'revisor_already_assigned' => 'Пользователь уже назначен как ревизор', 'revisor_already_removed' => 'Ревизор уже удален из процесса ревизии, либо уже рассмотрел документ', @@ -1429,6 +1433,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Максимальный размер загружаемых файлов', 'settings_maxUploadSize_desc' => 'Это максимальный размер загружаемых файлов. Он повлияет на версии документов и вложения.', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.', @@ -1594,6 +1600,7 @@ URL: [url]', 'splash_edit_group' => 'Группа сохранена', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Пользователь сохранён', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1815,6 +1822,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Эта операция создаст файлы версий для всего каталога. После создания файлы версий будут сохранены в каталоге документов.', 'versioning_info' => 'Информация о версиях', 'versiontolow' => 'Версия слишком старая', +'version_comment' => '', 'version_deleted_email' => 'Версия удалена', 'version_deleted_email_body' => 'Версия удалена Документ: [name] diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 2a1376986..6b5a76835 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1226), destinqo (19), pS2017 (508), ssebech (4) +// Translators: Admin (1226), destinqo (26), pS2017 (508), ssebech (4) $text = array( '2_factor_auth' => '2-faktorové overovanie', @@ -201,7 +201,7 @@ URL: [url]', 'at_least_n_users_of_group' => 'At least [number_of_users] users of [group]', 'august' => 'August', 'authentication' => 'Autentizácia', -'authentication_failed' => '', +'authentication_failed' => 'Overenie zlyhalo', 'author' => 'Autor', 'automatic_status_update' => 'Automaticka zmena stavu', 'back' => 'Prejsť späť', @@ -485,6 +485,7 @@ Odkaz je platný do [valid]. 'edit_folder_props' => 'Upraviť zložku', 'edit_group' => 'Upraviť skupinu', 'edit_online' => 'Upraviť online', +'edit_online_warning' => '', 'edit_task' => 'Upraviť úlohu', 'edit_transmittal_props' => 'Edit transmittal properties', 'edit_user' => 'Upraviť používateľa', @@ -506,7 +507,7 @@ Odkaz je platný do [valid]. 'error_add_aro' => 'Error while adding access request object', 'error_add_permission' => 'Error while add permission', 'error_cleared_cache' => 'Chyba pri vymazaní vyrovnávacej pamäte', -'error_edit_task' => '', +'error_edit_task' => 'Chyba pri ukladaní úlohy', 'error_extension_getlist' => 'Error getting extension list from repository', 'error_importfs' => 'Chyba pri importe zo súborového systému', 'error_no_document_selected' => 'Nie je vybratý žiadny dokument', @@ -515,7 +516,7 @@ Odkaz je platný do [valid]. 'error_remove_document' => 'Pri odstraňovaní dokumentu sa vyskytla chyba', 'error_remove_folder' => 'Pri odstraňovaní zložky sa vyskytla chyba', 'error_remove_permission' => 'Chyba pri odstránení povolenia', -'error_rm_workflow' => '', +'error_rm_workflow' => 'Nastala chyba pri odstránovaní workflow', 'error_rm_workflow_action' => '', 'error_rm_workflow_state' => '', 'error_toogle_permission' => 'Chyba pri zmene povolenia', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Členovia skupiny', 'group_receipt_summary' => 'Group receipt summary', 'group_review_summary' => 'Zhrnutie skupinovej recenzie', +'group_revision_summary' => '', 'guest_login' => 'Prihlásiť sa ako hosť', 'guest_login_disabled' => 'Prihlásenie ako hosť je vypnuté.', 'hash' => 'Hash', @@ -763,7 +765,7 @@ URL: [url]', 'login_error_title' => 'Chyba pri prihlasovaní', 'login_not_given' => 'Nebolo zadané používateľské meno', 'login_ok' => 'Prihlásenie prebehlo úspešne', -'login_restrictions_apply' => '', +'login_restrictions_apply' => 'Nepodarilo sa prihlásiť, kvôli obmedzeniam', 'logout' => 'Odhlásenie', 'log_management' => 'Správa protokolov', 'lo_LA' => 'Laoský', @@ -782,7 +784,7 @@ URL: [url]', 'max_upload_size' => 'Maximálna veľkosť každého súboru', 'may' => 'Máj', 'menu_dropfolder' => 'Drop zložka', -'menu_upload_from_dropfolder' => '', +'menu_upload_from_dropfolder' => 'Naimportovať zo súboru', 'mimetype' => 'Mime typ', 'minutes' => 'minúty', 'misc' => 'Rôzne', @@ -842,6 +844,7 @@ Používateľ: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nová zložka', 'new_user_image' => 'Nový obrázok', +'next_revision_abbr' => '', 'next_state' => 'Nový stav', 'nl_NL' => 'Holandština', 'no' => 'Nie', @@ -989,7 +992,7 @@ URL: [url]', 'receipt_status' => 'Stav', 'receipt_summary' => 'Receipt summary', 'receipt_update_failed' => 'Acknowledging reception failed', -'recent_uploads' => '', +'recent_uploads' => 'Naposledy nahrané súbory', 'reception' => 'Reception', 'reception_acknowleged' => 'Reception acknowledged', 'reception_noaction' => 'Žiadna akcia', @@ -1112,6 +1115,7 @@ URL: [url]', 'revision_status' => 'Stav', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revisors', 'revisor_already_assigned' => 'User is already assigned as an revisor.', 'revisor_already_removed' => 'Revisor has already been removed from revision process or has already revised the document.', @@ -1244,7 +1248,7 @@ Meno: [username] 'settings_Advanced' => 'Rozšírené', 'settings_advancedAcl' => 'Advanced Access control', 'settings_advancedAcl_desc' => 'Advanced access controll will allow to turn on/off certain modules of the software. It can not be used for access rights on documents and folders.', -'settings_allowChangeRevAppInProcess' => '', +'settings_allowChangeRevAppInProcess' => 'Povoliť zmenu schvaľovateľa, ak už bol proces začatý', 'settings_allowChangeRevAppInProcess_desc' => '', 'settings_allowReviewerOnly' => 'Allow to set reviewer only', 'settings_allowReviewerOnly_desc' => 'Enable this, if it shall be allow to set just a reviewer but no approver in traditional workflow mode.', @@ -1469,6 +1473,8 @@ Meno: [username] 'settings_maxUploadSize' => 'Maximálna veľkosť pre nahrávané súbory', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nenájdené', 'settings_Notification' => 'Nastavenia notifikácií', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', @@ -1634,6 +1640,7 @@ Meno: [username] 'splash_edit_group' => 'Skupina bola uložená', 'splash_edit_role' => 'Rola bola uložená', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Používateľ bol uložený', 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal', 'splash_error_rm_download_link' => 'Error when removing download link', @@ -1855,6 +1862,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Touto operáciou môžete vytvoriť súbor pre každý dokument, obsahujúci verziovaciu informáciu toho dokumentu. Po vytvorení bude každý súbor uložený do zložky dokumentu. Those files are not needed for the regular operation of the dms, but could be of value if the complete repository shall be transferred to an other system.', 'versioning_info' => 'Informácie o verziách', 'versiontolow' => 'Verzia je nízka', +'version_comment' => '', 'version_deleted_email' => 'Verzia zmazana', 'version_deleted_email_body' => 'Verzia bola zmazaná Dokument: [name] diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index e829ce792..7c962fdc9 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -479,6 +479,7 @@ Länken är giltig t o m [valid]. 'edit_folder_props' => 'Ändra katalog', 'edit_group' => 'Ändra grupp', 'edit_online' => 'Uppdatera online', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Ändra egenskaper för meddelande', 'edit_user' => 'Ändra användare', @@ -626,6 +627,7 @@ URL: [url]', 'group_members' => 'Gruppmedlemmar', 'group_receipt_summary' => 'Sammanfattning av mottagningsbevis för grupp', 'group_review_summary' => 'Sammanfattning av gruppgranskning', +'group_revision_summary' => '', 'guest_login' => 'Gästinloggning', 'guest_login_disabled' => 'Gästinloggningen är inaktiverad.', 'hash' => 'Hash', @@ -829,6 +831,7 @@ Användare: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Ny katalog', 'new_user_image' => 'Ny användarbild', +'next_revision_abbr' => '', 'next_state' => 'Ny status', 'nl_NL' => 'Holländska', 'no' => 'Nej', @@ -1085,6 +1088,7 @@ URL: [url]', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Reviderare', 'revisor_already_assigned' => 'Användaren innehar redan rollen som reviderare', 'revisor_already_removed' => 'Dokumentet är redan reviderat alternativt användaren tillhör inte längre gruppen reviderare.', @@ -1442,6 +1446,8 @@ Kommentar: [comment]', 'settings_maxUploadSize' => 'Max storlek (bytes) för uppladdadning av fil', 'settings_maxUploadSize_desc' => 'Detta är den maximala storleken för uppladdning av filer. Begränsningen anges i bytes (1 GB = ca 1 000 000 000 bytes)', 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Hittades inte', 'settings_Notification' => 'Meddelandeinställningar', 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.', @@ -1607,6 +1613,7 @@ Kommentar: [comment]', 'splash_edit_group' => 'Grupp sparad', 'splash_edit_role' => 'Roll sparad', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Användare sparad', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => 'Fel vid borttagande av nedladdningslänk', @@ -1828,6 +1835,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Med denna funktion kan du skapa en fil som innehåller versionsinformationen för hela DMS-mappen. Efter skapandet kommer alla filer att sparas inom dokumentets mapp.', 'versioning_info' => 'Versionsinformation', 'versiontolow' => 'Version för låg', +'version_comment' => '', 'version_deleted_email' => 'Version borttagen', 'version_deleted_email_body' => 'Version borttagen Dokument: [name] diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index da7ae9c06..ec23b635a 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -460,6 +460,7 @@ URL: [url]', 'edit_folder_props' => 'Klasörü düzenle', 'edit_group' => 'Grubu düzenle', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Kullanıcıyı düzenle', @@ -607,6 +608,7 @@ URL: [url]', 'group_members' => 'Grup üyeleri', 'group_receipt_summary' => '', 'group_review_summary' => 'Grup gözden geçirme özeti', +'group_revision_summary' => '', 'guest_login' => 'Misafir olarak giriş yap', 'guest_login_disabled' => 'Misafir girişi devre dışı.', 'hash' => '', @@ -810,6 +812,7 @@ Kullanıcı: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Yeni klasör', 'new_user_image' => 'Yeni resim', +'next_revision_abbr' => '', 'next_state' => 'Yeni durum', 'nl_NL' => 'Hollandaca', 'no' => 'Hayır', @@ -1049,6 +1052,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1401,6 +1405,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Bulunamadı', 'settings_Notification' => 'Bildirim ayarları', 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.', @@ -1566,6 +1572,7 @@ URL: [url]', 'splash_edit_group' => 'Grup kaydedildi', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Kullanıcı kaydedildi', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1787,6 +1794,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Bu işlem ile tüm klasörlerdeki versiyon bilgisinin bulunduğu bir dosya oluşturursunuz. Her dosya oluşturulduğunda doküman klasörüne kaydedilir.', 'versioning_info' => 'Version bilgisi', 'versiontolow' => 'Versiyon düşük', +'version_comment' => '', 'version_deleted_email' => 'Versiyon silindi', 'version_deleted_email_body' => 'Versiyon silindi Doküman: [name] diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index a7463efb5..1e53e7a9b 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => 'Змінити каталог', 'edit_group' => 'Змінити групу', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Редагувати налаштування перенесення', 'edit_user' => 'Редагувати користувача', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Члени групи', 'group_receipt_summary' => 'Підсумки отримання групи', 'group_review_summary' => 'Підсумки рецензування групи', +'group_revision_summary' => '', 'guest_login' => 'Увійти як гість', 'guest_login_disabled' => 'Гостьовий вхід відключено', 'hash' => '', @@ -815,6 +817,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]: новий каталог «[name]»', 'new_user_image' => 'Нове зображення', +'next_revision_abbr' => '', 'next_state' => 'Новий стан', 'nl_NL' => 'Dutch', 'no' => 'Ні', @@ -1070,6 +1073,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Ревізори', 'revisor_already_assigned' => 'Ревізор вже призначений', 'revisor_already_removed' => 'Ревізора вже видалено', @@ -1422,6 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Не знайдено', 'settings_Notification' => 'Налаштування сповіщення', 'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.', @@ -1587,6 +1593,7 @@ URL: [url]', 'splash_edit_group' => 'Групу збережено', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Користувача збережено', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1808,6 +1815,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Ця операція створить файли версій для всього каталогу. Після створення файли версій будуть збережені в каталозі документів.', 'versioning_info' => 'Інформація про версії', 'versiontolow' => 'Версія надто стара', +'version_comment' => '', 'version_deleted_email' => 'Версію видалено', 'version_deleted_email_body' => 'Версію видалено Документ: [name] diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 4bb139c98..38b65440d 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => '编辑文件夹', 'edit_group' => '编辑组别', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => '编辑用户', @@ -609,6 +610,7 @@ URL: [url]', 'group_members' => '组成员', 'group_receipt_summary' => '', 'group_review_summary' => '校对组汇总', +'group_revision_summary' => '', 'guest_login' => '来宾登录', 'guest_login_disabled' => '来宾登录被禁止', 'hash' => '哈希', @@ -812,6 +814,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - 新建文件夹', 'new_user_image' => '新建图片', +'next_revision_abbr' => '', 'next_state' => '新建状态', 'nl_NL' => '荷兰语', 'no' => '否', @@ -1052,6 +1055,7 @@ URL: [url]', 'revision_status' => '修订状态', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '修订人', 'revisor_already_assigned' => '用户已被分配为修订人', 'revisor_already_removed' => '修订人已经从修订过程中删除，或者已经修改了文档。', @@ -1403,6 +1407,8 @@ URL: [url]', 'settings_maxUploadSize' => '上传文件尺寸上限', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '更多设置。默认登陆账户： admin / admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '未找到', 'settings_Notification' => '通知设置', 'settings_notwritable' => '设置_不可写', @@ -1568,6 +1574,7 @@ URL: [url]', 'splash_edit_group' => '组已保存', 'splash_edit_role' => '角色已保存', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '用户信息已保存', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '移除下载链接时报错', @@ -1780,6 +1787,7 @@ URL: [url]', 'versioning_file_creation_warning' => '通过此操作，您可以一个包含整个DMS文件夹的版本信息文件. 版本文件一经创建，每个文件都将保存到文件夹中.', 'versioning_info' => '版本信息', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => '版本已被删除', 'version_deleted_email_body' => '版本已删除 文档: [name] diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 576fcd0b2..22f75800c 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2418) +// Translators: Admin (2421) $text = array( '2_factor_auth' => '', @@ -252,7 +252,7 @@ URL: [url]', 'comment' => '說明', 'comment_changed_email' => '', 'comment_for_current_version' => '版本說明', -'configure_extension' => '', +'configure_extension' => '配置擴充套件', 'confirm_clear_cache' => '', 'confirm_create_fulltext_index' => '確認已新增之全文索引', 'confirm_move_document' => '', @@ -411,6 +411,7 @@ URL: [url]', 'edit_folder_props' => '編輯資料夾', 'edit_group' => '編輯組別', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => '編輯用戶', @@ -472,7 +473,7 @@ URL: [url]', 'export' => '', 'extension_archive' => '', 'extension_changelog' => '修改紀錄', -'extension_loading' => '', +'extension_loading' => '擴充套件讀取中', 'extension_manager' => '整體索引進度', 'extension_mgr_installed' => '已安裝', 'extension_mgr_no_upload' => '無法上傳新的套件因為套件目錄無法寫入', @@ -534,6 +535,7 @@ URL: [url]', 'group_members' => '組成員', 'group_receipt_summary' => '', 'group_review_summary' => '校對組匯總', +'group_revision_summary' => '', 'guest_login' => '來賓登錄', 'guest_login_disabled' => '來賓登錄被禁止', 'hash' => '', @@ -661,7 +663,7 @@ URL: [url]', 'login_restrictions_apply' => '', 'logout' => '登出', 'log_management' => '日誌管理', -'lo_LA' => '', +'lo_LA' => '位置', 'malformed_expiration_date' => '', 'manager' => '管理員', 'manager_of_group' => '', @@ -721,6 +723,7 @@ URL: [url]', 'new_subfolder_email_body' => '', 'new_subfolder_email_subject' => '', 'new_user_image' => '新建圖片', +'next_revision_abbr' => '', 'next_state' => '', 'nl_NL' => '荷蘭語', 'no' => '否', @@ -913,6 +916,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1252,6 +1256,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '通知設置', 'settings_notwritable' => '', @@ -1417,6 +1423,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1629,6 +1636,7 @@ URL: [url]', 'versioning_file_creation_warning' => '通過此操作，您可以一個包含整個DMS資料夾的版本資訊檔. 版本檔一經創建，每個檔都將保存到資料夾中.', 'versioning_info' => '版本資訊', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => '版本已被刪除', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', From ed83d95e6da45d8cbcf0b5f44225c0e9703c5edb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 09:44:18 +0100 Subject: [PATCH 320/467] minor change of two keys --- languages/ar_EG/lang.inc | 4 ++-- languages/bg_BG/lang.inc | 4 ++-- languages/ca_ES/lang.inc | 4 ++-- languages/cs_CZ/lang.inc | 4 ++-- languages/de_DE/lang.inc | 4 ++-- languages/el_GR/lang.inc | 4 ++-- languages/en_GB/lang.inc | 4 ++-- languages/es_ES/lang.inc | 4 ++-- languages/fr_FR/lang.inc | 4 ++-- languages/hr_HR/lang.inc | 4 ++-- languages/hu_HU/lang.inc | 4 ++-- languages/it_IT/lang.inc | 4 ++-- languages/ko_KR/lang.inc | 4 ++-- languages/lo_LA/lang.inc | 4 ++-- languages/nl_NL/lang.inc | 4 ++-- languages/pl_PL/lang.inc | 4 ++-- languages/pt_BR/lang.inc | 4 ++-- languages/ro_RO/lang.inc | 4 ++-- languages/ru_RU/lang.inc | 4 ++-- languages/sk_SK/lang.inc | 4 ++-- languages/sv_SE/lang.inc | 4 ++-- languages/tr_TR/lang.inc | 4 ++-- languages/uk_UA/lang.inc | 4 ++-- languages/zh_CN/lang.inc | 4 ++-- languages/zh_TW/lang.inc | 4 ++-- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index f5d76fb4b..f9f241f31 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1389,8 +1389,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 5e6d58808..108636bd8 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -1252,8 +1252,8 @@ $text = array( 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Не е намерено', 'settings_Notification' => 'Настройка за известяване', 'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 6ade3b629..261339bad 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -1257,8 +1257,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 93cbd0d66..c22ed3ba1 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1468,8 +1468,8 @@ Jméno: [username] 'settings_maxUploadSize' => 'Maximální velikost nahraných souborů', 'settings_maxUploadSize_desc' => 'Toto je maximální velikost nahraných souborů. Bude mít vliv na verze dokumentů a přílohy.', 'settings_more_settings' => 'Konfigurovat další nastavení. Výchozí přihlášení: admin / admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nenalezeno', 'settings_Notification' => 'Nastavení upozornění', 'settings_notwritable' => 'Konfigurace nemůže být uložena, protože se do konfiguračního souboru nedá zapsat.', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ab04466e2..ebf627712 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -1478,8 +1478,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale Größe hochzuladener Dateien', 'settings_maxUploadSize_desc' => 'Dies ist die maximale Größe einer hochzuladenen Datei. Es begrenzt sowohl Dokumentenversionen als auch Anhänge.', 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin', -'settings_noFormFields' => 'Diese Felder nicht zeigen', -'settings_noFormFields_desc' => 'Diese Felder werden bei der Neuanlage und beim Bearbeiten eines Dokuments nicht angezeigt. Bestehende Werte werden beibehalten.', +'settings_noDocumentFormFields' => 'Diese Felder nicht zeigen', +'settings_noDocumentFormFields_desc' => 'Diese Felder werden bei der Neuanlage und beim Bearbeiten eines Dokuments nicht angezeigt. Bestehende Werte werden beibehalten.', 'settings_notfound' => 'Nicht gefunden', 'settings_Notification' => 'Benachrichtigungen-Einstellungen', 'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 04bdd53e8..f29395c96 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -1263,8 +1263,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index c720e74f2..d288ca3b4 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -1473,8 +1473,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maxium size for uploaded files', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', -'settings_noFormFields' => 'Do not show this fields', -'settings_noFormFields_desc' => 'This fields will not been show when adding or edition a document. Existing values will be kept.', +'settings_noDocumentFormFields' => 'Do not show this fields', +'settings_noDocumentFormFields_desc' => 'This fields will not been show when adding or edition a document. Existing values will be kept.', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 362cdd090..95a8113ed 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -1404,8 +1404,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Tamaño máximo de subida archivos', 'settings_maxUploadSize_desc' => 'Tamaño máximo de archivos a cargar. Se tomará en cuenta para versiones de documentos y anexos de correo electrónico', 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'No encontrado', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 7689bf37d..151063a97 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -1457,8 +1457,8 @@ Nom : [username] 'settings_maxUploadSize' => 'Taille max. des fichiers', 'settings_maxUploadSize_desc' => 'Taille maximale (en octets) pour les fichiers téléversés. Concerne les versions d’un document et les fichiers attachés.', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 87535ebb7..e9d99399d 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1425,8 +1425,8 @@ Internet poveznica: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nije pronađeno', 'settings_Notification' => 'Postavke bilježenja', 'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index de3034b48..3548c9f9c 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -1403,8 +1403,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nem található', 'settings_Notification' => 'Értesítés beállításai', 'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 89127ad1d..9e8715e6f 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1459,8 +1459,8 @@ Name: [username] 'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare', 'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index bc7c0dc49..ede9add6d 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1419,8 +1419,8 @@ URL : [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '찾을 수 없음', 'settings_Notification' => '알림 설정', 'settings_notwritable' => '구성값을 저장할 수 없습니다 구성 파일에 쓰기 권한이 없습니다.', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index f244c1de9..0d0a86ca5 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -1452,8 +1452,8 @@ URL: [url]', 'settings_maxUploadSize' => 'ขนาดสูงสุดสำหรับไฟล์ที่อัปโหลด.', 'settings_maxUploadSize_desc' => 'ນີ້ຄືຂະໜາດສູງສຸດສຳລັບໄຟລທີອັບໂຫລດ ຈະມີຜົນຕໍ່ເວີຊັນເອກະສານແລະ ເອກະສານແນບ', 'settings_more_settings' => 'กำหนดค่าการตั้งค่าเพิ่มเติม ค่าเริ่มต้นการเข้าสู่ระบบ: ผู้ดูแลระบบ / ผู้ดูแลระบบ.', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'ເຂົ້າລະບົບ', 'settings_Notification' => 'ການຕັ້ງຄ່າການແຈ້ງເຕືອນ', 'settings_notwritable' => 'ການກຳນົດຄ່າທີ່ບໍ່ສາມາດບັນທືກໄດ້ຍ້ອນວ່າໄຟລກຳນົດຄ່າບໍ່ສາມາດຂຽນໄດ້', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 884849f29..8b42c8adf 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1449,8 +1449,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale omvang voor uploaden', 'settings_maxUploadSize_desc' => 'Dit is de maximale omvang voor te uploaden bestanden. Dat geldt voor bestanden en bijlagen.', 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Niet gevonden', 'settings_Notification' => 'Notificatie instellingen', 'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 89ab5e925..e9f01958a 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1383,8 +1383,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Maksymalny rozmiar wysyłanych plików', 'settings_maxUploadSize_desc' => 'To jest maksymalny rozmiar dla nadesłanych plików. To ustawienie wpływa również na wersje dokumentu i załączniki.', 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nie znaleziono', 'settings_Notification' => 'Ustawienia powiadomień', 'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 1ddfc6a75..9e264c39f 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -1471,8 +1471,8 @@ Nome: [username] 'settings_maxUploadSize' => 'Tamanho máximo para arquivos enviados.', 'settings_maxUploadSize_desc' => 'Esse é o tamanho máximo dos arquivos enviados. Ele terá efeito para versões de documentos e anexos.', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 2651de592..f074695a5 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1426,8 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nu a fost găsit', 'settings_Notification' => 'Setările de notificare', 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index ec0a04b9f..f8ea3b82c 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -1433,8 +1433,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Максимальный размер загружаемых файлов', 'settings_maxUploadSize_desc' => 'Это максимальный размер загружаемых файлов. Он повлияет на версии документов и вложения.', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 6b5a76835..d85348683 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -1473,8 +1473,8 @@ Meno: [username] 'settings_maxUploadSize' => 'Maximálna veľkosť pre nahrávané súbory', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nenájdené', 'settings_Notification' => 'Nastavenia notifikácií', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 7c962fdc9..9bb89509a 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1446,8 +1446,8 @@ Kommentar: [comment]', 'settings_maxUploadSize' => 'Max storlek (bytes) för uppladdadning av fil', 'settings_maxUploadSize_desc' => 'Detta är den maximala storleken för uppladdning av filer. Begränsningen anges i bytes (1 GB = ca 1 000 000 000 bytes)', 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Hittades inte', 'settings_Notification' => 'Meddelandeinställningar', 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index ec23b635a..290652111 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1405,8 +1405,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Bulunamadı', 'settings_Notification' => 'Bildirim ayarları', 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 1e53e7a9b..6358e0149 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -1426,8 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Не знайдено', 'settings_Notification' => 'Налаштування сповіщення', 'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 38b65440d..dfb71351d 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -1407,8 +1407,8 @@ URL: [url]', 'settings_maxUploadSize' => '上传文件尺寸上限', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '更多设置。默认登陆账户： admin / admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '未找到', 'settings_Notification' => '通知设置', 'settings_notwritable' => '设置_不可写', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 22f75800c..02d6819c4 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -1256,8 +1256,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '通知設置', 'settings_notwritable' => '', From c9aaa689252565b5fe26acdac47c33523311a156 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 10:03:24 +0100 Subject: [PATCH 321/467] preset value for sequence if sequenc cannot be edited --- views/bootstrap/class.AddDocument.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index b97e45d08..62f7b1b21 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -239,6 +239,22 @@ $(document).ready(function() { } if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) { $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "
          ".getMLText('order_by_sequence_off') : '')); + } else { + $minmax = $folder->getDocumentsMinMax(); + if($this->params['defaultposition'] == 'start') { + $seq = $minmax['min'] - 1; + } else { + $seq = $minmax['max'] + 1; + } + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'sequence', + 'value'=>$seq, + ) + ); } if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { if($presetexpiration) { From 1f8c5fe7c3532154033375f5f892f4cfa09cfaa3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 16:08:10 +0100 Subject: [PATCH 322/467] workflows can be turned off completely --- CHANGELOG | 3 +++ out/out.UpdateDocument.php | 1 + views/bootstrap/class.AddDocument.php | 4 +++- views/bootstrap/class.Search.php | 2 +- views/bootstrap/class.Settings.php | 2 +- views/bootstrap/class.UpdateDocument.php | 5 +++++ views/bootstrap/class.UsrMgr.php | 2 +- views/bootstrap/class.ViewDocument.php | 8 ++++---- views/bootstrap/class.ViewFolder.php | 1 - 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 91805b81b..a0fda89eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,9 @@ - new hooks leftContentPre and leftContentPost - minimize sql queries when fetching sub folders and documents of a folder - custom attributes can be validated in a hook +- document attributes comment, keywords, categories, expiration date, and sequence + can be turned of in the configuration +- workflows can be turned off completely -------------------------------------------------------------------------------- Changes in version 5.1.13 diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php index 796c8852f..083103d65 100644 --- a/out/out.UpdateDocument.php +++ b/out/out.UpdateDocument.php @@ -69,6 +69,7 @@ if($view) { $view->setParam('folder', $folder); $view->setParam('document', $document); $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('nodocumentformfields', $settings->_noDocumentFormFields); $view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload); $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); $view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 62f7b1b21..36ccdf1e6 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -345,6 +345,7 @@ $(document).ready(function() { $this->getDropFolderChooserHtml("form1", $dropfolderfile) ); } + if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) { $this->formField( getMLText("comment_for_current_version"), array( @@ -363,6 +364,7 @@ $(document).ready(function() { 'value'=>1 ) ); + } $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all)); if($attrdefs) { foreach($attrdefs as $attrdef) { @@ -429,7 +431,7 @@ $(document).ready(function() { ); } $this->warningMsg(getMLText("add_doc_workflow_warning")); - } else { + } elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { if($workflowmode == 'traditional') { $this->contentSubHeading(getMLText("assign_reviewers")); diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index f7d5ade23..f4d49f049 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -277,7 +277,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { - + diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 9ca469a16..6d43adc72 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -421,7 +421,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); -- SETTINGS - ADVANCED - EDITION --> showConfigHeadline('settings_Edition'); ?> -showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced'), false, true); ?> +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); ?> showConfigText('settings_versioningFileName', 'versioningFileName'); ?> showConfigText('settings_presetExpirationDate', 'presetExpirationDate'); ?> showConfigCheckbox('settings_allowReviewerOnly', 'allowReviewerOnly'); ?> diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php index a75e27de6..12ce32cb6 100644 --- a/views/bootstrap/class.UpdateDocument.php +++ b/views/bootstrap/class.UpdateDocument.php @@ -142,6 +142,7 @@ console.log(element); $folder = $this->params['folder']; $document = $this->params['document']; $strictformcheck = $this->params['strictformcheck']; + $nodocumentformfields = $this->params['nodocumentformfields']; $enablelargefileupload = $this->params['enablelargefileupload']; $maxuploadsize = $this->params['maxuploadsize']; $enableadminrevapp = $this->params['enableadminrevapp']; @@ -230,6 +231,7 @@ console.log(element); $this->getDropFolderChooserHtml("form1") ); } + if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) { $this->formField( getMLText("comment"), array( @@ -239,6 +241,8 @@ console.log(element); 'cols'=>80 ) ); + } + if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { if($presetexpiration) { if(!($expts = strtotime($presetexpiration))) $expts = false; @@ -265,6 +269,7 @@ console.log(element); getMLText("expires"), $this->getDateChooser(($expts ? date('Y-m-d', $expts) : ''), "expdate", $this->params['session']->getLanguage()) ); + } $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all)); if($attrdefs) { foreach($attrdefs as $attrdef) { diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index 64a3a5d62..60bb7c63c 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -483,7 +483,7 @@ $(document).ready( function() { 'options'=>$options ) ); - } else { + } elseif($workflowmode == 'advanced') { $workflows = $dms->getAllWorkflows(); if($workflows) { $this->contentSubHeading(getMLText("workflow")); diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index c77a156ea..e5fa08219 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -486,7 +486,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $needwkflaction = false; if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { - } else { + } elseif($workflowmode == 'advanced') { $workflow = $latestContent->getWorkflow(); if($workflow) { $workflowstate = $latestContent->getWorkflowState(); @@ -528,7 +528,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
          • @@ -670,7 +670,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($accessop->maySetReviewersApprovers()) { print "
        • ".getMLText("change_assignments")."
          • "; } - } else { + } elseif($workflowmode == 'advanced') { if($accessop->maySetWorkflow()) { if(!$workflow) { print "
        • ".getMLText("set_workflow")."
          • "; @@ -961,7 +961,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
          params['expandFolderTree']; $showtree = $this->params['showtree']; $cachedir = $this->params['cachedir']; - $workflowmode = $this->params['workflowmode']; $enableRecursiveCount = $this->params['enableRecursiveCount']; $maxRecursiveCount = $this->params['maxRecursiveCount']; $maxItemsPerPage = $this->params['maxItemsPerPage']; From 849351e58bef68f1782f388ae8d705f761b9d76d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 10:53:09 +0100 Subject: [PATCH 323/467] add js for updateDropFolder only if drop folder list is enabled --- views/bootstrap/class.Bootstrap.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 7ac878713..cc3b53689 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -166,6 +166,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo ''."\n"; if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) { $this->addFooterJS('checkTasks();'); + } + if($this->params['enabledropfolderlist'] && isset($this->params['user']) && $this->params['user']) { $this->addFooterJS('updateDropFolder();'); } if($this->footerjs) { From 16ca3dc96ae3d7f238db83b99946e28ad3d66148 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 10:54:42 +0100 Subject: [PATCH 324/467] init $tasks to empty array --- views/bootstrap/class.Tasks.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php index 8146e9beb..7b1bcfe48 100644 --- a/views/bootstrap/class.Tasks.php +++ b/views/bootstrap/class.Tasks.php @@ -40,6 +40,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $workflowmode = $this->params['workflowmode']; + $tasks = array(); if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { $tasks['approval'] = array(); if($workflowmode == 'traditional') From 3f14dcf4dbb4131785ebb4e356d7487e694bbe6e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 14:17:00 +0100 Subject: [PATCH 325/467] get settings from view --- views/bootstrap/class.ExtensionMgr.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 18f607109..2357b6d25 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -135,6 +135,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $settings = $this->params['settings']; $httproot = $this->params['httproot']; $extdir = $this->params['extdir']; $version = $this->params['version']; From d5a937fbc865e9695cddff2102823bcf3f8746d7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 14:17:48 +0100 Subject: [PATCH 326/467] minor modification of folder tree --- views/bootstrap/class.Bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index cc3b53689..1bed85442 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1621,7 +1621,7 @@ $(document).ready(function() { $subfolders = array($pathfolder); } foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>(0 && ($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs))) ? true : false, 'is_folder'=>true); if(/*$expandtree>=$level ||*/ $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { @@ -1662,7 +1662,7 @@ $(document).ready(function() { $node['load_on_demand'] = true; $node['children'] = array(); } else { - $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 0 /*$expandtree*/, $orderby, 0); + $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 1 /*$expandtree*/, $orderby, 0); if($showdocs) { $documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode); @@ -1712,7 +1712,7 @@ $(function() { } }); // Unfold node for currently selected folder - $('#jqtree').tree('openNode', $('#jqtree').tree('getNodeById', ), false); + $('#jqtree').tree('selectNode', $('#jqtree').tree('getNodeById', ), false); $('#jqtree').on( 'tree.click', function(event) { From cb9ce2a42fb778404ca0403ea75976ab3874823e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 17:18:08 +0100 Subject: [PATCH 327/467] add methods for enabling/disabling an extension --- inc/inc.ClassSettings.php | 59 +++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 35ed72a4b..e63d0202b 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -418,7 +418,7 @@ class Settings { /* {{{ */ * * @return true/false */ - function load($configFilePath) { /* {{{ */ + public function load($configFilePath) { /* {{{ */ $contents = file_get_contents($configFilePath); if(!$contents) { return false; @@ -714,6 +714,9 @@ class Settings { /* {{{ */ foreach($extensions as $extension) { $tmp = $extension->attributes(); $extname = strval($tmp['name']); + if(isset($tmp['disable'])) + $disabled = strval($tmp['disable']); + $this->_extensions[$extname]['__disable__'] = $disabled=='1' || $disabled == 'true' ? true : false; foreach($extension->children() as $parameter) { $tmp2 = $parameter->attributes(); $this->_extensions[$extname][strval($tmp2['name'])] = strval($parameter); @@ -733,7 +736,7 @@ class Settings { /* {{{ */ * * @return true/false */ - function setXMLAttributValue($node, $attributName, $attributValue) { /* {{{ */ + protected function setXMLAttributValue($node, $attributName, $attributValue) { /* {{{ */ if (is_bool($attributValue)) { if ($attributValue) $attributValue = "true"; @@ -757,7 +760,7 @@ class Settings { /* {{{ */ * * @return SimpleXMLElement */ - function getXMLNode($rootNode, $parentNodeName, $name) { /* {{{ */ + protected function getXMLNode($rootNode, $parentNodeName, $name) { /* {{{ */ $node = $rootNode->xpath($parentNodeName . '/' . $name); if (empty($node)) { @@ -777,7 +780,7 @@ class Settings { /* {{{ */ * * @return true/false */ - function save($configFilePath=NULL) { /* {{{ */ + public function save($configFilePath=NULL) { /* {{{ */ if (is_null($configFilePath)) $configFilePath = $this->_configFilePath; @@ -1050,6 +1053,7 @@ class Settings { /* {{{ */ // search XML node $extnode = $extnodes->addChild('extension'); $this->setXMLAttributValue($extnode, 'name', $name); + $this->setXMLAttributValue($extnode, 'disable', $extension['__disable__'] ? 'true' : 'false'); /* New code saves all parameters of the extension which have been set * in configuration form. */ @@ -1082,7 +1086,7 @@ class Settings { /* {{{ */ * search and return Config File Path * @return NULL|string Config File Path */ - function searchConfigFilePath() { /* {{{ */ + protected function searchConfigFilePath() { /* {{{ */ $configFilePath = null; if($configDir = Settings::getConfigDir()) { @@ -1139,7 +1143,7 @@ class Settings { /* {{{ */ * * @return string */ - function curPageURL() { /* {{{ */ + protected function curPageURL() { /* {{{ */ $pageURL = 'http'; if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") { @@ -1164,7 +1168,7 @@ class Settings { /* {{{ */ * @param string $file name of file to search * @return string path where file was found */ - function findInIncPath($file) { /* {{{ */ + protected function findInIncPath($file) { /* {{{ */ $incarr = explode(PATH_SEPARATOR, ini_get('include_path')); $found = ''; foreach($incarr as $path) { @@ -1180,7 +1184,7 @@ class Settings { /* {{{ */ * * @return array */ - function check($minversion) { /* {{{ */ + public function check($minversion) { /* {{{ */ // suggestion rootdir if (file_exists("../inc/inc.Settings.php")) $rootDir = realpath ("../inc/inc.Settings.php"); @@ -1425,7 +1429,7 @@ class Settings { /* {{{ */ * @return array * */ - function checkSystem() { /* {{{ */ + public function checkSystem() { /* {{{ */ // result $result = array(); @@ -1512,6 +1516,43 @@ class Settings { /* {{{ */ return $result; } /* }}} */ + /** + * Check if extension is disabled + * + * @param string $extname name of extension + * @return true if extension is disabled + */ + public function extensionIsDisabled($extname) { /* {{{ */ + if(array_key_exists($extname, $this->_extensions)) + return $this->_extensions[$extname]['__disable__']; + + return false; + } /* }}} */ + + /** + * Set extension enabled + * + * @param string $extname name of extension + * @return + */ + public function enableExtension($extname) { /* {{{ */ + if(!array_key_exists($extname, $this->_extensions)) + $this->_extensions[$extname] = array(); + $this->_extensions[$extname]['__disable__'] = false; + } /* }}} */ + + /** + * Set extension enabled + * + * @param string $extname name of extension + * @return + */ + public function disableExtension($extname) { /* {{{ */ + if(!array_key_exists($extname, $this->_extensions)) + $this->_extensions[$extname] = array(); + $this->_extensions[$extname]['__disable__'] = true; + } /* }}} */ + } /* }}} */ ?> From b3ffdd3b7d1fd20d7e2078de337b70dbca40be38 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 17:20:15 +0100 Subject: [PATCH 328/467] extension are disabled in the settings the configuration of the extension will no longer work for disabling an extension --- controllers/class.ExtensionMgr.php | 15 +++ inc/inc.ClassUI.php | 6 +- inc/inc.Extension.php | 8 +- op/op.ExtensionMgr.php | 19 ++- views/bootstrap/class.ExtensionMgr.php | 165 +++++++++++++++---------- 5 files changed, 142 insertions(+), 71 deletions(-) diff --git a/controllers/class.ExtensionMgr.php b/controllers/class.ExtensionMgr.php index 9cae083e4..efd4fbd94 100644 --- a/controllers/class.ExtensionMgr.php +++ b/controllers/class.ExtensionMgr.php @@ -78,4 +78,19 @@ class SeedDMS_Controller_ExtensionMgr extends SeedDMS_Controller_Common { return true; } /* }}} */ + public function toggle() { /* {{{ */ + $dms = $this->params['dms']; + $settings = $this->params['settings']; + $extmgr = $this->params['extmgr']; + $extname = $this->params['extname']; + + if($settings->extensionIsDisabled($extname)) + $settings->enableExtension($extname); + else + $settings->disableExtension($extname); + $settings->save(); + + return true; + } /* }}} */ + } diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index d22e1ec07..c671f19b4 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -55,7 +55,8 @@ class UI extends UI_Default { /* Collect all decorators */ $decorators = array(); foreach($EXT_CONF as $extname=>$extconf) { - if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { if(isset($extconf['decorators'][$class])) { $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file']; if(file_exists($filename)) { @@ -71,7 +72,8 @@ class UI extends UI_Default { $filename = ''; $httpbasedir = ''; foreach($EXT_CONF as $extname=>$extconf) { - if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { /* Setting the 'views' element in the configuration can be used to * replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php * without providing an out/out.ViewFolder.php. In that case $httpbasedir diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 5841c8038..8e74c0080 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -22,15 +22,17 @@ $EXT_CONF = $extMgr->getExtensionConfiguration(); $version = new SeedDMS_Version; foreach($EXT_CONF as $extname=>$extconf) { - if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { /* check for requirements */ if(!empty($extconf['constraints']['depends']['seeddms'])) { $t = explode('-', $extconf['constraints']['depends']['seeddms'], 2); if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0)) + continue; $extconf['disable'] = true; } - } - if(!isset($extconf['disable']) || $extconf['disable'] == false) { +// } +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php index 55dcd0177..819c2ece3 100644 --- a/op/op.ExtensionMgr.php +++ b/op/op.ExtensionMgr.php @@ -56,7 +56,7 @@ if ($action == "download") { $controller->setParam('extmgr', $extMgr); $controller->setParam('extname', $extname); if (!$controller($_POST)) { - echo json_encode(array('success'=>false, 'error'=>'Could not download extension')); + echo json_encode(array('success'=>false, 'msg'=>'Could not download extension')); } add_log_line(); } /* }}} */ @@ -125,7 +125,22 @@ elseif ($action == "getlist") { /* {{{ */ } add_log_line(); header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab); +} elseif ($action == "toggle") { /* {{{ */ + if (!isset($_POST["extname"])) { + echo json_encode(array('success'=>false, 'msg'=>'Could not toggle extension')); + } + $extname = trim($_POST["extname"]); + if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) { + UI::exitError(getMLText("admin_tools"),getMLText("missing_extension")); + } + $controller->setParam('extmgr', $extMgr); + $controller->setParam('extname', $extname); + if (!$controller($_POST)) { + echo json_encode(array('success'=>false, 'msg'=>'Could not toggle extension')); + } else { + echo json_encode(array('success'=>true, 'msg'=>'Operation succeded')); + } + add_log_line(); } /* }}} */ -?> diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 2357b6d25..9cc5d5c2b 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -31,7 +31,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { header('Content-Type: application/javascript'); ?> $(document).ready( function() { - $('a.download').click(function(ev){ + $('body').on('click', 'a.download', function(ev){ +// $('a.download').click(function(ev){ var element = $(this); $('#'+element.data('extname')+'-download').submit(); /* @@ -54,6 +55,27 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { }); */ }); + $('body').on('click', 'a.toggle', function(ev){ +// $('a.toggle').click(function(ev){ + var element = $(this); + ev.preventDefault(); + $.ajax({url: '../op/op.ExtensionMgr.php', + type: 'POST', + dataType: "json", + data: {action: 'toggle', 'formtoken': '', 'extname': element.data('extname')}, + success: function(data) { + noty({ + text: data.msg, + type: (data.error) ? 'error' : 'success', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + timeout: 1500, + }); + $('div.ajax').trigger('update'); + } + }); + }); $('a.import').click(function(ev){ var element = $(this); @@ -80,11 +102,11 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { echo "\n"; print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; print "\n"; $list = $extmgr->getExtensionListByName($extname); foreach($list as $re) { @@ -113,7 +135,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { echo ""; echo ""; echo ""; - } + } echo "
          ".getMLText('name')."".getMLText('version')."".getMLText('author')."".getMLText('name')."".getMLText('version')."".getMLText('author')."
          \n"; } /* }}} */ @@ -132,6 +154,69 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { } } /* }}} */ + function installedList() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $settings = $this->params['settings']; + $httproot = $this->params['httproot']; + $extmgr = $this->params['extmgr']; + $extdir = $this->params['extdir']; + + echo "\n"; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + $errmsgs = array(); + foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) { + $errmsgs = array(); + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { + $extmgr->checkExtension($extname); + $errmsgs = $extmgr->getErrorMsgs(); + if($errmsgs) + echo ""; + else + echo ""; + } else { + echo ""; + } + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; + } + echo "
          ".getMLText('name')."".getMLText('version')."".getMLText('author')."
          "; + if($extconf['icon']) + echo "\"".$extname."\""; + echo "".$extconf['title']; + echo "
          ".$extconf['description'].""; + if($errmsgs) + echo "
          getImgPath("attention.gif")."\"> ".implode('
          ', $errmsgs)."
          "; + echo "          		".$extconf['version']; + echo "
          ".$extconf['releasedate'].""; + echo "          		".$extconf['author']['name']."
          ".$extconf['author']['company']."          		"; + echo "
          "; + if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) { + echo "\n"; + } + if($extconf['config']) + echo ""; + echo "
          ".createHiddenFieldWithKey('extensionmgr')."
          "; + if(!$settings->extensionIsDisabled($extname)) { + echo ' '; + } else { + echo ' '; + } + echo "
          "; + echo "
          \n"; + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -142,7 +227,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $extmgr = $this->params['extmgr']; $currenttab = $this->params['currenttab']; $reposurl = $this->params['reposurl']; - + $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); $this->contentStart(); @@ -179,74 +264,26 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
          +
          contentContainerStart(); - echo "\n"; - print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - $errmsgs = array(); - foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) { - $errmsgs = array(); - if(!isset($extconf['disable']) || $extconf['disable'] == false) { - $extmgr->checkExtension($extname); - $errmsgs = $extmgr->getErrorMsgs(); - if($errmsgs) - echo ""; - else - echo ""; - } else - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; - } - echo "
          ".getMLText('name')."".getMLText('version')."".getMLText('author')."
          "; - if($extconf['icon']) - echo "\"".$extname."\""; - echo "".$extconf['title']; - echo "
          ".$extconf['description'].""; - if($errmsgs) - echo "
          getImgPath("attention.gif")."\"> ".implode('
          ', $errmsgs)."
          "; - echo "          		".$extconf['version']; - echo "
          ".$extconf['releasedate'].""; - echo "          		".$extconf['author']['name']."
          ".$extconf['author']['company']."          		"; - echo "
          "; - if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) { - echo "\n"; - } - if($extconf['config']) - echo ""; - echo "
          ".createHiddenFieldWithKey('extensionmgr')."
          "; - echo "
          "; - echo "
          \n"; +// $this->installedList(); ?>

          -contentContainerEnd(); -?>
          \n"; print "
          ".getMLText('name')."".getMLText('version')."".getMLText('author')."".getMLText('name')."".getMLText('version')."".getMLText('author')."
          \n"; ?>
          From 8409b7e518ec9e993117d736436431493cf48fb6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 17:35:48 +0100 Subject: [PATCH 329/467] add entry for 5.1.14 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a0fda89eb..8d43e51b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,9 @@ - document attributes comment, keywords, categories, expiration date, and sequence can be turned of in the configuration - workflows can be turned off completely +- Extension can be enabled/disabled in the extension manager, the previously + used method by setting a parameter in the extension's config file will no + longer work. -------------------------------------------------------------------------------- Changes in version 5.1.13 From b7deb8427939d1a7c30be50c13330df0e0be6922 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 31 Dec 2019 15:42:15 +0100 Subject: [PATCH 330/467] check if file to be indexed exists --- SeedDMS_Lucene/Lucene/IndexedDocument.php | 46 ++++++++++--------- .../SQLiteFTS/IndexedDocument.php | 46 ++++++++++--------- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php index 237150097..df93e4a35 100644 --- a/SeedDMS_Lucene/Lucene/IndexedDocument.php +++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php @@ -158,29 +158,31 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document { } if($version && !$nocontent) { $path = $dms->contentDir . $version->getPath(); - $content = ''; - $mimetype = $version->getMimeType(); - $this->mimetype = $mimetype; - $cmd = ''; - $mimeparts = explode('/', $mimetype, 2); - if(isset($_convcmd[$mimetype])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd['*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } - if($cmd) { - $this->cmd = $cmd; - try { - $content = self::execWithTimeout($cmd, $timeout); - if($content['stdout']) { - $this->addField(Zend_Search_Lucene_Field::UnStored('content', $content['stdout'], 'utf-8')); + if(file_exists($path)) { + $content = ''; + $mimetype = $version->getMimeType(); + $this->mimetype = $mimetype; + $cmd = ''; + $mimeparts = explode('/', $mimetype, 2); + if(isset($_convcmd[$mimetype])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd['*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } + if($cmd) { + $this->cmd = $cmd; + try { + $content = self::execWithTimeout($cmd, $timeout); + if($content['stdout']) { + $this->addField(Zend_Search_Lucene_Field::UnStored('content', $content['stdout'], 'utf-8')); + } + if($content['stderr']) { + $this->errormsg = $content['stderr']; + } + } catch (Exception $e) { } - if($content['stderr']) { - $this->errormsg = $content['stderr']; - } - } catch (Exception $e) { } } } diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php index fb87503b8..5e9fb08a1 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php @@ -152,29 +152,31 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document { } if($version && !$nocontent) { $path = $dms->contentDir . $version->getPath(); - $content = ''; - $mimetype = $version->getMimeType(); - $this->mimetype = $mimetype; - $cmd = ''; - $mimeparts = explode('/', $mimetype, 2); - if(isset($_convcmd[$mimetype])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd['*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } - if($cmd) { - $this->cmd = $cmd; - try { - $content = self::execWithTimeout($cmd, $timeout); - if($content['stdout']) { - $this->addField('content', $content['stdout'], 'unstored'); + if(file_exists($path)) { + $content = ''; + $mimetype = $version->getMimeType(); + $this->mimetype = $mimetype; + $cmd = ''; + $mimeparts = explode('/', $mimetype, 2); + if(isset($_convcmd[$mimetype])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd['*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } + if($cmd) { + $this->cmd = $cmd; + try { + $content = self::execWithTimeout($cmd, $timeout); + if($content['stdout']) { + $this->addField('content', $content['stdout'], 'unstored'); + } + if($content['stderr']) { + $this->errormsg = $content['stderr']; + } + } catch (Exception $e) { } - if($content['stderr']) { - $this->errormsg = $content['stderr']; - } - } catch (Exception $e) { } } } From 36231f8cf3ee351965c845d7b06c6d2ee64cf6d3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 1 Jan 2020 09:17:45 +0100 Subject: [PATCH 331/467] do not include GoogleQRCodeProvider.php anymore --- views/bootstrap/class.Login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php index 81fbcfcde..68aecf303 100644 --- a/views/bootstrap/class.Login.php +++ b/views/bootstrap/class.Login.php @@ -152,7 +152,7 @@ $(document).ready( function() { if($enable2factauth) { require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php"; require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php"; - require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php"; +// require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php"; require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php"; require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php"; require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php"; From 189e6da70eeac24e9163a3306f796777bad47107 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 1 Jan 2020 09:24:22 +0100 Subject: [PATCH 332/467] better checking for correct version had to be modified because extensions are new disabled in the settings.xml --- inc/inc.Extension.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 8e74c0080..5fb009398 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -23,16 +23,15 @@ $version = new SeedDMS_Version; foreach($EXT_CONF as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { /* check for requirements */ + $disable = false; if(!empty($extconf['constraints']['depends']['seeddms'])) { $t = explode('-', $extconf['constraints']['depends']['seeddms'], 2); if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0)) continue; - $extconf['disable'] = true; + $disable = true; } -// } -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$disable) { if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { @@ -57,5 +56,6 @@ foreach($EXT_CONF as $extname=>$extconf) { } } } + } } } From 8ae287436707826679776a50196ea372bd6fb8ea Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 3 Jan 2020 10:21:58 +0100 Subject: [PATCH 333/467] do not use global var EXT_CONF anymore --- CHANGELOG | 1 + controllers/class.ExtensionMgr.php | 2 +- inc/inc.ClassController.php | 4 +- inc/inc.ClassExtensionMgr.php | 6 +-- inc/inc.ClassUI.php | 61 +++++++++++++------------- inc/inc.Extension.php | 19 +++++--- out/out.Settings.php | 1 + views/bootstrap/class.ExtensionMgr.php | 18 +++++--- views/bootstrap/class.Settings.php | 6 ++- 9 files changed, 67 insertions(+), 51 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8d43e51b8..12166e154 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ - Extension can be enabled/disabled in the extension manager, the previously used method by setting a parameter in the extension's config file will no longer work. +- clean up code for managing extensions -------------------------------------------------------------------------------- Changes in version 5.1.13 diff --git a/controllers/class.ExtensionMgr.php b/controllers/class.ExtensionMgr.php index efd4fbd94..e28f4dab7 100644 --- a/controllers/class.ExtensionMgr.php +++ b/controllers/class.ExtensionMgr.php @@ -36,7 +36,7 @@ class SeedDMS_Controller_ExtensionMgr extends SeedDMS_Controller_Common { $extmgr = $this->params['extmgr']; $extname = $this->params['extname']; - $filename = $extmgr->createArchive($extname, $GLOBALS['EXT_CONF'][$extname]['version']); + $filename = $extmgr->createArchive($extname, $extmgr->getExtensionConfiguration()[$extname]['version']); if(null === $this->callHook('download')) { if(file_exists($filename)) { diff --git a/inc/inc.ClassController.php b/inc/inc.ClassController.php index 04e70dca7..2092d9313 100644 --- a/inc/inc.ClassController.php +++ b/inc/inc.ClassController.php @@ -30,14 +30,14 @@ class Controller { * @return object an object of a class implementing the view */ static function factory($class, $params=array()) { /* {{{ */ - global $settings, $session, $EXT_CONF; + global $settings, $session, $extMgr; if(!$class) { return null; } $classname = "SeedDMS_Controller_".$class; $filename = ''; - foreach($EXT_CONF as $extname=>$extconf) { + foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { $filename = $settings->_rootDir.'ext/'.$extname.'/controllers/class.'.$class.".php"; if(file_exists($filename)) { break; diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index 7af12f2e2..2d000b21c 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -362,9 +362,9 @@ class SeedDMS_Extension_Mgr { break; default: $tmp = explode('-', $dval, 2); - if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) { - if(self::cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0)) - $this->errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']); + if(isset($this->extconf[$dkey]['version'])) { + if(self::cmpVersion($tmp[0], $this->extconf[$dkey]['version']) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $this->extconf[$dkey]['version']) < 0)) + $this->errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $this->extconf[$dkey]['version']); } else { $this->errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey); } diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index c671f19b4..8f8ee5047 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -45,7 +45,7 @@ class UI extends UI_Default { * @return object an object of a class implementing the view */ static function factory($theme, $class='', $params=array()) { /* {{{ */ - global $settings, $session, $EXT_CONF; + global $settings, $session, $extMgr; if(!$class) { $class = 'Bootstrap'; $classname = "SeedDMS_Bootstrap_Style"; @@ -54,14 +54,14 @@ class UI extends UI_Default { } /* Collect all decorators */ $decorators = array(); - foreach($EXT_CONF as $extname=>$extconf) { + foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { - if(isset($extconf['decorators'][$class])) { - $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file']; - if(file_exists($filename)) { - $classname = $extconf['decorators'][$class]['name']; - $decorators[$extname] = $extconf['decorators'][$class]; + if($extMgr->checkExtension($extconf)) { + if(isset($extconf['decorators'][$class])) { + $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file']; + if(file_exists($filename)) { + $decorators[$extname] = $extconf['decorators'][$class]; + } } } } @@ -71,32 +71,33 @@ class UI extends UI_Default { */ $filename = ''; $httpbasedir = ''; - foreach($EXT_CONF as $extname=>$extconf) { + foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { - /* Setting the 'views' element in the configuration can be used to - * replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php - * without providing an out/out.ViewFolder.php. In that case $httpbasedir - * will not be set because out/out.xxx.php is still used. - */ - if(isset($extconf['views'][$class])) { - $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; + if($extMgr->checkExtension($extconf)) { + /* Setting the 'views' element in the configuration can be used to + * replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php + * without providing an out/out.ViewFolder.php. In that case $httpbasedir + * will not be set because out/out.xxx.php is still used. + */ + if(isset($extconf['views'][$class])) { + $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; + if(file_exists($filename)) { + // $httpbasedir = 'ext/'.$extname.'/'; + $classname = $extconf['views'][$class]['name']; + break; + } + } + /* New views are added by creating a file out/out.xx.php and + * views/bootstrap/class.xx.php, without setting the 'views' element + * in the configuration + */ + $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; if(file_exists($filename)) { -// $httpbasedir = 'ext/'.$extname.'/'; - $classname = $extconf['views'][$class]['name']; + $httpbasedir = 'ext/'.$extname.'/'; break; } + $filename = ''; } - /* New views are added by creating a file out/out.xx.php and - * views/bootstrap/class.xx.php, without setting the 'views' element - * in the configuration - */ - $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; - if(file_exists($filename)) { - $httpbasedir = 'ext/'.$extname.'/'; - break; - } - $filename = ''; } } if(!$filename) @@ -141,7 +142,7 @@ class UI extends UI_Default { $view->setParam('onepage', $settings->_onePageMode); foreach($decorators as $extname=>$decorator) { $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$decorator['file']; - require($filename); + require_once($filename); $view = new $decorator['name']($view); } return $view; diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 5fb009398..77f4b6eb6 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -17,21 +17,28 @@ require_once "inc.Version.php"; require_once "inc.Utils.php"; $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl); -$EXT_CONF = $extMgr->getExtensionConfiguration(); $version = new SeedDMS_Version; -foreach($EXT_CONF as $extname=>$extconf) { +foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { + $disabled = true; + if($extMgr->checkExtension($extconf)) { + $disabled = false; + } else { + // echo $extMgr->getErrorMsg(); + } /* check for requirements */ - $disable = false; + /* if(!empty($extconf['constraints']['depends']['seeddms'])) { $t = explode('-', $extconf['constraints']['depends']['seeddms'], 2); if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0)) - continue; - $disable = true; + $disabled = true; + else + $disabled = false; } - if(!$disable) { + */ + if(!$disabled) { if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { diff --git a/out/out.Settings.php b/out/out.Settings.php index 0c3718d3a..27833735d 100644 --- a/out/out.Settings.php +++ b/out/out.Settings.php @@ -42,6 +42,7 @@ $groups = $dms->getAllGroups(); if($view) { $view->setParam('settings', $settings); + $view->setParam('extmgr', $extMgr); $view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')); $view->setParam('allusers', $users); $view->setParam('allgroups', $groups); diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 9cc5d5c2b..1a7f2909c 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -99,6 +99,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $extmgr = $this->params['extmgr']; $extname = $this->params['extname']; + $extconf = $extmgr->getExtensionConfiguration(); echo "\n"; print "\n\n"; @@ -112,9 +113,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { foreach($list as $re) { $extmgr->checkExtension($re); $checkmsgs = $extmgr->getErrorMsgs(); - $needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0; + $needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0; echo "params['extdir']; $extmgr = $this->params['extmgr']; $extname = $this->params['extname']; + $extconf = $extmgr->getExtensionConfiguration(); - if(isset($GLOBALS['EXT_CONF'][$extname])) { - $extconf = $GLOBALS['EXT_CONF'][$extname]; + if(isset($extconf[$extname])) { + $extconf = $extconf[$extname]; if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) { echo '
          '.file_get_contents($extdir."/".$extname."/".$extconf['changelog'])."
          "; } @@ -161,6 +163,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $httproot = $this->params['httproot']; $extmgr = $this->params['extmgr']; $extdir = $this->params['extdir']; + $extconf = $extmgr->getExtensionConfiguration(); echo "
          \n"; print "\n\n"; @@ -171,7 +174,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { print "\n"; print "\n"; $errmsgs = array(); - foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) { + foreach($extconf as $extname=>$extconf) { $errmsgs = array(); if(!$settings->extensionIsDisabled($extname)) { // if(!isset($extconf['disable']) || $extconf['disable'] == false) { @@ -225,6 +228,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $extdir = $this->params['extdir']; $version = $this->params['version']; $extmgr = $this->params['extmgr']; + $extconf = $extmgr->getExtensionConfiguration(); $currenttab = $this->params['currenttab']; $reposurl = $this->params['reposurl']; @@ -291,9 +295,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { continue; $extmgr->checkExtension($re); $checkmsgs = $extmgr->getErrorMsgs(); - $needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0; + $needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0; echo "params['extmgr']; header('Content-Type: application/javascript'); ?> @@ -207,7 +208,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { }); }); $extconf) { + foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) { if($extconf['config']) { foreach($extconf['config'] as $confkey=>$conf) { switch($conf['type']) { @@ -230,6 +231,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $settings = $this->params['settings']; + $extmgr = $this->params['extmgr']; $currenttab = $this->params['currenttab']; $this->htmlStartPage(getMLText("admin_tools")); @@ -475,7 +477,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); -- SETTINGS - ADVANCED - DISPLAY --> $extconf) { + foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) { if($this->hasHook('processConfig')) $extconf = $this->callHook('processConfig', $extname, $extconf); if($extconf['config']) { From 481d01977b570a3ba1648b78cd632742093ae6d5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 6 Jan 2020 13:34:38 +0100 Subject: [PATCH 334/467] fix typo --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 39eb27b30..7e98bf6dd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,7 +10,7 @@ - rejection of document receipts are turned off by default, but can be turned on in the settings - documents in DocumentChooser are sorted by name -- instead of just removing a user from all processes it can be replace by a new user +- instead of just removing a user from all processes it can be replaced by a new user -------------------------------------------------------------------------------- Changes in version 6.0.6 From 974ff603e1bf1bbfa9bd66bd312ce0620fd182f2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 7 Jan 2020 21:20:16 +0100 Subject: [PATCH 335/467] check if hooks return a user object because true also indicates a failed login --- controllers/class.Login.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/controllers/class.Login.php b/controllers/class.Login.php index 01cd4f21a..3a66568e1 100644 --- a/controllers/class.Login.php +++ b/controllers/class.Login.php @@ -85,30 +85,35 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common { } /* Deprecated: Run any additional authentication implemented in a hook */ - if(!$user && isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) { + if(!is_object($user) && isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['authentication'] as $authObj) { if(!$user && method_exists($authObj, 'authenticate')) { $user = $authObj->authenticate($dms, $settings, $login, $pwd); + if(false === $user) { + if(empty($this->errormsg)) + $this->setErrorMsg("authentication_failed"); + return false; + } } } } /* Authenticate against LDAP server {{{ */ - if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { + if (!is_object($user) && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { require_once("../inc/inc.ClassLdapAuthentication.php"); $authobj = new SeedDMS_LdapAuthentication($dms, $settings); $user = $authobj->authenticate($login, $pwd); } /* }}} */ /* Authenticate against SeedDMS database {{{ */ - if(!$user) { + if(!is_object($user)) { require_once("../inc/inc.ClassDbAuthentication.php"); $authobj = new SeedDMS_DbAuthentication($dms, $settings); $user = $authobj->authenticate($login, $pwd); } /* }}} */ /* If the user is still not authenticated, then exit with an error */ - if(!$user) { + if(!is_object($user)) { $this->callHook('loginFailed'); $this->setErrorMsg("login_error_text"); return false; From 9b6949a00a6b092200a3d65d6384456859a7f5a2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 7 Jan 2020 21:21:17 +0100 Subject: [PATCH 336/467] check if document content exists in hits of fulltext search --- views/bootstrap/class.Search.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index f4d49f049..27ae82db7 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -489,9 +489,8 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { else { $document = $entry; $owner = $document->getOwner(); - $lc = $document->getLatestContent(); - $version = $lc->getVersion(); - $previewer->createPreview($lc); + if($lc = $document->getLatestContent()) + $previewer->createPreview($lc); if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($document->getComment())); @@ -506,7 +505,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $belowtitle .= htmlspecialchars($path[$i]->getName())."/"; } $belowtitle .= ""; - $lcattributes = $lc->getAttributes(); + $lcattributes = $lc ? $lc->getAttributes() : null; $attrstr = ''; if($lcattributes) { $attrstr .= "
          \n"; From 699152d95b7f7b6a996f1b46383608dd99761bc5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 10 Jan 2020 14:48:14 +0100 Subject: [PATCH 337/467] use getDMS() instead of accessing _dms --- SeedDMS_Core/Core/inc.ClassDocument.php | 117 ++++++++++++------------ 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 43056e7a0..e932e0ada 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2896,7 +2896,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ function getUser() { /* {{{ */ if (!isset($this->_user)) - $this->_user = $this->_document->_dms->getUser($this->_userID); + $this->_user = $this->_document->getDMS()->getUser($this->_userID); return $this->_user; } /* }}} */ @@ -2912,7 +2912,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ function getPath() { return $this->_document->getDir() . $this->_version . ($this->_fileType != '.' ? $this->_fileType : ''); } function setDate($date = false) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$date) $date = time(); @@ -2942,7 +2942,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if($filesize === false) return false; - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentContent` SET `fileSize` = ".$filesize." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; @@ -2963,7 +2963,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if($checksum === false) return false; - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentContent` SET `checksum` = ".$db->qstr($checksum)." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; @@ -2973,7 +2973,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function setComment($newComment) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentContent` SET `comment` = ".$db->qstr($newComment)." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) @@ -3007,7 +3007,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array latest record from tblDocumentStatusLog */ function getStatus($limit=1) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3041,7 +3041,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of status changes */ function getStatusLog($limit=0) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3076,7 +3076,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function setStatus($status, $comment, $updateUser, $date='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($status)) return false; @@ -3123,7 +3123,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteStatusLog($statuslog) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr= "SELECT `tblDocumentStatus`.* FROM `tblDocumentStatus` WHERE `tblDocumentStatus`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentStatus`.`version` = '". $this->_version ."' "; $res = $db->getResultArray($queryStr); @@ -3182,7 +3182,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer either M_NONE or M_READ */ function getAccessMode($u) { /* {{{ */ - $dms = $this->_document->_dms; + $dms = $this->_document->getDMS(); /* Check if 'onCheckAccessDocumentContent' callback is set */ if(isset($this->_dms->callbacks['onCheckAccessDocumentContent'])) { @@ -3292,7 +3292,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of review status */ function getReviewStatus($limit=1) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3352,7 +3352,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteReviewLog($reviewers) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr= "SELECT `tblDocumentReviewers`.* FROM `tblDocumentReviewers` WHERE `tblDocumentReviewers`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentReviewers`.`version` = '". $this->_version ."' "; $res = $db->getResultArray($queryStr); @@ -3420,7 +3420,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of approval status */ function getApprovalStatus($limit=1) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3480,7 +3480,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteApprovalLog($reviewers) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr= "SELECT `tblDocumentApprovers`.* FROM `tblDocumentApprovers` WHERE `tblDocumentApprovers`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentApprovers`.`version` = '". $this->_version ."' "; $res = $db->getResultArray($queryStr); @@ -3541,7 +3541,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addIndReviewer($user, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $userID = $user->getID(); @@ -3592,7 +3592,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addGrpReviewer($group, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -3670,7 +3670,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer new review log id */ function setReviewByInd($user, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the review list. $reviewStatus = $user->getReviewStatus($this->_document->getID(), $this->_version); @@ -3722,7 +3722,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer new review log id */ function setReviewByGrp($group, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the review list. $reviewStatus = $group->getReviewStatus($this->_document->getID(), $this->_version); @@ -3761,7 +3761,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addIndApprover($user, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $userID = $user->getID(); @@ -3810,7 +3810,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addGrpApprover($group, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -3892,7 +3892,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer 0 on success, < 0 in case of an error */ function setApprovalByInd($user, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the approval list. $approvalStatus = $user->getApprovalStatus($this->_document->getID(), $this->_version); @@ -3936,7 +3936,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * group instead of a user */ function setApprovalByGrp($group, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the approval list. $approvalStatus = $group->getApprovalStatus($this->_document->getID(), $this->_version); @@ -3974,7 +3974,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delIndReviewer($user, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the review list. $reviewStatus = $user->getReviewStatus($this->_document->getID(), $this->_version); @@ -4004,7 +4004,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delGrpReviewer($group, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -4035,7 +4035,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delIndApprover($user, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $userID = $user->getID(); @@ -4067,7 +4067,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delGrpApprover($group, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -4103,7 +4103,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $state */ function setWorkflowState($state) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if($this->_workflow) { $queryStr = "UPDATE `tblWorkflowDocumentContent` set `state`=". $state->getID() ." WHERE `workflow`=". intval($this->_workflow->getID()). " AND `document`=". intval($this->_document->getID()) ." AND version=". intval($this->_version) .""; @@ -4123,7 +4123,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error, e.g. the version has not a workflow */ function getWorkflowState() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4140,7 +4140,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (is_bool($recs) && !$recs) return false; $this->_workflowState = new SeedDMS_Core_Workflow_State($recs[0]['id'], $recs[0]['name'], $recs[0]['maxtime'], $recs[0]['precondfunc'], $recs[0]['documentstatus']); - $this->_workflowState->setDMS($this->_document->_dms); + $this->_workflowState->setDMS($this->_document->getDMS()); } return $this->_workflowState; } /* }}} */ @@ -4151,7 +4151,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $workflow */ function setWorkflow($workflow, $user) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $this->getWorkflow(); if($workflow && is_object($workflow)) { @@ -4184,7 +4184,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error, e.g. the version has not a workflow */ function getWorkflow() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!isset($this->_workflow)) { $queryStr= @@ -4196,8 +4196,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; if(!$recs) return false; - $this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->_dms->getWorkflowState($recs[0]['initstate'])); - $this->_workflow->setDMS($this->_document->_dms); + $this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->getDMS()->getWorkflowState($recs[0]['initstate'])); + $this->_workflow->setDMS($this->_document->getDMS()); } return $this->_workflow; } /* }}} */ @@ -4213,7 +4213,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteWorkflowLog($workflowlog) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $db->startTransaction(); @@ -4250,7 +4250,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error */ function rewindWorkflow() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $this->getWorkflow(); @@ -4291,7 +4291,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error */ function removeWorkflow($user, $unlink=false) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $this->getWorkflow(); @@ -4336,7 +4336,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $subworkflow */ function getParentWorkflow() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* document content must be in a workflow */ $this->getWorkflow(); @@ -4355,7 +4355,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; if($recs[0]['parentworkflow']) - return $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']); + return $this->_document->getDMS()->getWorkflow($recs[0]['parentworkflow']); return false; } /* }}} */ @@ -4366,7 +4366,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $subworkflow */ function runSubWorkflow($subworkflow) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* document content must be in a workflow */ $this->getWorkflow(); @@ -4400,7 +4400,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param string comment for the transition trigger */ function returnFromSubWorkflow($user, $transition=null, $comment='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* document content must be in a workflow */ $this->getWorkflow(); @@ -4430,8 +4430,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; } - $this->_workflow = $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']); - $this->_workflow->setDMS($this->_document->_dms); + $this->_workflow = $this->_document->getDMS()->getWorkflow($recs[0]['parentworkflow']); + $this->_workflow->setDMS($this->_document->getDMS()); if($transition) { if(false === $this->triggerWorkflowTransition($user, $transition, $comment)) { @@ -4456,7 +4456,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true if user may trigger transaction */ function triggerWorkflowTransitionIsAllowed($user, $transition) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4598,7 +4598,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * false in case of an error */ function triggerWorkflowTransition($user, $transition, $comment='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4739,7 +4739,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of operations */ function getWorkflowLog($transition = null) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* if(!$this->_workflow) @@ -4759,8 +4759,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $workflowlogs = array(); for ($i = 0; $i < count($resArr); $i++) { - $workflow = $this->_document->_dms->getWorkflow($resArr[$i]["workflow"]); - $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->_dms->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $workflow, $this->_document->_dms->getUser($resArr[$i]["userid"]), $workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); + $workflow = $this->_document->getDMS()->getWorkflow($resArr[$i]["workflow"]); + $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); $workflowlog->setDMS($this); $workflowlogs[$i] = $workflowlog; } @@ -4775,7 +4775,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of operations */ function getLastWorkflowTransition() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4792,7 +4792,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $workflowlogs = array(); $i = 0; - $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->_dms->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->_dms->getUser($resArr[$i]["userid"]), $this->_workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); + $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $this->_workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); $workflowlog->setDMS($this); return $workflowlog; @@ -4910,8 +4910,9 @@ class SeedDMS_Core_DocumentLink { /* {{{ */ * @return bool|SeedDMS_Core_User */ function getUser() { - if (!isset($this->_user)) - $this->_user = $this->_document->_dms->getUser($this->_userID); + if (!isset($this->_user)) { + $this->_user = $this->_document->getDMS()->getUser($this->_userID); + } return $this->_user; } @@ -5087,7 +5088,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param string $newComment string new comment of document */ function setComment($newComment) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentFiles` SET `comment` = ".$db->qstr($newComment)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id; if (!$db->getResult($queryStr)) @@ -5110,7 +5111,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @return boolean true on success */ function setDate($date) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$date) $date = time(); @@ -5157,7 +5158,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param $newComment string new name of document */ function setName($newName) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentFiles` SET `name` = ".$db->qstr($newName)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id; if (!$db->getResult($queryStr)) @@ -5172,7 +5173,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ */ function getUser() { if (!isset($this->_user)) - $this->_user = $this->_document->_dms->getUser($this->_userID); + $this->_user = $this->_document->getDMS()->getUser($this->_userID); return $this->_user; } @@ -5194,7 +5195,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param $newComment string new version of document */ function setVersion($newVersion) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!is_numeric($newVersion) && $newVersion != '') return false; @@ -5218,7 +5219,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param $newComment string new comment of document */ function setPublic($newPublic) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentFiles` SET `public` = ".($newPublic ? 1 : 0)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id; if (!$db->getResult($queryStr)) @@ -5240,7 +5241,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @return integer either M_NONE or M_READ */ function getAccessMode($u) { /* {{{ */ - $dms = $this->_document->_dms; + $dms = $this->_document->getDMS(); /* Check if 'onCheckAccessDocumentLink' callback is set */ if(isset($this->_dms->callbacks['onCheckAccessDocumentFile'])) { From bb38dc7b22352f32171175b1c31079ab602809d3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 Jan 2020 09:32:22 +0100 Subject: [PATCH 338/467] properly handle duplicate names when moving a document/folder --- webdav/webdav.php | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/webdav/webdav.php b/webdav/webdav.php index ff08f71ee..00c4e0d4f 100644 --- a/webdav/webdav.php +++ b/webdav/webdav.php @@ -1062,6 +1062,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $objdest = $this->reverseLookup($options["dest"]); $newdocname = ''; + /* if the destіnation could not be found, then a folder/document shall + * be renamed. In that case the source object is moved into the ѕame + * or different folder under a new name. + * $objdest will store the new destination folder afterwards + */ if(!$objdest) { /* check if at least the dest directory exists */ $dirname = dirname($options['dest']); @@ -1112,13 +1117,17 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server /* Set the new Folder of the source object */ if(get_class($objsource) == $this->dms->getClassname('document')) { /* Check if name already exists in the folder */ - /* if(!$settings->_enableDuplicateDocNames) { - if($objdest->hasDocumentByName($objsource->getName())) { - return "403 Forbidden"; + if($newdocname) { + if($objdest->hasDocumentByName($newdocname)) { + return "403 Forbidden"; + } + } else { + if($objdest->hasDocumentByName($objsource->getName())) { + return "403 Forbidden"; + } } } - */ $oldFolder = $objsource->getFolder(); if($objsource->setFolder($objdest)) { @@ -1153,8 +1162,14 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server } elseif(get_class($objsource) == $this->dms->getClassname('folder')) { /* Check if name already exists in the folder */ if(!$settings->_enableDuplicateSubFolderNames) { - if($objdest->hasSubFolderByName($objsource->getName())) { - return "403 Forbidden"; + if($newdocname) { + if($objdest->hasSubFolderByName($newdocname)) { + return "403 Forbidden"; + } + } else { + if($objdest->hasSubFolderByName($objsource->getName())) { + return "403 Forbidden"; + } } } $oldFolder = $objsource->getParent(); @@ -1176,7 +1191,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $objdest->getFolderPathPlain(); $params['username'] = $this->user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$objsource->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); From 61ce13d681d33bff94004bb74a0ebadd09169604 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 Jan 2020 09:32:48 +0100 Subject: [PATCH 339/467] add entry for 5.1.14 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 12166e154..15e10fdb6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ used method by setting a parameter in the extension's config file will no longer work. - clean up code for managing extensions +- fix renaming of folders via webdav -------------------------------------------------------------------------------- Changes in version 5.1.13 From 392a7e4a51690f2cbe6bffc024348a887186ded5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 Jan 2020 17:31:59 +0100 Subject: [PATCH 340/467] make getFileName() public --- SeedDMS_Preview/Preview/Previewer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php index b8df0ca1c..9e2fe2a34 100644 --- a/SeedDMS_Preview/Preview/Previewer.php +++ b/SeedDMS_Preview/Preview/Previewer.php @@ -52,7 +52,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base { * @param integer $width width of preview image * @return string file name of preview image */ - protected function getFileName($object, $width) { /* {{{ */ + public function getFileName($object, $width) { /* {{{ */ if(!$object) return false; From b59f906f273859097a2c2a2605421543b7c1674b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 14 Jan 2020 08:31:43 +0100 Subject: [PATCH 341/467] fis saving of disable flag of extensions --- inc/inc.ClassSettings.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index e63d0202b..26206d127 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -716,10 +716,14 @@ class Settings { /* {{{ */ $extname = strval($tmp['name']); if(isset($tmp['disable'])) $disabled = strval($tmp['disable']); + else + $disabled = 0; $this->_extensions[$extname]['__disable__'] = $disabled=='1' || $disabled == 'true' ? true : false; foreach($extension->children() as $parameter) { $tmp2 = $parameter->attributes(); - $this->_extensions[$extname][strval($tmp2['name'])] = strval($parameter); + /* Do not read a parameter with the same name. Just a pre caution */ + if(strval($tmp2['name']) != '__disable__') + $this->_extensions[$extname][strval($tmp2['name'])] = strval($parameter); } } @@ -1058,7 +1062,7 @@ class Settings { /* {{{ */ * in configuration form. */ foreach($extension as $fieldname=>$confvalue) { - if($confvalue) { + if($fieldname != '___disable__' && $confvalue) { $parameter = $extnode->addChild('parameter'); $parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : ''; $this->setXMLAttributValue($parameter, 'name', $fieldname); From daf08343e36cff408ef72bebae71d13513a9be01 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 14 Jan 2020 08:32:05 +0100 Subject: [PATCH 342/467] set disable flag of extension otherwise it will not be saved --- views/bootstrap/class.Settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 13492c439..14a48cb56 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -78,7 +78,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { */ protected function showRawConfigHeadline($text) { /* {{{ */ ?> - + showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); if($this->hasHook('processConfig')) $extconf = $this->callHook('processConfig', $extname, $extconf); if($extconf['config']) { - $this->showRawConfigHeadline("".$extconf['title']); + $this->showRawConfigHeadline("".'_extensions[$extname]["__disable__"] ? '1' : '').'" />'.$extconf['title']); foreach($extconf['config'] as $confkey=>$conf) { ob_start(); switch($conf['type']) { From 0dbeebee802e9d4dfde686ee1501e9e438b395e9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 10:57:07 +0100 Subject: [PATCH 343/467] add config for apache 2.4 and 2.2 --- conf/.htaccess | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/conf/.htaccess b/conf/.htaccess index d774f51c9..2e473b4ba 100644 --- a/conf/.htaccess +++ b/conf/.htaccess @@ -1,6 +1,10 @@ # Make sure settings.xml can not be opened from outside! -#Redirect /conf/settings.xml /index.php - -Order allow,deny -Deny from all - +# Deny all requests from Apache 2.4+. + + Require all denied + + +# Deny all requests from Apache 2.0-2.2. + + Deny from all + From 827049ee9a89b03daac1b2db3cc0ba876a8ae7ea Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 12:45:59 +0100 Subject: [PATCH 344/467] nofication field can be turned of when uploading a new document --- views/bootstrap/class.AddDocument.php | 2 ++ views/bootstrap/class.Settings.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 36ccdf1e6..65e530ae7 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -635,6 +635,7 @@ $(document).ready(function() { } $this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); } + if(!$nodocumentformfields || !in_array('notification', $nodocumentformfields)) { $this->contentSubHeading(getMLText("add_document_notify")); $options = array(); @@ -671,6 +672,7 @@ $(document).ready(function() { 'options'=>$options ) ); + } $this->formSubmit(" ".getMLText('add_document')); ?> diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 14a48cb56..31f5810e0 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -288,7 +288,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> showConfigHeadline('settings_Edition'); ?> showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?> -showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment'), true, true); ?> +showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment', 'notification'), true, true); ?> showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?> showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?> showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?> From f1599906d0d1e8fe4196c5412226aa5fe46233e8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 13:07:43 +0100 Subject: [PATCH 345/467] check if $_POST["reqversion"] is empty --- op/op.AddDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index a82105aa5..4c55beb66 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -124,7 +124,7 @@ foreach($attributes_version as $attrdefid=>$attribute) { } */ -$reqversion = (int)$_POST["reqversion"]; +$reqversion = !empty($_POST['reqversion']) ? (int)$_POST["reqversion"] : 0; if ($reqversion<1) $reqversion=1; $sequence = $_POST["sequence"]; From 905adbe6ba0a76055eb4d96491a6748f11cab04e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 13:08:22 +0100 Subject: [PATCH 346/467] do not ask for approver/reviewer if workflow is turned of completely --- views/bootstrap/class.UpdateDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php index 12ce32cb6..b1c4b0815 100644 --- a/views/bootstrap/class.UpdateDocument.php +++ b/views/bootstrap/class.UpdateDocument.php @@ -349,7 +349,7 @@ console.log(element); ); } $this->warningMsg(getMLText("add_doc_workflow_warning")); - } else { + } elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { $docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp); if($workflowmode == 'traditional') { $this->contentSubHeading(getMLText("assign_reviewers")); From f0ab6af744864201aef8d116f00bf5cd2a1d26d1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 13:08:48 +0100 Subject: [PATCH 347/467] asking for version number can be turned of completely --- views/bootstrap/class.AddDocument.php | 2 ++ views/bootstrap/class.Settings.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 65e530ae7..57162b071 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -325,6 +325,7 @@ $(document).ready(function() { } $this->contentSubHeading(getMLText("version_info")); + if(!$nodocumentformfields || !in_array('version', $nodocumentformfields)) { $this->formField( getMLText("version"), array( @@ -335,6 +336,7 @@ $(document).ready(function() { 'value'=>1 ) ); + } $this->formField( getMLText("local_file"), $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '' : '') diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 31f5810e0..3cf73e26f 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -288,7 +288,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> showConfigHeadline('settings_Edition'); ?> showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?> -showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment', 'notification'), true, true); ?> +showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version', 'version_comment', 'notification'), true, true); ?> showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?> showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?> showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?> From 6e2dd6c159a1266fdca7d7ce879e8917a55a8481 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 17:48:23 +0100 Subject: [PATCH 348/467] check for presetexpdate and sequence in $_POST --- op/op.EditDocument.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index a8ef4fbc4..9854e28ca 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -67,8 +67,7 @@ if(isset($_POST['categoryidform1'])) { } else { $categories = array(); } -$sequence = isset($_POST["sequence"]) ? $_POST["sequence"] : "keep"; -$sequence = str_replace(',', '.', $_POST["sequence"]); +$sequence = isset($_POST["sequence"]) ? str_replace(',', '.', $_POST["sequence"]) : "keep"; if (!is_numeric($sequence)) { $sequence="keep"; } @@ -77,6 +76,7 @@ if(isset($_POST["attributes"])) else $attributes = array(); +if(isset($_POST['presetexpdate'])) { switch($_POST["presetexpdate"]) { case "date": $tmp = explode('-', $_POST["expdate"]); @@ -103,6 +103,9 @@ default: $expires = null; break; } +} else { + $expires = null; +} $oldname = $document->getName(); $oldcomment = $document->getComment(); From 13fcdf43ca8136b20ecf90b48dcfa2bff7de88d7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 20 Jan 2020 10:36:31 +0100 Subject: [PATCH 349/467] show list of expired documents newer shew any documents --- views/bootstrap/class.MyDocuments.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 9e5da1249..c05ec4bc2 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -821,7 +821,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if($docs = $dms->getDocumentsExpired(-3*365, $user)) { $this->contentHeading(getMLText("documents_expired")); $this->contentContainerStart(); - if (count($resArr)>0) { + if (count($docs)>0) { print "
          "; print "\n\n"; @@ -863,7 +863,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "
          "; } - else printMLText("no_docs_locked"); + else printMLText("no_docs_expired"); $this->contentContainerEnd(); } From fbb2ba3180148620441845ad1c9ad8924895bc26 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 20 Jan 2020 10:38:58 +0100 Subject: [PATCH 350/467] fix list of expired documents --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 15e10fdb6..01f64b8b5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ longer work. - clean up code for managing extensions - fix renaming of folders via webdav +- fix list of expired documents on MyDocuments page -------------------------------------------------------------------------------- Changes in version 5.1.13 From 8362796339221fea9e1304b9543cd34698fc4653 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 20 Jan 2020 11:26:44 +0100 Subject: [PATCH 351/467] fix sql statement for adding a new primary key --- install/update-6.0.0/update.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql index 480415c4f..74d8eb548 100644 --- a/install/update-6.0.0/update.sql +++ b/install/update-6.0.0/update.sql @@ -6,7 +6,7 @@ ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) DEFAULT NULL AFTER `pwd`; ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text DEFAULT NULL AFTER `initstate`; -ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; +ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`id`); ALTER TABLE `tblWorkflowLog` ADD COLUMN `workflowdocumentcontent` int(11) NOT NULL DEFAULT '0' AFTER `id`; From 74300082fcfdf5f360c47bebd4387aa5b3588525 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 20 Jan 2020 11:53:38 +0100 Subject: [PATCH 352/467] fix bug #462, pass showtree to ViewDocument --- CHANGELOG | 1 + out/out.ViewDocument.php | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 01f64b8b5..6be2a45bc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ - clean up code for managing extensions - fix renaming of folders via webdav - fix list of expired documents on MyDocuments page +- pass showtree to ViewDocument (Closes: #462) -------------------------------------------------------------------------------- Changes in version 5.1.13 diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php index fd0a7d234..af38db22a 100644 --- a/out/out.ViewDocument.php +++ b/out/out.ViewDocument.php @@ -77,6 +77,7 @@ if($view) { $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('pdfConverters', isset($settings->_converters['pdf']) ? $settings->_converters['pdf'] : array()); $view->setParam('showFullPreview', $settings->_showFullPreview); + $view->setParam('showtree', showtree()); $view->setParam('convertToPdf', $settings->_convertToPdf); $view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : ""); $view->setParam('timeout', $settings->_cmdTimeout); From e830477bf0101d67b1f35890ab08b3927fcd1a80 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 21 Jan 2020 08:11:03 +0100 Subject: [PATCH 353/467] new method getPreviewFile(), start version 1.13.0 --- SeedDMS_Preview/Preview/Base.php | 31 ++++++++++++++++++------ SeedDMS_Preview/Preview/PdfPreviewer.php | 2 ++ SeedDMS_Preview/Preview/Previewer.php | 2 ++ SeedDMS_Preview/package.xml | 26 ++++++++++++++++---- 4 files changed, 48 insertions(+), 13 deletions(-) diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php index da153b305..f34359e7e 100644 --- a/SeedDMS_Preview/Preview/Base.php +++ b/SeedDMS_Preview/Preview/Base.php @@ -50,6 +50,12 @@ class SeedDMS_Preview_Base { */ protected $xsendfile; + /** + * @var string $lastpreviewfile will be set to the file name of the last preview + * @access protected + */ + protected $lastpreviewfile; + function __construct($previewDir, $timeout=5, $xsendfile=true) { /* {{{ */ if(!is_dir($previewDir)) { if (!SeedDMS_Core_File::makeDir($previewDir)) { @@ -154,14 +160,14 @@ class SeedDMS_Preview_Base { return array_key_exists($mimetype, $this->converters) && $this->converters[$mimetype]; } /* }}} */ -/** - * Send a file from disk to the browser - * - * This function uses either readfile() or the xѕendfile apache module if - * it is installed. - * - * @param string $filename - */ + /** + * Send a file from disk to the browser + * + * This function uses either readfile() or the xѕendfile apache module if + * it is installed. + * + * @param string $filename + */ protected function sendFile($filename) { /* {{{ */ if($this->xsendfile && function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) { header("X-Sendfile: ".$filename); @@ -173,5 +179,14 @@ class SeedDMS_Preview_Base { readfile($filename); } } /* }}} */ + + /** + * Return path of last created preview file + * + * @return string + */ + public function getPreviewFile() { /* {{{ */ + return $this->lastpreviewfile; + } /* }}} */ } diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php index daae6a4ed..d4cc0b477 100644 --- a/SeedDMS_Preview/Preview/PdfPreviewer.php +++ b/SeedDMS_Preview/Preview/PdfPreviewer.php @@ -96,6 +96,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base { return false; if(!$target) $target = $this->previewDir.$dir.md5($infile); + $this->lastpreviewfile = $target.'.png'; if($target != '' && (!file_exists($target.'.pdf') || filectime($target.'.pdf') < filectime($infile))) { $cmd = ''; $mimeparts = explode('/', $mimetype, 2); @@ -110,6 +111,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base { try { self::execWithTimeout($cmd, $this->timeout); } catch(Exception $e) { + $this->lastpreviewfile = ''; return false; } } diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php index 9e2fe2a34..ba69b75a4 100644 --- a/SeedDMS_Preview/Preview/Previewer.php +++ b/SeedDMS_Preview/Preview/Previewer.php @@ -105,6 +105,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base { return false; if(!$target) $target = $this->previewDir.$dir.md5($infile).'-'.$width; + $this->lastpreviewfile = $target.'.png'; if($target != '' && (!file_exists($target.'.png') || filectime($target.'.png') < filectime($infile))) { $cmd = ''; $mimeparts = explode('/', $mimetype, 2); @@ -120,6 +121,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base { try { self::execWithTimeout($cmd, $this->timeout); } catch(Exception $e) { + $this->lastpreviewfile = ''; return false; } } diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml index 753cf4768..aa4a3992f 100644 --- a/SeedDMS_Preview/package.xml +++ b/SeedDMS_Preview/package.xml @@ -11,11 +11,11 @@ uwe@steinmann.cx yes - 2019-02-11 + 2020-01-21 - 1.2.10 - 1.2.10 + 1.3.0 + 1.3.0 stable @@ -23,8 +23,7 @@ GPL License -new parameter for enabling/disabling xsendfile -fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent +add new methode getPreviewFile() @@ -404,5 +403,22 @@ make sure list of converters is always an array usage of mod_sendfile can be configured + + 2019-02-11 + + + 1.2.10 + 1.2.10 + + + stable + stable + + GPL License + +new parameter for enabling/disabling xsendfile +fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent + + From 069b0b2459625ea679bda8b0135345234e95c04f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 21 Jan 2020 18:26:18 +0100 Subject: [PATCH 354/467] fix text when loading changelog --- views/bootstrap/class.ExtensionMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 1a7f2909c..a7a79a062 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -354,7 +354,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {

          -

          +

          From 4e19b003e5fe740f411723e766cc5ab95f747e44 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Jan 2020 14:26:43 +0100 Subject: [PATCH 355/467] fix typo in variable name --- utils/xmlimport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/xmlimport.php b/utils/xmlimport.php index 08299948a..f429dfd80 100644 --- a/utils/xmlimport.php +++ b/utils/xmlimport.php @@ -796,7 +796,7 @@ function insert_folder($folder) { /* {{{ */ if(in_array('folders', $sections)) { if(!array_key_exists($folder['attributes']['owner'], $objmap['users'])) { $logger->warning("Owner of folder cannot be mapped using default user"); - $owner = $defaultuser; + $owner = $defaultUser; } else { $owner = $dms->getUser($objmap['users'][(int) $folder['attributes']['owner']]); } From 8615f75ac5d9f1568203677b8961a45c6020d239 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Jan 2020 14:27:56 +0100 Subject: [PATCH 356/467] use translation --- views/bootstrap/class.LogManagement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php index 75b23e3e4..b10156f6d 100644 --- a/views/bootstrap/class.LogManagement.php +++ b/views/bootstrap/class.LogManagement.php @@ -142,7 +142,7 @@ $(document).ready( function() {
          From 2b685a835e5f6cc05ed3e31aa5e6cbd27fe5b996 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 Feb 2020 11:34:42 +0100 Subject: [PATCH 368/467] include new Iterator class --- SeedDMS_Core/Core.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SeedDMS_Core/Core.php b/SeedDMS_Core/Core.php index ada1eb394..13cf1d142 100644 --- a/SeedDMS_Core/Core.php +++ b/SeedDMS_Core/Core.php @@ -95,3 +95,8 @@ require_once('Core/inc.AccessUtils.php'); * @uses SeedDMS_File */ require_once('Core/inc.FileUtils.php'); + +/** + * @uses SeedDMS_File + */ +require_once('Core/inc.ClassIterator.php'); From 8f041cb072efa353f493cab4cf4111569aae0a93 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 Feb 2020 12:02:02 +0100 Subject: [PATCH 369/467] add cmpVersion() function, make _number and _banner const --- inc/inc.Version.php | 75 +++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/inc/inc.Version.php b/inc/inc.Version.php index bd2c1d827..c4a50edfa 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -18,34 +18,69 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -class SeedDMS_Version { +class SeedDMS_Version { /* {{{ */ - public $_number = "5.1.14"; - private $_string = "SeedDMS"; + const _number = "5.1.14"; + const _string = "SeedDMS"; function __construct() { } - function version() { - return $this->_number; - } + function version() { /* {{{ */ + return self::_number; + } /* }}} */ - function majorVersion() { - $tmp = explode('.', $this->_number, 3); + function majorVersion() { /* {{{ */ + $tmp = explode('.', self::_number, 3); return (int) $tmp[0]; - } + } /* }}} */ - function minorVersion() { - $tmp = explode('.', $this->_number, 3); + function minorVersion() { /* {{{ */ + $tmp = explode('.', self::_number, 3); return (int) $tmp[1]; + } /* }}} */ + + function subminorVersion() { /* {{{ */ + $tmp = explode('.', self::_number, 3); + return (int) $tmp[2]; + } /* }}} */ + + function banner() { /* {{{ */ + return self::_string .", ". self::_number; } - function subminorVersion() { - $tmp = explode('.', $this->_number, 3); - return (int) $tmp[2]; - } - function banner() { - return $this->_string .", ". $this->_number; - } -} -?> + /** + * Compare two version + * + * This functions compares the current version in the format x.x.x with + * the passed version + * + * @param string $ver + * @return int -1 if _number < $ver, 0 if _number == $ver, 1 if _number > $ver + */ + static public function cmpVersion($ver) { /* {{{ */ + $tmp1 = explode('.', self::_number); + $tmp2 = explode('.', $ver); + if(intval($tmp1[0]) < intval($tmp2[0])) { + return -1; + } elseif(intval($tmp1[0]) > intval($tmp2[0])) { + return 1; + } else { + if(intval($tmp1[1]) < intval($tmp2[1])) { + return -1; + } elseif(intval($tmp1[1]) > intval($tmp2[1])) { + return 1; + } else { + if(intval($tmp1[2]) < intval($tmp2[2])) { + return -1; + } elseif(intval($tmp1[2]) > intval($tmp2[2])) { + return 1; + } else { + return 0; + } + } + } + } /* }}} */ + +} /* }}} */ + From 3e9d2dc695bcd2032c64f0e8b4644a9b3cc9e554 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 Feb 2020 17:01:00 +0100 Subject: [PATCH 370/467] get read access list for receipt workflow --- views/bootstrap/class.CheckInDocument.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php index b912c24d7..8589abc45 100644 --- a/views/bootstrap/class.CheckInDocument.php +++ b/views/bootstrap/class.CheckInDocument.php @@ -608,6 +608,7 @@ $(document).ready(function() { getReadAccessList(); ?> From 9672f19bc40a894cb3d2d519561871c093a4d74f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 Feb 2020 17:01:26 +0100 Subject: [PATCH 371/467] call new hook checkOutInfo --- views/bootstrap/class.ViewDocument.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 554efc52d..b339eecf8 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -205,7 +205,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $checkoutdir = $this->params['checkOutDir']; $this->contentHeading(getMLText("document_infos")); - if($info = $document->getCheckOutInfo()) { + $txt = $this->callHook('checkOutInfo', $document); + if(is_string($txt)) { + echo $txt; + } elseif($info = $document->getCheckOutInfo()) { echo "
          "; $session = $this->params['session']; if($session->getSu()) { From 21ca19df3b379479712484d9da67d2719cd543b1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 Feb 2020 18:40:03 +0100 Subject: [PATCH 372/467] fix update of sqlite3 the old code had various left overs --- install/update-5.1.0/update-sqlite3.sql | 100 ++++++++++++------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql index ac2c192a7..ed9b14600 100644 --- a/install/update-5.1.0/update-sqlite3.sql +++ b/install/update-5.1.0/update-sqlite3.sql @@ -1,34 +1,32 @@ BEGIN; -ALTER TABLE `tblVersion` RENAME TO `__tblVersion`; - -CREATE TABLE `tblVersion` ( +CREATE TABLE `new_tblVersion` ( `date` TEXT default NULL, `major` INTEGER, `minor` INTEGER, `subminor` INTEGER ); -INSERT INTO `tblVersion` SELECT * FROM `__tblVersion`; +INSERT INTO `new_tblVersion` SELECT * FROM `tblVersion`; -DROP TABLE `__tblVersion`; +DROP TABLE `tblVersion`; -ALTER TABLE `tblUserImages` RENAME TO `__tblUserImages`; +ALTER TABLE `new_tblVersion` RENAME TO `tblVersion`; -CREATE TABLE `tblUserImages` ( +CREATE TABLE `new_tblUserImages` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE, `image` blob NOT NULL, `mimeType` varchar(100) NOT NULL default '' ); -INSERT INTO `tblUserImages` SELECT * FROM `__tblUserImages`; +INSERT INTO `new_tblUserImages` SELECT * FROM `tblUserImages`; -DROP TABLE `__tblUserImages`; +DROP TABLE `tblUserImages`; -ALTER TABLE `tblDocumentContent` RENAME TO `__tblDocumentContent`; +ALTER TABLE `new_tblUserImages` RENAME TO `tblUserImages`; -CREATE TABLE `tblDocumentContent` ( +CREATE TABLE `new_tblDocumentContent` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `document` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`), `version` INTEGER unsigned NOT NULL, @@ -44,13 +42,13 @@ CREATE TABLE `tblDocumentContent` ( UNIQUE (`document`,`version`) ); -INSERT INTO `tblDocumentContent` SELECT * FROM `__tblDocumentContent`; +INSERT INTO `new_tblDocumentContent` SELECT * FROM `tblDocumentContent`; -DROP TABLE `__tblDocumentContent`; +DROP TABLE `tblDocumentContent`; -ALTER TABLE `tblDocumentFiles` RENAME TO `__tblDocumentFiles`; +ALTER TABLE `new_tblDocumentContent` RENAME TO `tblDocumentContent`; -CREATE TABLE `tblDocumentFiles` ( +CREATE TABLE `new_tblDocumentFiles` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `document` INTEGER NOT NULL default 0 REFERENCES `tblDocuments` (`id`), `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`), @@ -63,17 +61,17 @@ CREATE TABLE `tblDocumentFiles` ( `mimeType` varchar(100) NOT NULL default '' ) ; -INSERT INTO `tblDocumentFiles` SELECT * FROM `__tblDocumentFiles`; +INSERT INTO `new_tblDocumentFiles` SELECT * FROM `tblDocumentFiles`; -DROP TABLE `__tblDocumentFiles`; +DROP TABLE `tblDocumentFiles`; + +ALTER TABLE `new_tblDocumentFiles` RENAME TO `tblDocumentFiles`; ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` INTEGER unsigned NOT NULL DEFAULT '0'; ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` INTEGER unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `tblUsers` RENAME TO `__tblUsers`; - -CREATE TABLE `tblUsers` ( +CREATE TABLE `new_tblUsers` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `login` varchar(50) default NULL, `pwd` varchar(50) default NULL, @@ -92,39 +90,39 @@ CREATE TABLE `tblUsers` ( UNIQUE (`login`) ); -INSERT INTO `tblUsers` SELECT * FROM `__tblUsers`; +INSERT INTO `new_tblUsers` SELECT * FROM `tblUsers`; -DROP TABLE `__tblUsers`; +DROP TABLE `tblUsers`; -ALTER TABLE `tblUserPasswordRequest` RENAME TO `__tblUserPasswordRequest`; +ALTER TABLE `new_tblUsers` RENAME TO `tblUsers`; -CREATE TABLE `tblUserPasswordRequest` ( +CREATE TABLE `new_tblUserPasswordRequest` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE, `hash` varchar(50) default NULL, `date` TEXT NOT NULL ); -INSERT INTO `tblUserPasswordRequest` SELECT * FROM `__tblUserPasswordRequest`; +INSERT INTO `new_tblUserPasswordRequest` SELECT * FROM `tblUserPasswordRequest`; -DROP TABLE `__tblUserPasswordRequest`; +DROP TABLE `tblUserPasswordRequest`; -ALTER TABLE `tblUserPasswordHistory` RENAME TO `__tblUserPasswordHistory`; +ALTER TABLE `new_tblUserPasswordRequest` RENAME TO `tblUserPasswordRequest`; -CREATE TABLE `tblUserPasswordHistory` ( +CREATE TABLE `new_tblUserPasswordHistory` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE, `pwd` varchar(50) default NULL, `date` TEXT NOT NULL ); -INSERT INTO `tblUserPasswordHistory` SELECT * FROM `__tblUserPasswordHistory`; +INSERT INTO `new_tblUserPasswordHistory` SELECT * FROM `tblUserPasswordHistory`; -DROP TABLE `__tblUserPasswordHistory`; +DROP TABLE `tblUserPasswordHistory`; -ALTER TABLE `tblDocumentReviewLog` RENAME TO `__tblDocumentReviewLog`; +ALTER TABLE `new_tblUserPasswordHistory` RENAME TO `tblUserPasswordHistory`; -CREATE TABLE `tblDocumentReviewLog` ( +CREATE TABLE `new_tblDocumentReviewLog` ( `reviewLogID` INTEGER PRIMARY KEY AUTOINCREMENT, `reviewID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentReviewers` (`reviewID`) ON DELETE CASCADE, `status` INTEGER NOT NULL default 0, @@ -133,13 +131,13 @@ CREATE TABLE `tblDocumentReviewLog` ( `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE ); -INSERT INTO `tblDocumentReviewLog` SELECT * FROM `__tblDocumentReviewLog`; +INSERT INTO `new_tblDocumentReviewLog` SELECT * FROM `tblDocumentReviewLog`; -DROP TABLE `__tblDocumentReviewLog`; +DROP TABLE `tblDocumentReviewLog`; -ALTER TABLE `tblDocumentStatusLog` RENAME TO `__tblDocumentStatusLog`; +ALTER TABLE `new_tblDocumentReviewLog` RENAME TO `tblDocumentReviewLog`; -CREATE TABLE `tblDocumentStatusLog` ( +CREATE TABLE `new_tblDocumentStatusLog` ( `statusLogID` INTEGER PRIMARY KEY AUTOINCREMENT, `statusID` INTEGER NOT NULL default '0' REFERENCES `tblDocumentStatus` (`statusID`) ON DELETE CASCADE, `status` INTEGER NOT NULL default '0', @@ -148,13 +146,13 @@ CREATE TABLE `tblDocumentStatusLog` ( `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE ) ; -INSERT INTO `tblDocumentStatusLog` SELECT * FROM `__tblDocumentStatusLog`; +INSERT INTO `new_tblDocumentStatusLog` SELECT * FROM `tblDocumentStatusLog`; -DROP TABLE `__tblDocumentStatusLog`; +DROP TABLE `tblDocumentStatusLog`; -ALTER TABLE `tblDocumentApproveLog` RENAME TO `__tblDocumentApproveLog`; +ALTER TABLE `new_tblDocumentStatusLog` RENAME TO `tblDocumentStatusLog`; -CREATE TABLE `tblDocumentApproveLog` ( +CREATE TABLE `new_tblDocumentApproveLog` ( `approveLogID` INTEGER PRIMARY KEY AUTOINCREMENT, `approveID` INTEGER NOT NULL default '0' REFERENCES `tblDocumentApprovers` (`approveID`) ON DELETE CASCADE, `status` INTEGER NOT NULL default '0', @@ -163,13 +161,13 @@ CREATE TABLE `tblDocumentApproveLog` ( `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE ); -INSERT INTO `tblDocumentApproveLog` SELECT * FROM `__tblDocumentApproveLog`; +INSERT INTO `new_tblDocumentApproveLog` SELECT * FROM `tblDocumentApproveLog`; -DROP TABLE `__tblDocumentApproveLog`; +DROP TABLE `tblDocumentApproveLog`; -ALTER TABLE `tblWorkflowLog` RENAME TO `__tblWorkflowLog`; +ALTER TABLE `new_tblDocumentApproveLog` RENAME TO `tblDocumentApproveLog`; -CREATE TABLE `tblWorkflowLog` ( +CREATE TABLE `new_tblWorkflowLog` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, `version` INTEGER default NULL, @@ -180,13 +178,13 @@ CREATE TABLE `tblWorkflowLog` ( `comment` text ); -INSERT INTO `tblWorkflowLog` SELECT * FROM `__tblWorkflowLog`; +INSERT INTO `new_tblWorkflowLog` SELECT * FROM `tblWorkflowLog`; -DROP TABLE `__tblWorkflowLog`; +DROP TABLE `tblWorkflowLog`; -ALTER TABLE `tblWorkflowDocumentContent` RENAME TO `__tblWorkflowDocumentContent`; +ALTER TABLE `new_tblWorkflowLog` RENAME TO `tblWorkflowLog`; -CREATE TABLE `tblWorkflowDocumentContent` ( +CREATE TABLE `new_tblWorkflowDocumentContent` ( `parentworkflow` INTEGER DEFAULT 0, `workflow` INTEGER DEFAULT NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE, `document` INTEGER DEFAULT NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, @@ -195,9 +193,11 @@ CREATE TABLE `tblWorkflowDocumentContent` ( `date` datetime NOT NULL ); -INSERT INTO `tblWorkflowDocumentContent` SELECT * FROM `__tblWorkflowDocumentContent`; +INSERT INTO `new_tblWorkflowDocumentContent` SELECT * FROM `tblWorkflowDocumentContent`; -DROP TABLE `__tblWorkflowDocumentContent`; +DROP TABLE `tblWorkflowDocumentContent`; + +ALTER TABLE `new_tblWorkflowDocumentContent` RENAME TO `tblWorkflowDocumentContent`; UPDATE tblVersion set major=5, minor=1, subminor=0; From 7f5908bcf83e1b62e09769ca974c2c27df5ef5a6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 Feb 2020 19:01:25 +0100 Subject: [PATCH 373/467] add missing ` around names --- install/create_tables-sqlite3.sql | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql index 2eff9a797..42be5dcee 100644 --- a/install/create_tables-sqlite3.sql +++ b/install/create_tables-sqlite3.sql @@ -163,7 +163,7 @@ CREATE TABLE `tblFolderAttributes` ( `folder` INTEGER default NULL REFERENCES `tblFolders` (`id`) ON DELETE CASCADE, `attrdef` INTEGER default NULL REFERENCES `tblAttributeDefinitions` (`id`), `value` text default NULL, - UNIQUE (folder, attrdef) + UNIQUE (`folder`, `attrdef`) ) ; -- -------------------------------------------------------- @@ -199,7 +199,7 @@ CREATE TABLE `tblDocumentAttributes` ( `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, `attrdef` INTEGER default NULL REFERENCES `tblAttributeDefinitions` (`id`), `value` text default NULL, - UNIQUE (document, attrdef) + UNIQUE (`document`, `attrdef`) ) ; -- -------------------------------------------------------- @@ -268,7 +268,7 @@ CREATE TABLE `tblDocumentContentAttributes` ( `content` INTEGER default NULL REFERENCES `tblDocumentContent` (`id`) ON DELETE CASCADE, `attrdef` INTEGER default NULL REFERENCES `tblAttributeDefinitions` (`id`), `value` text default NULL, - UNIQUE (content, attrdef) + UNIQUE (`content`, `attrdef`) ) ; -- -------------------------------------------------------- @@ -710,7 +710,7 @@ CREATE TABLE `tblWorkflowLog` ( CREATE TABLE `tblWorkflowMandatoryWorkflow` ( `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE, `workflow` INTEGER default NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE, - UNIQUE(userid, workflow) + UNIQUE(`userid`, `workflow`) ) ; -- -------------------------------------------------------- @@ -719,7 +719,7 @@ CREATE TABLE `tblWorkflowMandatoryWorkflow` ( -- Table structure for transmittal -- -CREATE TABLE tblTransmittals ( +CREATE TABLE `tblTransmittals` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` text NOT NULL, `comment` text NOT NULL, @@ -740,7 +740,7 @@ CREATE TABLE `tblTransmittalItems` ( `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, `version` INTEGER unsigned NOT NULL default '0', `date` TEXT default NULL, - UNIQUE (transmittal, document, version) + UNIQUE (`transmittal`, `document`, `version`) ); -- -------------------------------------------------------- @@ -786,7 +786,7 @@ CREATE TABLE `tblArosAcos` ( `read` INTEGER NOT NULL DEFAULT '-1', `update` INTEGER NOT NULL DEFAULT '-1', `delete` INTEGER NOT NULL DEFAULT '-1', - UNIQUE (aco, aro) + UNIQUE (`aco`, `aro`) ) ; -- -------------------------------------------------------- @@ -830,7 +830,7 @@ CREATE TABLE `tblVersion` ( INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1); INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2); INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0); -INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0); -INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0); -INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0); -INSERT INTO tblVersion VALUES (DATETIME(), 6, 0, 0); +INSERT INTO `tblUsers` VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0); +INSERT INTO `tblUsers` VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0); +INSERT INTO `tblFolders` VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0); +INSERT INTO `tblVersion` VALUES (DATETIME(), 6, 0, 0); From a97114b77d3c8d2dc6c6bf67c7988e3702776559 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 Feb 2020 19:01:46 +0100 Subject: [PATCH 374/467] fix update --- install/update-6.0.0/update-sqlite3.sql | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql index 3c4996a3b..3bcaabe61 100644 --- a/install/update-6.0.0/update-sqlite3.sql +++ b/install/update-6.0.0/update-sqlite3.sql @@ -31,11 +31,11 @@ CREATE TABLE `new_tblWorkflowLog` ( INSERT INTO `new_tblWorkflowLog` (`id`, `workflowdocumentcontent`, `userid`, `transition`, `date`, `comment`) SELECT `a`.`id`, `b`.`id`, `a`.`userid`, `a`.`transition`, `a`.`date`, `a`.`comment` FROM `tblWorkflowLog` `a` LEFT JOIN `new_tblWorkflowDocumentContent` `b` ON `a`.`document`=`b`.`document` AND `a`.`version`=`b`.`version` AND `a`.`workflow`=`b`.`workflow` WHERE `b`.`document` IS NOT NULL; -ALTER TABLE `tblWorkflowLog` RENAME TO `old_tblWorkflowLog`; +DROP TABLE `tblWorkflowLog`; ALTER TABLE `new_tblWorkflowLog` RENAME TO `tblWorkflowLog`; -ALTER TABLE `tblWorkflowDocumentContent` RENAME TO `old_tblWorkflowDocumentContent`; +DROP TABLE `tblWorkflowDocumentContent`; ALTER TABLE `new_tblWorkflowDocumentContent` RENAME TO `tblWorkflowDocumentContent`; @@ -150,7 +150,7 @@ CREATE TABLE `new_tblUsers` ( INSERT INTO new_tblUsers SELECT * FROM tblUsers; -ALTER TABLE tblUsers RENAME TO old_tblUsers; +DROP TABLE tblUsers; ALTER TABLE new_tblUsers RENAME TO tblUsers; @@ -204,8 +204,3 @@ UPDATE tblVersion set major=6, minor=0, subminor=0; COMMIT; -DROP TABLE `old_tblUsers`; - -DROP TABLE `old_tblWorkflowLog`; - -DROP TABLE `old_tblWorkflowDocumentContent`; From cab1d128ca63fcf38c3c24ceefc237e5d12d373b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 7 Feb 2020 07:33:39 +0100 Subject: [PATCH 375/467] new item for 5.1.14 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 92cbb070f..d21cdff07 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ - fix renaming of folders via webdav - fix list of expired documents on MyDocuments page - pass showtree to ViewDocument (Closes: #462) +- fix upgrade script for sqlite3 -------------------------------------------------------------------------------- Changes in version 5.1.13 From d92c3afd5698a36fdbd98d2564f4c62f76a2fa5c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 7 Feb 2020 08:57:02 +0100 Subject: [PATCH 376/467] remove closing php tag --- ext/example/class.example.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/ext/example/class.example.php b/ext/example/class.example.php index af5b8eee9..7d19e4338 100644 --- a/ext/example/class.example.php +++ b/ext/example/class.example.php @@ -181,5 +181,3 @@ class SeedDMS_ExtExample_Task { public function execute() { } } - -?> From 30ca5c71cdfe8a28687a4bb88685e95ba686465d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 11 Feb 2020 07:45:30 +0100 Subject: [PATCH 377/467] new method SeedDMS_Document_Content::repair, restore old getPath() behaviour getPath() didn't return a single '.' in the fileType --- SeedDMS_Core/Core/inc.ClassDocument.php | 48 +++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index e932e0ada..492061637 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -1667,7 +1667,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if($fileType == '.') $fileType = ''; - /* Check if $user, $orgFileName, $fileType and $mimetype are the same */ + /* Check if $user, $orgFileName, $fileType and $mimeType are the same */ if($user->getID() != $content->getUser()->getID()) { return false; } @@ -2909,7 +2909,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * * @return string path of file on disc */ - function getPath() { return $this->_document->getDir() . $this->_version . ($this->_fileType != '.' ? $this->_fileType : ''); } + function getPath() { return $this->_document->getDir() . $this->_version . $this->_fileType; } function setDate($date = false) { /* {{{ */ $db = $this->_document->getDMS()->getDB(); @@ -4824,6 +4824,50 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return $needwkflaction; } /* }}} */ + /** + * Checks the internal data of the document version and repairs it. + * Currently, this function only repairs a missing filetype + * + * @return boolean true on success, otherwise false + */ + function repair() { /* {{{ */ + $dms = $this->_document->getDMS(); + $db = $this->_dms->getDB(); + + if(file_exists($this->_dms->contentDir.$this->_document->getDir() . $this->_version . $this->_fileType)) { + if(strlen($this->_fileType) < 2) { + switch($this->_mimeType) { + case "application/pdf": + case "image/png": + case "image/gif": + case "image/jpg": + $expect = substr($this->_mimeType, -3, 3); + if($this->_fileType != '.'.$expect) { + $db->startTransaction(); + $queryStr = "UPDATE `tblDocumentContent` SET `fileType`='.".$expect."' WHERE `id` = ". $this->_id; + echo $queryStr."
          "; + $res = $db->getResult($queryStr); + if ($res) { + if(!SeedDMS_Core_File::renameFile($this->_dms->contentDir.$this->_document->getDir() . $this->_version . $this->_fileType, $this->_dms->contentDir.$this->_document->getDir() . $this->_version . '.' . $expect)) { + $db->rollbackTransaction(); + } else { + $db->commitTransaction(); + } + } else { + $db->rollbackTransaction(); + } + } + break; + } + } + } elseif(file_exists($this->_document->getDir() . $this->_version . '.')) { + echo "no file"; + } else { + echo $this->_dms->contentDir.$this->_document->getDir() . $this->_version . $this->_fileType; + } + return true; + } /* }}} */ + } /* }}} */ From a5bf963bc59cc7f99515eab60dd7a0bf37878356 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 11 Feb 2020 07:47:33 +0100 Subject: [PATCH 378/467] add check for mismatch of fileType and mimeType works only for some common mimetypes --- out/out.ObjectCheck.php | 5 + views/bootstrap/class.ObjectCheck.php | 144 +++++++++++++------------- 2 files changed, 78 insertions(+), 71 deletions(-) diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index 37cad7348..5406f06fc 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -88,7 +88,12 @@ if($view) { $view->setParam('setfilesize', $setfilesize); $view->setParam('setchecksum', $setchecksum); $view->setParam('repair', $repair); + $view->setParam('showtree', showtree()); $view->setParam('rootfolder', $rootfolder); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); + $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('xsendfile', $settings->_enableXsendfile); $view($_GET); exit; } diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index eaede317c..5585f9c85 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -18,6 +18,11 @@ */ require_once("class.Bootstrap.php"); +/** + * Include class to preview documents + */ +require_once("SeedDMS/Preview.php"); + /** * Class which outputs the html page for ObjectCheck view * @@ -31,7 +36,7 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { - function tree($dms, $folder, $repair, $path=':', $indent='') { /* {{{ */ + function tree($dms, $folder, $previewer, $repair, $path=':', $indent='') { /* {{{ */ global $user; /* Don't do folderlist check for root folder */ @@ -51,11 +56,11 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $owner = $folder->getOwner(); print "".htmlspecialchars($owner->getFullName()).""; print "Folder path contains cyclic relation"; + echo ""; if($repair) { - print "".getMLText('repaired')."\n"; - } else { - print "\n"; + print "".getMLText('repaired')."\n"; } + echo ""; print "\n"; } $folderList = $folder->getFolderList(); @@ -74,19 +79,19 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $owner = $folder->getOwner(); print "".htmlspecialchars($owner->getFullName()).""; print "Folderlist is '".$folderList."', should be '".$path."'"; + echo ""; if($repair) { $folder->repair(); - print "".getMLText('repaired')."\n"; - } else { - print "\n"; + print "".getMLText('repaired')."\n"; } + echo ""; print "\n"; } } $subfolders = $folder->getSubFolders(); foreach($subfolders as $subfolder) { - $this->tree($dms, $subfolder, $repair, $path.$folder->getId().':', $indent.' '); + $this->tree($dms, $subfolder, $previewer, $repair, $path.$folder->getId().':', $indent.' '); } $path .= $folder->getId().':'; $documents = $folder->getDocuments(); @@ -109,12 +114,12 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $owner = $document->getOwner(); print "".htmlspecialchars($owner->getFullName()).""; print "Folderlist is '".$folderList."', should be '".$path."'"; + echo ""; if($repair) { $document->repair(); - print "".getMLText('repaired')."\n"; - } else { - print "\n"; + print "".getMLText('repaired')."\n"; } + echo ""; print "\n"; } @@ -124,63 +129,48 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { foreach($versions as $version) { $filepath = $dms->contentDir . $version->getPath(); if(!file_exists($filepath)) { - print "\n"; - print "getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">"; - print "getID()."\">getMimeIcon($version->getFileType())."\" title=\"".$version->getMimeType()."\">"; - print "getID()."\">/"; - $folder = $document->getFolder(); - $tmppath = $folder->getPath(); - for ($i = 1; $i < count($tmppath); $i++) { - print htmlspecialchars($tmppath[$i]->getName())."/"; + echo $this->documentListRowStart($document); + echo $this->documentListRow($document, $previewer, true, $version->getVersion()); + print "Document content of version ".$version->getVersion()." is missing ('".$path."')"; + echo ""; + if($repair) { + print "Cannot be repaired\n"; + } + echo ""; + echo $this->documentListRowEnd($document); } - print htmlspecialchars($document->getName()); - print ""; - $owner = $document->getOwner(); - print "".htmlspecialchars($owner->getFullName()).""; - print "Document content of version ".$version->getVersion()." is missing ('".$path."')"; - if($repair) { - print "Cannot repaired\n"; - } else { - print "\n"; - } - echo ""; - echo "
          "; - if($document->getAccessMode($user) >= M_ALL) { - echo $this->printDeleteDocumentButton($document, 'splash_rm_document', true); - } else { - echo ''; - } - if($document->getAccessMode($user) >= M_READWRITE) { - print ''; - } else { - print ''; - } - if($document->getAccessMode($user) >= M_READWRITE) { - print $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true); - } - if($this->enableClipboard) { - print ''; - } - echo "
          "; - echo ""; - print "\n"; + $mimetype = $version->getMimeType(); + $filetype = $version->getFileType(); + if(strlen($filetype) < 2) { + switch($mimetype) { + case "application/pdf": + case "image/png": + case "image/gif": + case "image/jpg": + $expect = substr($mimetype, -3, 3); + if($filetype != '.'.$expect) { + $this->needsrepair = true; + echo $this->documentListRowStart($document); + echo $this->documentListRow($document, $previewer, true, $version->getVersion()); + echo ".".$expect." != ".$filetype.""; + echo ""; + if($repair) { + $version->repair(); + echo "".getMLText('repaired').""; + } + echo ""; + echo $this->documentListRowEnd($document); + } + break; + } } } } else { - print "\n"; - print "\n"; - print "getID()."\">/"; - $folder = $document->getFolder(); - $tmppath = $folder->getPath(); - for ($i = 1; $i < count($tmppath); $i++) { - print htmlspecialchars($tmppath[$i]->getName())."/"; - } - print htmlspecialchars($document->getName()); - print ""; - $owner = $document->getOwner(); - print "".htmlspecialchars($owner->getFullName()).""; - print "Document has no content! Delete the document manually."; - print "\n"; + echo $this->documentListRowStart($document); + echo $this->documentListRow($document, $previewer, true); + echo "Document has no content! Delete the document manually."; + echo ""; + echo $this->documentListRowEnd($document); } } } /* }}} */ @@ -212,6 +202,14 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $setchecksum = $this->params['setchecksum']; $rootfolder = $this->params['rootfolder']; $this->enableClipboard = $this->params['enableclipboard']; + $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewConverters']; + $timeout = $this->params['timeout']; + $xsendfile = $this->params['xsendfile']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); + $previewer->setConverters($previewconverters); $this->htmlAddHeader(''."\n", 'js'); @@ -230,17 +228,17 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { print "\n"; print "".getMLText("name")."\n"; print "".getMLText("owner")."\n"; - print "".getMLText("error")."\n"; print "\n"; + print "".getMLText("error")."\n"; print "\n\n\n"; $this->needsrepair = false; - $this->tree($dms, $folder, $repair); + $this->tree($dms, $folder, $previewer, $repair); print "\n"; + $this->contentContainerEnd(); if($this->needsrepair && $repair == 0) { - echo '

          '.getMLText('do_object_repair').'

          '; + echo '

          '.getMLText('do_object_repair').'

          '; } - $this->contentContainerEnd(); if($unlinkedfolders) { $this->contentHeading(getMLText("unlinked_folders")); @@ -250,8 +248,8 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { print "".getMLText("name")."\n"; print "".getMLText("id")."\n"; print "".getMLText("parent")."\n"; - print "".getMLText("error")."\n"; print "\n"; + print "".getMLText("error")."\n"; print "\n\n\n"; foreach($unlinkedfolders as $error) { echo ""; @@ -336,10 +334,12 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { foreach($nofilesizeversions as $version) { $doc = $version->getDocument(); print "".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType().""; + echo ""; if($setfilesize) { if($version->setFileSize()) - echo "".getMLText('repaired').""; + echo getMLText('repaired'); } + echo ""; print "\n"; } print "\n"; @@ -365,10 +365,12 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { foreach($nochecksumversions as $version) { $doc = $version->getDocument(); print "".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType().""; + echo ""; if($setchecksum) { if($version->setChecksum()) - echo "".getMLText('repaired').""; + echo getMLText('repaired'); } + echo ""; print "\n"; } print "\n"; From 8b6d070a98a2c3fb0c2c3b79cc63e1b845491d16 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 12 Feb 2020 17:21:02 +0100 Subject: [PATCH 379/467] set proper name of last preview file --- SeedDMS_Preview/Preview/PdfPreviewer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php index d4cc0b477..6ce557810 100644 --- a/SeedDMS_Preview/Preview/PdfPreviewer.php +++ b/SeedDMS_Preview/Preview/PdfPreviewer.php @@ -96,7 +96,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base { return false; if(!$target) $target = $this->previewDir.$dir.md5($infile); - $this->lastpreviewfile = $target.'.png'; + $this->lastpreviewfile = $target.'.pdf'; if($target != '' && (!file_exists($target.'.pdf') || filectime($target.'.pdf') < filectime($infile))) { $cmd = ''; $mimeparts = explode('/', $mimetype, 2); From 3c3e814767a333b900d10f309809d525d9cdbbdc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 12 Feb 2020 19:14:06 +0100 Subject: [PATCH 380/467] disallow directory index --- .htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.htaccess b/.htaccess index 42ab85d6c..d83443d97 100644 --- a/.htaccess +++ b/.htaccess @@ -1,3 +1,5 @@ +Options -Indexes + RewriteEngine On RewriteRule ^favicon.ico$ styles/bootstrap/favicon.ico [L] From b2067ba974bae9ae5afe3a466eb849f63156122e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 08:23:08 +0100 Subject: [PATCH 381/467] updated arabic updates, minor other updates --- languages/ar_EG/lang.inc | 1944 +++++++++++++++++++------------------- languages/bg_BG/lang.inc | 10 + languages/ca_ES/lang.inc | 10 + languages/cs_CZ/lang.inc | 16 +- languages/de_DE/lang.inc | 12 +- languages/el_GR/lang.inc | 32 +- languages/en_GB/lang.inc | 12 +- languages/es_ES/lang.inc | 10 + languages/fr_FR/lang.inc | 42 +- languages/hr_HR/lang.inc | 10 + languages/hu_HU/lang.inc | 14 +- languages/it_IT/lang.inc | 20 +- languages/ko_KR/lang.inc | 10 + languages/lo_LA/lang.inc | 10 + languages/nl_NL/lang.inc | 10 + languages/pl_PL/lang.inc | 10 + languages/pt_BR/lang.inc | 10 + languages/ro_RO/lang.inc | 10 + languages/ru_RU/lang.inc | 10 + languages/sk_SK/lang.inc | 10 + languages/sv_SE/lang.inc | 10 + languages/tr_TR/lang.inc | 16 +- languages/uk_UA/lang.inc | 10 + languages/zh_CN/lang.inc | 10 + languages/zh_TW/lang.inc | 16 +- 25 files changed, 1262 insertions(+), 1012 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index f9f241f31..48d54b046 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -19,22 +19,22 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1311) +// Translators: Admin (2262) $text = array( -'2_factor_auth' => '', -'2_factor_auth_info' => '', +'2_factor_auth' => 'توثيق ذو عاملين', +'2_factor_auth_info' => 'معلومات عن توثيق ذو عاملين', '2_fact_auth_secret' => '', 'accept' => 'وافق', -'access_control' => '', -'access_control_is_off' => '', +'access_control' => 'صلاحيات الدخول', +'access_control_is_off' => 'صلاحيات الدخول غير مفعلة', 'access_denied' => 'دخول غير مصرح به.', 'access_inheritance' => 'صلاحيات موروثة', 'access_mode' => 'نوع الدخول', 'access_mode_all' => 'كل الصلاحيات', 'access_mode_none' => 'ممنوع الدخول', -'access_mode_read' => 'صلاحيات قراءة فقط', -'access_mode_readwrite' => 'صلاحيات القراء والكتابة', +'access_mode_read' => 'صلاحية القراءة فقط', +'access_mode_readwrite' => 'صلاحية القراءة والكتابة', 'access_permission_changed_email' => 'تم تغيير الصلاحيات', 'access_permission_changed_email_body' => 'تم تغيير الصلاحيات Document: [name] @@ -45,36 +45,36 @@ URL: [url]', 'according_settings' => 'اعدادات خاصة', 'action' => 'اجراء', 'actions' => 'اجراءات', -'action_approve' => 'موافقة', -'action_complete' => 'انهاء', -'action_is_complete' => 'تم انهاؤه', -'action_is_not_complete' => 'لم ينتهى بعد', -'action_reject' => 'رفض', -'action_review' => 'مراجعة', -'action_revise' => 'تنقيح', +'action_approve' => 'موافقةعلى الإجراء', +'action_complete' => 'انهاءالإجراء', +'action_is_complete' => 'تم انهاء الإجراء', +'action_is_not_complete' => 'الإجراء لم ينتهى بعد', +'action_reject' => 'رفض الإجراء', +'action_review' => 'مراجعة الإجراء', +'action_revise' => 'تعديل الإجراء', 'add' => 'إضافة', 'add_approval' => 'ادخال موافقة', -'add_attrdefgroup' => '', +'add_attrdefgroup' => 'إضافة اسم معرف المجموعة', 'add_document' => 'إضافة مستند', 'add_document_link' => 'إضافة رابط', -'add_document_notify' => 'ﺖﺨﺼﻴﺻ ﺎﺸﻋﺍﺭ', +'add_document_notify' => 'إضافة وثيقة إشعار', 'add_doc_reviewer_approver_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم تعيين مراجع او موافق للمستند', 'add_doc_workflow_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم اختيار مسار عمل للمستند', 'add_event' => 'إضافة حدث', -'add_group' => 'إضافة مجموعة جديدة', +'add_group' => 'اضف مجموعة جديدة', 'add_member' => 'إضافة عضو', 'add_multiple_documents' => 'إضافة مستندات عديدة', 'add_multiple_files' => 'إضافة مستندات عديدة - سيتم استخدام اسم الملف كاسم المستند', -'add_receipt' => '', +'add_receipt' => 'إضافة وصل', 'add_review' => 'بدأ المراجعة', -'add_revision' => '', -'add_role' => '', +'add_revision' => 'إضافة المراجعة', +'add_role' => 'إضافة دور', 'add_subfolder' => 'إضافة مجلد فرعي', -'add_task' => '', +'add_task' => 'إضافة مهمة', 'add_to_clipboard' => 'اضف الى لوحة القصاصات', -'add_to_transmittal' => '', -'add_transmittal' => '', -'add_user' => 'إضافة مستخدم', +'add_to_transmittal' => 'إضافة إلى الإحالة', +'add_transmittal' => 'إضافة إحالة', +'add_user' => 'أضف مستخدم', 'add_user_to_group' => 'إضافة مستخدم لمجموعة', 'add_workflow' => 'اضف مسار عمل جديد', 'add_workflow_action' => 'اضف اجراء جديد لمسار العمل', @@ -84,194 +84,194 @@ URL: [url]', 'all' => 'الكل', 'all_categories' => 'كل الاقسام', 'all_documents' => 'كل المستندات', -'all_pages' => 'الكل', +'all_pages' => 'كل الصفحات', 'all_users' => 'كل المستخدمين', 'already_subscribed' => 'بالفعل مشترك', 'and' => 'و', 'apply' => 'تطبيق', -'approvals_accepted' => '', +'approvals_accepted' => 'موافقةالطلب', 'approvals_accepted_latest' => '', -'approvals_and_reviews_accepted' => '', -'approvals_and_reviews_not_touched' => '', -'approvals_and_reviews_rejected' => '', -'approvals_not_touched' => '', +'approvals_and_reviews_accepted' => 'موافقة الطلب و مراجعته', +'approvals_and_reviews_not_touched' => 'موافقة الطلب ومراجعته غير ملموس', +'approvals_and_reviews_rejected' => 'رفض الطلب ومراجعته', +'approvals_not_touched' => 'موافقة الطلب غير ملموس', 'approvals_not_touched_latest' => '', -'approvals_rejected' => '', +'approvals_rejected' => 'طلب الموافقة مرفوض', 'approvals_rejected_latest' => '', -'approvals_without_group' => '', -'approvals_without_user' => '', -'approval_deletion_email' => 'طلب الموافقة تم الغاؤه', -'approval_deletion_email_body' => '', -'approval_deletion_email_subject' => '', -'approval_file' => '', +'approvals_without_group' => 'طلب الموافقة بلا مجموعة', +'approvals_without_user' => 'طلب الموافقة بلا مستخدم', +'approval_deletion_email' => 'تم إلغاء طلب الموافقة', +'approval_deletion_email_body' => 'طلب موافقة حذف البريد الإلكتروني', +'approval_deletion_email_subject' => 'طلب موافقة حذف موضوع البريد الإلكتروني', +'approval_file' => 'طلب موافقة الملف', 'approval_group' => 'مجموعة الموافقة', -'approval_log' => 'ﺲﺠﻟ ﺎﻠﻣﻭﺎﻔﻗﺓ', -'approval_request_email' => 'طلب الموافقة', +'approval_log' => 'سجل الموافقات', +'approval_request_email' => 'طلب الموافقة البريد الإلكتروني', 'approval_request_email_body' => 'طلب الموافقة Document: [name] Version: [version] Parent folder: [folder_path] User: [username] URL: [url]', -'approval_request_email_subject' => '[sitename]: [name] - طلب الموافقة', +'approval_request_email_subject' => '[sitename]: [name] - طلب موافقة موضوع البريد الإلكتروني', 'approval_status' => 'حالة الموافقة', -'approval_submit_email' => '', -'approval_submit_email_body' => '', +'approval_submit_email' => 'موافقة تقديم البريد الإلكتروني', +'approval_submit_email_body' => 'موافقة تقديم البريد الإلكتروني', 'approval_submit_email_subject' => '[sitename]: [name] - تم ارسال الموافقة', 'approval_summary' => 'ملخص الموافقة', 'approval_update_failed' => 'خطأ في تحديث حالة الموافقة. فشل التحديث.', 'approvers' => 'الموافقون', -'approver_already_assigned' => '', -'approver_already_removed' => '', +'approver_already_assigned' => 'تم تحديد الموافق', +'approver_already_removed' => 'تم حذف الموافق', 'april' => 'ابريل', -'archive' => '', +'archive' => 'إرشيف', 'archive_creation' => 'انشاء ارشيف', 'archive_creation_warning' => 'من خلال العملية التالية يمكنك انشاء ارشيف يحتوي على كل ملفات النظام. بعد انشاء الارشيف سيتم حفظه في ملف البيانات على السيرفر.
          تحذير: الارشيف الذي تم انشاؤه ليكون مقروء بواسطة المستخدم لن يكون نافعا كملف نسخ احتياطي للسيرفر', 'ar_EG' => 'العربية', 'assign_approvers' => 'تخصيص موافقون', -'assign_recipients' => '', +'assign_recipients' => 'تخصيص المستلمين', 'assign_reviewers' => 'تخصيص مراجعون', 'assign_user_property_to' => 'تخصيص خصائص المستخدم الى', 'assumed_released' => 'يعتبر تم نشره', -'attrdefgroup_management' => '', -'attrdefgrp_show_detail' => '', -'attrdefgrp_show_list' => '', -'attrdefgrp_show_search' => '', -'attrdefgrp_show_searchlist' => '', +'attrdefgroup_management' => 'معرف الإدارة', +'attrdefgrp_show_detail' => 'معرف إظهار التفاصيل', +'attrdefgrp_show_list' => 'معرف إظهار اللوائح', +'attrdefgrp_show_search' => 'معرف إظهار البحث', +'attrdefgrp_show_searchlist' => 'معرف إضهار لائحة البحث', 'attrdef_exists' => 'تعريف السمة بالفعل موجود', -'attrdef_info' => '', +'attrdef_info' => 'معلومات', 'attrdef_in_use' => 'تعريف السمة مشغول حاليا', 'attrdef_management' => 'ادارة تعريف السمات', 'attrdef_maxvalues' => 'اكبر عدد من القيم', 'attrdef_minvalues' => 'اقل عدد من القيم', -'attrdef_min_greater_max' => '', +'attrdef_min_greater_max' => 'الأقل اكبر من الأكبر', 'attrdef_multiple' => 'السماح باكثر من قيمة', -'attrdef_multiple_needs_valueset' => '', -'attrdef_must_be_multiple' => '', +'attrdef_multiple_needs_valueset' => 'يحتاج أكثر من قيمة', +'attrdef_must_be_multiple' => 'يجب أن يكون متعدد القيم', 'attrdef_name' => 'اسم', -'attrdef_noname' => '', -'attrdef_objtype' => 'نوع الكائن', -'attrdef_regex' => '', +'attrdef_noname' => 'لا يوجد اسم', +'attrdef_objtype' => 'نوع الورقة', +'attrdef_regex' => 'attrdef_regex', 'attrdef_type' => 'نوع', -'attrdef_type_boolean' => '', -'attrdef_type_date' => 'التاريخ', -'attrdef_type_email' => '', -'attrdef_type_float' => 'ﺮﻘﻣ ﻢﻋ ﻑﻭﺎﺼﻟ', -'attrdef_type_int' => 'ﺮﻘﻣ ﺺﺤﻴﺣ', -'attrdef_type_string' => 'ﻦﺻ', -'attrdef_type_url' => '', +'attrdef_type_boolean' => 'boolean', +'attrdef_type_date' => 'تاريخ', +'attrdef_type_email' => 'بريد إلكتروني', +'attrdef_type_float' => 'رقم مع فواصل', +'attrdef_type_int' => 'رقم صحيح', +'attrdef_type_string' => 'نص', +'attrdef_type_url' => 'رابط', 'attrdef_valueset' => 'مجموعة القيم', 'attributes' => 'السمات', -'attribute_changed_email_body' => 'تم تغيير سمة -Document: [name] -Version: [version] -Attribute: [attribute_name] -Old value: [attribute_old_value] -New value: [attribute_new_value] -Parent folder: [folder_path] -User: [username] +'attribute_changed_email_body' => 'تم تغيير سمة +Document: [name] +Version: [version] +Attribute: [attribute_name] +Old value: [attribute_old_value] +New value: [attribute_new_value] +Parent folder: [folder_path] +User: [username] URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - تم تغيير سمة', -'attribute_count' => 'ﻉﺩﺩ ﻡﺭﺎﺗ ﺍﻸﺴﺘﺧﺩﺎﻣ', -'attribute_value' => 'ﻖﻴﻣﺓ ﺎﻠﺴﻣﺓ', -'attribute_value_not_in_valueset' => '', -'attr_malformed_boolean' => '', -'attr_malformed_date' => '', -'attr_malformed_email' => '', -'attr_malformed_float' => '', -'attr_malformed_int' => '', -'attr_malformed_url' => '', -'attr_max_values' => '', -'attr_min_values' => '', -'attr_not_in_valueset' => '', -'attr_no_regex_match' => '', -'attr_validation_error' => '', -'at_least_n_users_of_group' => '', +'attribute_count' => 'عدد مرات الإستخدام', +'attribute_value' => 'قيمة السمة', +'attribute_value_not_in_valueset' => 'القيمة غير موجودة في لائحة القيم', +'attr_malformed_boolean' => 'attr_malformed_boolean', +'attr_malformed_date' => 'تاريخ', +'attr_malformed_email' => 'البريد الإلكتروني', +'attr_malformed_float' => 'رقم مع فواصل', +'attr_malformed_int' => 'رقم صحيح', +'attr_malformed_url' => 'رابط', +'attr_max_values' => 'أكثر عدد من القيم', +'attr_min_values' => 'أقل عدد من القيم', +'attr_not_in_valueset' => 'المعرف غير موجود في لائحة القيم', +'attr_no_regex_match' => 'attr_no_regex_match', +'attr_validation_error' => 'خطأ في الموافقة', +'at_least_n_users_of_group' => 'على الأقل عدد من المستخدمين في المجموعة', 'august' => 'أغسطس', -'authentication' => '', -'authentication_failed' => '', -'author' => 'ﺎﻠﻤﻨﺸﺋ', +'authentication' => 'المصادقة', +'authentication_failed' => 'فشل في المصادقة', +'author' => 'المنشئ', 'automatic_status_update' => 'تغير الحالة تلقائيا', 'back' => 'العودة للخلف', 'backup_list' => 'قائمة نسخ احتياطي حالية', 'backup_log_management' => 'نسخ احتياطي/سجلات', 'backup_remove' => 'ازالة ملف النسخ الاحتياطي', -'backup_tools' => 'أدوات النسخ الاحتياطي', +'backup_tools' => 'أدوات النسخ الاحتياطية', 'between' => 'بين', -'bg_BG' => 'ﺐﻠﻏﺍﺮﻳﺓ', -'browse' => 'ﺖﺼﻔﺣ', -'calendar' => 'النتيجة', -'calendar_week' => '', +'bg_BG' => 'بلغارية', +'browse' => 'تصفح', +'calendar' => 'التقويم', +'calendar_week' => 'التقويم الأسبوعي', 'cancel' => 'الغاء', 'cannot_assign_invalid_state' => 'لايمكن تعديل ملف مرفوض او مهمل', 'cannot_change_final_states' => 'تحذير: لا يمكن تعديل حالة مستند مرفوض او منتهى صلاحيته او رهن المراجعة او الموافقة', -'cannot_delete_user' => '', +'cannot_delete_user' => 'لا يمكن حذف مستخدم', 'cannot_delete_yourself' => 'لايمكنك مسح نفسك', 'cannot_move_root' => 'خطأ: لايمكنك تحريك المجلد الرئيسي.', 'cannot_retrieve_approval_snapshot' => 'لا يمكن استدعاء لقطة حالة الموافقة لهذا الاصدار من المستند', 'cannot_retrieve_review_snapshot' => 'لا يمكن استدعاء لقطة حالة المراجعة لهذا الاصدار من المستند', 'cannot_rm_root' => 'خطأ: لايمكنك مسح المجلد الرئيسي.', 'categories' => 'اقسام', -'categories_loading' => '', +'categories_loading' => 'جار تحميل الأقسام', 'category' => 'قسم', 'category_exists' => '.القسم بالفعل موجود', 'category_filter' => 'اقسام فقط', -'category_info' => '', +'category_info' => 'معلومات عن الأقسام', 'category_in_use' => 'هذا القسم مستخدم حاليا بواسطة مستندات.', 'category_noname' => 'لم يتم كتابة اسم القسم.', 'ca_ES' => 'الكاتالونية', 'change_assignments' => 'تغيير التخصيصات', 'change_password' => 'تغيير كلمة السر', 'change_password_message' => 'تم تغيير كلمة السر.', -'change_recipients' => '', -'change_revisors' => '', +'change_recipients' => 'تغيير المستلمين', +'change_revisors' => 'تغيير المراجعين', 'change_status' => 'تغيير الحالة', -'charts' => 'ﺝﺩﺍﻮﻟ', -'chart_docsaccumulated_title' => '', -'chart_docspercategory_title' => '', -'chart_docspermimetype_title' => '', -'chart_docspermonth_title' => '', -'chart_docsperstatus_title' => '', -'chart_docsperuser_title' => '', -'chart_selection' => '', -'chart_sizeperuser_title' => '', -'checkedout_file_has_different_version' => '', -'checkedout_file_has_disappeared' => '', -'checkedout_file_is_unchanged' => '', -'checkin_document' => '', -'checkoutpath_does_not_exist' => '', -'checkout_document' => '', -'checkout_is_disabled' => '', +'charts' => 'جداول', +'chart_docsaccumulated_title' => 'عنوان الجدول', +'chart_docspercategory_title' => 'عنوان الجدول حسب القسم', +'chart_docspermimetype_title' => 'عنوان الجدول حسب النوع', +'chart_docspermonth_title' => 'عنوان الجدول حسب الشهر', +'chart_docsperstatus_title' => 'عنوان الجدول حسب الحالة', +'chart_docsperuser_title' => 'عنوان الجدول حسب المستخدم', +'chart_selection' => 'تحديد الجدول', +'chart_sizeperuser_title' => 'عنوان الجدول حسب حجم المستخدم', +'checkedout_file_has_different_version' => 'الملف المراجع لديه نسخة أخرى', +'checkedout_file_has_disappeared' => 'اختفى الملف المسحوب', +'checkedout_file_is_unchanged' => 'لم يتم تغيير سحب الملف', +'checkin_document' => 'ملف', +'checkoutpath_does_not_exist' => 'سير السحب غير موجود', +'checkout_document' => 'سحب الملف', +'checkout_is_disabled' => 'السحب معطل', 'choose_attrdef' => 'من فضلك اختر تعريف السمة', -'choose_attrdefgroup' => '', -'choose_category' => 'من فضلك اختر', +'choose_attrdefgroup' => 'من فضلك اختر تعريف سمة المجموعة', +'choose_category' => 'من فضلك اختر القسم', 'choose_group' => 'اختر المجموعة', -'choose_role' => '', +'choose_role' => 'اختر دور', 'choose_target_category' => 'اختر القسم', 'choose_target_document' => 'اختر المستند', 'choose_target_file' => 'اختر الملف', 'choose_target_folder' => 'اختر المجلد', -'choose_user' => 'اختر المستخدم', +'choose_user' => 'اختر مستخدم', 'choose_workflow' => 'اختر مسار عمل', 'choose_workflow_action' => 'اختر اجراء مسار عمل', 'choose_workflow_state' => 'اختر حالة مسار عمل', -'class_name' => '', -'clear_cache' => 'ﻢﺴﺣ ﺎﻠﻤﺤﻓﻮﻇﺎﺗ', -'clear_clipboard' => '', -'clear_password' => '', +'class_name' => 'اسم الصف', +'clear_cache' => 'مسح المحفوظات', +'clear_clipboard' => 'مسح الحافظة', +'clear_password' => 'مسح الرقم السري', 'clipboard' => 'لوحة القصاصات', 'close' => 'إغلاق', -'command' => '', +'command' => 'أمر', 'comment' => 'تعليق', -'comment_changed_email' => '', +'comment_changed_email' => 'تعليق تغيير البريد الإلكتروني', 'comment_for_current_version' => 'تعليق على الاصدار', -'configure_extension' => '', -'confirm_clear_cache' => '', +'configure_extension' => 'تعديل', +'confirm_clear_cache' => 'تعديل مسح المحفوظات', 'confirm_create_fulltext_index' => 'نعم: اود اعادة انشاء فهرس للنص الكامل !', -'confirm_move_document' => '', -'confirm_move_folder' => '', +'confirm_move_document' => 'تاكيد نقل الملف', +'confirm_move_folder' => 'تاكيد نقل الملف', 'confirm_pwd' => 'تأكيد كلمة السر', -'confirm_rm_attr_value' => '', +'confirm_rm_attr_value' => 'تاكيد معرف السمة', 'confirm_rm_backup' => 'هل تود حقا ازالة الملف "[arkname]"?
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', 'confirm_rm_document' => 'هل تود حقا ازالة المستند \'[documentname]\'?
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', 'confirm_rm_dump' => 'هل تود حقا ازالة الملف "[dumpname]"?
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', @@ -281,33 +281,33 @@ URL: [url]', 'confirm_rm_folder_files' => 'هل تود حقا ازالة كل الملفات الموجودة بالمجلد "[foldername]" وكل مافي المجلدات الفرعية؟
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', 'confirm_rm_group' => 'هل تود حقا ازالة المجموعة "[groupname]"?
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', 'confirm_rm_log' => 'هل تود حقا ازالة ملف السجل "[logname]"?
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', -'confirm_rm_transmittal' => '', -'confirm_rm_transmittalitem' => '', +'confirm_rm_transmittal' => 'تاكيد ازالة الإحالة', +'confirm_rm_transmittalitem' => 'تاكيد ازالة حاجة الإحالة', 'confirm_rm_user' => 'هل تود حقا ازالة المستخدم "[username]"?
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', -'confirm_rm_user_from_processes' => '', +'confirm_rm_user_from_processes' => 'تاكيد ازالة مستخدمين من سير العمل', 'confirm_rm_version' => 'هل تود حقا ازالة الاصدار [version] الخاص بالمستند "[documentname]"?
          كن حذرا: هذا الاجراء لايمكن التراجع فيه', -'confirm_transfer_link_document' => '', -'confirm_transfer_objects' => '', -'confirm_update_transmittalitem' => '', +'confirm_transfer_link_document' => 'تاكيد تحويل رابط الملف', +'confirm_transfer_objects' => 'تاكيد تحويل اشياء', +'confirm_update_transmittalitem' => 'تاكيد تحديث إحالة الأشياء', 'content' => 'المحتوى', 'continue' => 'استمرار', -'converter_new_cmd' => '', -'converter_new_mimetype' => 'ﻥﻮﻋ ﺝﺪﻳﺩ ﻢﻧ ﺎﻟﻮﺛﺎﺌﻗ', -'copied_to_checkout_as' => '', -'create_download_link' => '', +'converter_new_cmd' => 'converter_new_cmd', +'converter_new_mimetype' => 'نوع جديد من الوثائق', +'copied_to_checkout_as' => 'نسخ الى السب مثل', +'create_download_link' => 'إنشاء رابط تنزيل', 'create_fulltext_index' => 'انشاء فهرس للنص الكامل', 'create_fulltext_index_warning' => 'انت على وشك اعادة انشاء فهرس النص الكامل.هذا سيتطلب وقت كافي وسيؤثر بشكل عام على كفاءة النظام. اذا كنت حقا تود اعادة انشاء الفهرس، من فضلك قم بتاكيد العملية.', -'creation_date' => 'تم انشاؤه', +'creation_date' => 'انشأ في تاريخ', 'cs_CZ' => 'التشيكية', 'current_password' => 'كلمة السر الحالية', -'current_quota' => '', -'current_state' => '', +'current_quota' => 'كوتا الحالية', +'current_state' => 'الحالة الحالية', 'current_version' => 'الإصدار الحالي', 'daily' => 'يومي', 'databasesearch' => 'بحث قاعدة البيانات', -'date' => 'التاريخ', +'date' => 'تاريخ', 'days' => 'أيام', -'debug' => '', +'debug' => 'debug', 'december' => 'ديسمبر', 'default_access' => 'حالة الدخول الافتراضية', 'default_keywords' => 'كلمات بحثية اساسية', @@ -317,38 +317,38 @@ URL: [url]', 'details_version' => 'تفاصيل هذا الاصدار: [version]', 'de_DE' => 'الألمانية', 'disclaimer' => 'هذه المنطقة محظورة. الدخول فقط مسموح للموظفين المعتمدين. اي اختراق سيتم التعامل معه وفقا للقوانين المحلية والدولية.', -'discspace' => '', -'docs_in_reception_no_access' => '', -'docs_in_revision_no_access' => '', -'document' => 'المستند', -'documentcontent' => '', -'documents' => 'المستندات', -'documents_checked_out_by_you' => '', -'documents_expired' => 'ﻮﺛﺎﺌﻗ ﻢﻨﺘﻬﻳﺓ', +'discspace' => 'مساحة القرص', +'docs_in_reception_no_access' => 'الدخول مرفوض الى المستندات في الإستقبال', +'docs_in_revision_no_access' => 'الدخول مرفوض الى المستندات قيد المراجعة', +'document' => 'مستند', +'documentcontent' => 'موضوع المستند', +'documents' => 'مستندات', +'documents_checked_out_by_you' => 'مستندات سحبت من قبلك', +'documents_expired' => 'وثائق منتهية', 'documents_in_process' => 'مستندات رهن المعالجة', -'documents_locked' => '', +'documents_locked' => 'مستندات مغلقة', 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك', 'documents_only' => 'مستندات فقط', 'documents_to_approve' => 'مستندات في انتظار الموافقة', -'documents_to_correct' => '', -'documents_to_process' => '', -'documents_to_receipt' => '', +'documents_to_correct' => 'مستندات للتصحيح', +'documents_to_process' => 'مستندات للمعالجة', +'documents_to_receipt' => 'مستندات للوصول', 'documents_to_review' => 'مستندات في انتظار المراجعة', -'documents_to_revise' => '', -'documents_to_trigger_workflow' => '', -'documents_user_draft' => '', -'documents_user_expiration' => '', -'documents_user_needs_correction' => '', -'documents_user_no_reception' => '', -'documents_user_obsolete' => '', -'documents_user_reception' => '', -'documents_user_rejected' => '', +'documents_to_revise' => 'مستندات للمراجعة', +'documents_to_trigger_workflow' => 'مستندات لتشغبل سير العمل', +'documents_user_draft' => 'مستندات مسودة للمستخدم', +'documents_user_expiration' => 'مستندات المستخدم منتهية صلاحيتها', +'documents_user_needs_correction' => 'مستندات المستخدم تحتاج الى تعديل', +'documents_user_no_reception' => 'مستندات المستخدم لا تحتاج الى الإستقبال', +'documents_user_obsolete' => 'مستندات المستخدم القديمة', +'documents_user_reception' => 'مستندات المستخدم تحتاج الى استقبال', +'documents_user_rejected' => 'مستندات المستخدم مرفوضة', 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك', -'documents_with_notification' => '', -'document_already_checkedout' => '', +'documents_with_notification' => 'مستندات مع اشعار', +'document_already_checkedout' => 'تم سحب الملف', 'document_already_locked' => 'هذا المستند محمي ضد التعديل', -'document_attribute_changed_email_body' => '', -'document_attribute_changed_email_subject' => '', +'document_attribute_changed_email_body' => 'معرف المستند غير موضوع البريد الإلكتروني', +'document_attribute_changed_email_subject' => 'معرف المستند غير موضوع البريد الإلكتروني', 'document_comment_changed_email' => 'تم تعديل التعليق', 'document_comment_changed_email_body' => 'تم تعديل التعليق المستند: [name] @@ -358,7 +358,7 @@ Parent folder: [folder_path] المستخدم: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - تم تعديل التعليق', -'document_count' => '', +'document_count' => 'تعداد المستندات', 'document_deleted' => 'تم مسح المستند', 'document_deleted_email' => 'تم مسح المستند', 'document_deleted_email_body' => 'تم مسح المستند @@ -369,7 +369,7 @@ Parent folder: [folder_path] 'document_duplicate_name' => 'اسم المستند متكرر', 'document_has_no_workflow' => 'المستند لايحتوى مسار عمل', 'document_infos' => 'معلومات المستند', -'document_is_checked_out' => '', +'document_is_checked_out' => 'تم سحب المستند', 'document_is_not_locked' => 'هذا المستند غير محمي ضد التعديل', 'document_link_by' => 'مربوط بواسطة', 'document_link_public' => 'عام', @@ -381,7 +381,7 @@ Parent folder: [folder_path] المستخدم: [username] URL: [url]', 'document_moved_email_subject' => '[sitename]: [name] - تم تحريك المستند', -'document_not_checkedout' => '', +'document_not_checkedout' => 'لم يتب سحب المستند', 'document_renamed_email' => 'تم اعادة تسمية المستند', 'document_renamed_email_body' => 'تم اعادة تسمية المستند المستند: [name] @@ -398,36 +398,36 @@ Parent folder: [folder_path] المستخدم: [username] URL: [url]', 'document_status_changed_email_subject' => '[sitename]: [name] - تم تغيير حالةالمستند', -'document_title' => 'المستند \'[documentname]\'', -'document_transfered_email_body' => '', -'document_transfered_email_subject' => '', +'document_title' => 'المستند \'[documentname]\'عنوان السمتند', +'document_transfered_email_body' => 'المستند نقل موضوع البريد الإلكتروني', +'document_transfered_email_subject' => 'المستند نقل موضوع البريد الإلكتروني', 'document_updated_email' => 'تم تحديث المستند', -'document_updated_email_body' => 'تم تحديث المستند -المستند: [name] -Parent folder: [folder_path] -المستخدم: [username] -تعليق: [comment] -تعليق الاصدار: [version_comment] +'document_updated_email_body' => 'تم تحديث المستند +المستند: [name] +Parent folder: [folder_path] +المستخدم: [username] +تعليق: [comment] +تعليق الاصدار: [version_comment] URL: [url]', 'document_updated_email_subject' => '[sitename]: [name] - تم تحديث المستند', 'does_not_expire' => 'لا ينتهى صلاحيته', 'does_not_inherit_access_msg' => 'صلاحيات موروثة', 'download' => 'تنزيل', -'download_extension' => '', -'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', +'download_extension' => 'تنزيل طويل', +'download_links' => 'تنزيل روابط', +'download_link_email_body' => 'تنزيل رابط محتوى البريد الإلكتروني', +'download_link_email_subject' => 'تنزيل رابط موضوع البريد الإلكتروني', 'do_object_repair' => 'إصلاح كل المستندات والمجلدات.', 'do_object_setchecksum' => 'تحديد فحص اخطاء', 'do_object_setfilesize' => 'تحديد حجم الملف', 'do_object_unlink' => 'مسح اصدار مستند', -'draft' => '', +'draft' => 'مسودة', 'draft_pending_approval' => 'مسودة - قيد الموافقة', 'draft_pending_review' => 'مسودة - قيد المراجعة', 'drag_icon_here' => 'قم بسحب ايقونة المستند او المجلد الى هنا!', -'dropfolderdir_missing' => '', +'dropfolderdir_missing' => 'الملف من مجلد التجميع غير موجود', 'dropfolder_file' => 'ملف من مجلد التجميع', -'dropfolder_folder' => '', +'dropfolder_folder' => 'مجلد التجميع', 'dropfolder_metadata' => '', 'dropupload' => 'رفع سريع', 'drop_files_here' => 'أفلت الملفات هنا!', @@ -435,8 +435,8 @@ URL: [url]', 'dump_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف مستخرج من محتوى قاعدة البيانات. بعد انشاء الملف المستخرج سيتم حفظه في مجلد البيانات الخاص بسيرفرك', 'dump_list' => 'ملف مستخرج حالي', 'dump_remove' => 'ازالة الملف المستخرج', -'duplicates' => 'ﻢﻛﺭﺭﺓ', -'duplicate_content' => '', +'duplicates' => 'تكرارات', +'duplicate_content' => 'المحتوى متكرر', 'edit' => 'تعديل', 'edit_attributes' => 'تعديل السمات', 'edit_comment' => 'تعديل تعليق', @@ -446,70 +446,70 @@ URL: [url]', 'edit_document_props' => 'تعديل مستند', 'edit_event' => 'تعديل الحدث', 'edit_existing_access' => 'تعديل قائمة الصلاحيات', -'edit_existing_attribute_groups' => '', +'edit_existing_attribute_groups' => 'تعديل معرف المجموعات الحالية', 'edit_existing_notify' => 'تعديل قائمة التنبيهات', 'edit_folder_access' => 'تعديل صلاحيات', -'edit_folder_attrdefgrp' => '', +'edit_folder_attrdefgrp' => 'تعديل معرف مجموعة الملفات', 'edit_folder_notify' => 'تعديل قائمة التنبيهات', 'edit_folder_props' => 'تعديل مجلد', 'edit_group' => 'تعديل مجموعة', -'edit_online' => '', +'edit_online' => 'تعديل عبر الإنترنت', 'edit_online_warning' => '', -'edit_task' => '', -'edit_transmittal_props' => '', +'edit_task' => 'تعديل المهمة', +'edit_transmittal_props' => 'تعديل الإحالة', 'edit_user' => 'تعديل المستخدم', 'edit_user_details' => 'تعديل بيانات المستخدم', -'edit_version' => '', -'el_GR' => 'ﺲﻴﺴﻴﺳ', -'email' => 'بريد الكتروني', +'edit_version' => 'تعديل الإصدار', +'el_GR' => 'الإنكليزية', +'email' => 'البريد الإلكتروني', 'email_error_title' => 'لمي يتم ادخال البريد الالكتروني', 'email_footer' => 'يمكنك دائما تغيير اعدادات بريدك الالكتروني من خلال خاصية - مستنداتي', 'email_header' => 'هذا رسالة تلقائية من نظام ادارة المستندات!', 'email_not_given' => 'من فضلك ادخل بريد الكتروني صحيح.', -'empty_attribute_group_list' => '', +'empty_attribute_group_list' => 'معرف لائحة المجموعات خالية', 'empty_folder_list' => 'لايوجد مستندات او مجلدات', -'empty_list' => '', +'empty_list' => 'الائحة خالية', 'empty_notify_list' => 'لايوجد مدخلات', 'en_GB' => 'الإنكليزية (GB)', 'equal_transition_states' => 'حالة البداية والنهاية متشابهة', 'error' => 'خطأ', -'error_add_aro' => '', -'error_add_permission' => '', -'error_cleared_cache' => '', -'error_edit_task' => '', -'error_extension_getlist' => '', -'error_importfs' => '', +'error_add_aro' => 'خطأ في الإضافة', +'error_add_permission' => 'خطأ في طلب السماح', +'error_cleared_cache' => 'خطأ في مسح المحفوظات', +'error_edit_task' => 'خطأ في تعديل المهمة', +'error_extension_getlist' => 'خطأ في أخذ الائحة', +'error_importfs' => 'خطأ في الإستيراد', 'error_no_document_selected' => 'لم يتم اختيار مستند', 'error_no_folder_selected' => 'لم يتم اختيار مجلد', 'error_occured' => 'حدث خطأ', -'error_remove_document' => '', -'error_remove_folder' => 'ﺡﺪﺛ ﺦﻃﺃ ﺎﺜﻧﺍﺀ ﺡﺬﻓ ﺎﻠﻤﺠﻟﺩ', -'error_remove_permission' => '', -'error_rm_workflow' => '', -'error_rm_workflow_action' => '', -'error_rm_workflow_state' => '', -'error_toogle_permission' => '', -'error_transfer_document' => '', -'error_trigger_workflow' => '', -'error_update_document' => '', -'error_uploading_reviewer_only' => '', +'error_remove_document' => 'خطأ في ازالة المستند', +'error_remove_folder' => 'حدث خطأ في ازالة ملف', +'error_remove_permission' => 'حدث خطأ في ازالة طلب السماح', +'error_rm_workflow' => 'خطأ في ازالة سير العمل', +'error_rm_workflow_action' => 'خطأ في ازالة دور سير العمل', +'error_rm_workflow_state' => 'خطأ في ازالة حالة سير العمل', +'error_toogle_permission' => 'خطأ في تفعيل طلب السماح', +'error_transfer_document' => 'خطأ في تحويل المستند', +'error_trigger_workflow' => 'خطأ في تفعيل سير العمل', +'error_update_document' => 'خطأ في تحديث المستند', +'error_uploading_reviewer_only' => 'خطأ في رفع المراجع فقط', 'es_ES' => 'الإسبانية', 'event_details' => 'تفاصيل الحدث', -'exclude_items' => '', +'exclude_items' => 'فصل الأشياء', 'expired' => 'انتهى صلاحيته', -'expired_at_date' => '', -'expired_documents' => '', +'expired_at_date' => 'تنتهي صلاحيته في التاريخ', +'expired_documents' => 'مستندات انتهت صلاحيتها', 'expires' => 'تنتهى صلاحيته', -'expire_by_date' => 'ﻲﻨﺘﻫﻯ ﻑﻯ ﺕﺍﺮﻴﺧ', -'expire_in_1d' => '', -'expire_in_1h' => '', -'expire_in_1m' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺶﻫﺭ', -'expire_in_1w' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺎﺴﺑﻮﻋ', -'expire_in_1y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺲﻧﺓ', -'expire_in_2h' => '', -'expire_in_2y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 2 ﺲﻧﺓ', -'expire_today' => '', -'expire_tomorrow' => '', +'expire_by_date' => 'تنتهي صلاحيته في التاريخ', +'expire_in_1d' => 'تنتهي صلاحيته بعد يوم واحد', +'expire_in_1h' => 'تنتهي صلاحيته بعد ساعة', +'expire_in_1m' => 'تنتهي صلاحيته بعد دقيقة', +'expire_in_1w' => 'تنتهي صلاحيته بعد اسبوع', +'expire_in_1y' => 'تنتهي صلاحيته بعد سنة', +'expire_in_2h' => 'تنتهي صلاحيته بعد ساعتين', +'expire_in_2y' => 'تنتهي صلاحيته بعد سنتين', +'expire_today' => 'تنتهي صلاحيته اليوم', +'expire_tomorrow' => 'تنتهي صلاحيته غدا', 'expiry_changed_email' => 'تم تغيير تاريخ الصلاحية', 'expiry_changed_email_body' => 'تم تغيير تاريخ الصلاحية المستند: [name] @@ -517,37 +517,37 @@ Parent folder: [folder_path] المستخدم: [username] URL: [url]', 'expiry_changed_email_subject' => '[sitename]: [name] - تم تغيير تاريخ الصلاحية', -'export' => '', -'extension_archive' => '', -'extension_changelog' => 'ﺲﺠﻟ ﺎﻠﺘﻋﺪﻳﻼﺗ', -'extension_loading' => 'ﺖﺤﻤﻴﻟ ﺍﻼﺿﺎﻓﺎﺗ', -'extension_manager' => 'ﺇﺩﺍﺭﺓ ﺍﻼﻣﺩﺍﺩﺎﺗ', -'extension_mgr_installed' => 'ﻢﺜﺒﺗ', -'extension_mgr_no_upload' => '', -'extension_mgr_repository' => 'ﻢﺗﻮﻓﺭ', -'extension_version_list' => 'ﺍﻼﺻﺩﺍﺭ', +'export' => 'تصدير', +'extension_archive' => 'إرشيف أطول', +'extension_changelog' => 'سجل التعديلات', +'extension_loading' => 'تحميل الإضافات', +'extension_manager' => 'إدارة الإضافات', +'extension_mgr_installed' => 'تثبيت إدارة الإضافات', +'extension_mgr_no_upload' => 'لا يمكن تحميل إضافات جديدة لأن دليل الإضافات غير قابل للكتابة.', +'extension_mgr_repository' => 'مستودع إدارة الإضافات', +'extension_version_list' => 'لائحة الإضافات حسب الإصدار', 'february' => 'فبراير', 'file' => 'ملف', 'files' => 'ملفات', 'files_deletion' => 'مسح الملف', 'files_deletion_warning' => 'من خلال تلك الخاصية يمكنك مسح كل الملفات على مجلدات النظام. ملفات معلومات الاصدارات فقط ستظل متاحة للرؤية.', -'files_loading' => 'ﻒﺿﻻ ﺈﻨﺘﻇﺭ ﺢﺗﻯ ﻲﺘﻣ ﺖﺤﻤﻴﻟ ﻕﺎﺌﻣﺓ ﺎﻠﻤﻠﻓﺎﺗ', +'files_loading' => 'تحميل الملفات', 'file_size' => 'حجم الملف', -'filter_for_documents' => '', -'filter_for_folders' => '', +'filter_for_documents' => 'فلتر للمستندات', +'filter_for_folders' => 'فلتر للملفات', 'folder' => 'مجلد', 'folders' => 'مجلدات', 'folders_and_documents_statistic' => 'رؤية عامة للمحتوى', -'folders_with_notification' => '', -'folder_attribute_changed_email_body' => '', -'folder_attribute_changed_email_subject' => '', +'folders_with_notification' => 'ملفات مع اشعار', +'folder_attribute_changed_email_body' => 'معرف المجلد غير محتوى البريد الإلكتروني', +'folder_attribute_changed_email_subject' => 'معرف المجلد غير موضوع البريد الإلتكتروني', 'folder_comment_changed_email' => 'تم تعديل التعليق', -'folder_comment_changed_email_body' => 'تم تعديل التعليق -الملجلد: [name] -التعليق القديم: [old_comment] -التعليق الجديد: [new_comment] -Parent folder: [folder_path] -المستخدم: [username] +'folder_comment_changed_email_body' => 'تم تعديل التعليق +الملجلد: [name] +التعليق القديم: [old_comment] +التعليق الجديد: [new_comment] +Parent folder: [folder_path] +المستخدم: [username] URL: [url]', 'folder_comment_changed_email_subject' => '[sitename]: [name] - تم تعديل التعليق', 'folder_contents' => 'محتوى المجلدات', @@ -575,7 +575,8 @@ Parent folder: [folder_path] المستخدم: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - تم اعادة تسمية المجلد', -'folder_title' => 'مجلد \'[foldername]\'', +'folder_title' => 'مجلد \'[foldername]\'عنوان المجلد', +'foot_note' => 'مجلس النواب اللبناني', 'force_update' => 'ﺖﺣﺪﻴﺛ', 'friday' => 'الجمعة', 'friday_abbr' => 'ج', @@ -583,10 +584,10 @@ URL: [url]', 'fr_FR' => 'الفرنسية', 'fullsearch' => 'البحث النصي الكامل', 'fullsearch_hint' => 'استخدم فهرس النص الكامل', -'fulltextsearch_disabled' => '', +'fulltextsearch_disabled' => 'توقف البحث الكامل للنص', 'fulltext_converters' => 'فهرس تحويل المستند', 'fulltext_info' => 'معلومات فهرس النص الكامل', -'global_attributedefinitiongroups' => '', +'global_attributedefinitiongroups' => 'معرف تعريف المجموعات', 'global_attributedefinitions' => 'سمات', 'global_default_keywords' => 'كلمات بحثية عامة', 'global_document_categories' => 'اقسام', @@ -597,44 +598,44 @@ URL: [url]', 'groups' => 'المجموعات', 'group_approval_summary' => 'ملخص موافقة المجموعة', 'group_exists' => 'المجموعة موجودة بالفعل.', -'group_info' => '', +'group_info' => 'معلومات عن المجموعة', 'group_management' => 'إدارة المجموعات', 'group_members' => 'أعضاء المجموعة', -'group_receipt_summary' => '', +'group_receipt_summary' => 'ملخص وصل المجموعة', 'group_review_summary' => 'ملخص مراجعة المجموعة', 'group_revision_summary' => '', 'guest_login' => 'الدخول كضيف', 'guest_login_disabled' => 'دخول ضيف غير متاح.', -'hash' => '', +'hash' => 'مزيج', 'help' => 'المساعدة', -'home_folder' => '', -'hook_name' => '', +'home_folder' => 'مجلد الصفحة الرئيسية', +'hook_name' => 'دمج الاسم', 'hourly' => 'بالساعة', 'hours' => 'ساعات', -'hr_HR' => 'ﺎﻠﻛﺭﻭﺎﺘﻳﺓ', +'hr_HR' => 'الساعة', 'human_readable' => 'ارشيف مقروء', 'hu_HU' => 'مجرية', 'id' => 'معرف', 'identical_version' => 'الاصدار الجديد مماثل للاصدار الحالي.', -'import' => 'ﺎﺴﺘﺧﺭﺎﺟ', -'importfs' => '', -'import_extension' => '', -'import_fs' => 'ﻦﺴﺧ ﻢﻧ ﻢﻠﻓ ﺎﻠﻨﻇﺎﻣ', -'import_fs_warning' => '', -'include_content' => '', +'import' => 'استيراد', +'importfs' => 'استيرادات', +'import_extension' => 'استيراد إضافات', +'import_fs' => 'نسخ من ملف النظام', +'import_fs_warning' => 'تحذير النسخ من ملف النظام', +'include_content' => 'إضافة المحتوى', 'include_documents' => 'اشمل مستندات', 'include_subdirectories' => 'اشمل مجلدات فرعية', -'indexing_tasks_in_queue' => 'ﺍﻻﻭﺎﻣﺭ ﺎﻠﻤﻄﻟﻮﺑﺓ ﻒﻳ ﺍﻼﻨﺘﻇﺍﺭ', -'index_converters' => '', -'index_done' => '', -'index_error' => '', -'index_folder' => 'ﻒﻫﺮﺳﺓ ﺎﻠﻤﺠﻟﺩ', -'index_no_content' => '', -'index_pending' => '', -'index_waiting' => 'ﻲﻨﺘﻇﺭ', +'indexing_tasks_in_queue' => 'فهرسة المهات بالترتيب', +'index_converters' => 'تحويل الفهرسة', +'index_done' => 'تمت الفهرسة', +'index_error' => 'خطأ في الفهرسة', +'index_folder' => 'فهرسة المجلد', +'index_no_content' => 'فهرسة بلا محتوى', +'index_pending' => 'الفهرسة قيد الإنتظار', +'index_waiting' => 'الفهرسة قيد الإنتظار', 'individuals' => 'افراد', -'individuals_in_groups' => '', -'info_recipients_tab_not_released' => '', +'individuals_in_groups' => 'أفراد في المجموعات', +'info_recipients_tab_not_released' => 'رابط معلومات المستلمين لم يصدر بعد', 'inherited' => 'موروث', 'inherits_access_copy_msg' => 'نسخ قائمة صلاحيات موروثة.', 'inherits_access_empty_msg' => 'ابدأ بقائمة صلاحيات فارغة', @@ -647,9 +648,9 @@ URL: [url]', 'invalid_create_date_end' => 'تاريخ نهائي خاطىء لانشاء مدى تاريخي', 'invalid_create_date_start' => 'تاريخ ابتدائي خاطيء لانشاء مدى تاريخي', 'invalid_doc_id' => 'معرف مستند خاطىء', -'invalid_dropfolder_folder' => '', -'invalid_expiration_date_end' => '', -'invalid_expiration_date_start' => '', +'invalid_dropfolder_folder' => 'مجلد خاطئ', +'invalid_expiration_date_end' => 'تاريخ انتهاء صلاحية خاطئة', +'invalid_expiration_date_start' => 'تاريخ بدء انتهاء الصلاحية خاطئة', 'invalid_file_id' => 'معرف ملف خاطىء', 'invalid_folder_id' => 'معرف مجلد خاطىء', 'invalid_group_id' => 'معرف مجموعة خاطىء', @@ -662,20 +663,20 @@ URL: [url]', 'invalid_target_folder' => 'معرف خاطىء لمجلد الهدف', 'invalid_user_id' => 'معرف مستخدم خاطىء', 'invalid_version' => 'اصدار مستند خاطىء', -'in_folder' => '', -'in_revision' => '', +'in_folder' => 'مجلد خاطئ', +'in_revision' => 'مراجعة خاطئة', 'in_workflow' => 'رهن مسار عمل', 'is_disabled' => 'تعطيل الحساب', 'is_hidden' => 'اخفاء من قائمة المستخدمين', 'it_IT' => 'الإيطالية', 'january' => 'يناير', -'js_form_error' => '', -'js_form_errors' => '', -'js_invalid_email' => '', +'js_form_error' => 'خطأ في الائحة', +'js_form_errors' => 'أخطاء في الأشكال', +'js_invalid_email' => 'خطأ في البريد الإلكتروني', 'js_no_approval_group' => 'من فضلك اختر مجموعة الموافقة', 'js_no_approval_status' => 'من فضلك اختر حالة الموافقة', 'js_no_comment' => 'لايوجد تعليق', -'js_no_currentpwd' => '', +'js_no_currentpwd' => 'لا يوجد كلمة سر حالية', 'js_no_email' => 'اكتب بريدك الالكتروني', 'js_no_file' => 'من فضلك اختر ملف', 'js_no_keywords' => 'من فضلك اختر بعض الكلمات البحثية', @@ -689,37 +690,38 @@ URL: [url]', 'js_pwd_not_conf' => 'كلمة السر وتأكيدها غير متطابق', 'js_select_user' => 'من فضلك اختر مستخدم', 'js_select_user_or_group' => 'اختر على الاقل مستخدم او مجموعة', -'js_unequal_passwords' => '', +'js_unequal_passwords' => 'كلمات السر غير متساوية', 'july' => 'يوليو', 'june' => 'يونيو', -'keep' => '', +'keep' => 'إبقاء', 'keep_doc_status' => 'ابقاء حالة المستند', 'keywords' => 'كلمات البحث', 'keywords_loading' => 'ﻒﺿﻻ ﺎﻨﺘﻇﺭ ﺢﺗﻯ ﻲﺘﻣ ﺖﺤﻤﻴﻟ ﻚﻠﻣﺎﺗ ﺎﻟﺩﻼﻠﻳﺓ', 'keyword_exists' => 'كلمات البحث بالفعل موجودة', -'ko_KR' => 'ﺎﻠﻛﻭﺮﻳﺓ', +'ko_KR' => 'كوريا', 'language' => 'اللغة', -'lastaccess' => '', +'lastaccess' => 'آخر تسجيل دخول', 'last_update' => 'اخر تحديث', -'legend' => 'دليل', -'librarydoc' => '', +'legend' => 'الدليل', +'librarydoc' => 'مستندات المكتبة', 'linked_documents' => 'مستندات متعلقة', 'linked_files' => 'ملحقات', -'linked_to_current_version' => '', -'linked_to_document' => 'ﺮﺒﻃ ﺐﻤﻠﻓ ﺄﺧﺭ', -'linked_to_this_version' => '', +'linked_to_current_version' => 'متعلقة بالإصدار الحالي', +'linked_to_document' => 'متعلقة بالمستند', +'linked_to_this_version' => 'متعلقة بهذا الإصدار', 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل صفحة التحميل.', -'link_document' => '', -'link_to_version' => '', -'list_access_rights' => 'ﻉﺮﺿ ﻚﻟ ﺎﻠﺻﻼﺤﻳﺎﺗ', -'list_contains_no_access_docs' => '', -'list_hooks' => '', -'list_tasks' => '', +'link_document' => 'رابط المستند', +'link_to_version' => 'رابط الإصدار', +'list_access_rights' => 'لائحة حقوق الدخول', +'list_contains_no_access_docs' => 'هذه الائحة لا تحتوي على مستندات للدخول', +'list_hooks' => 'لائحة الدمج', +'list_tasks' => 'لائحة المهمات', 'local_file' => 'ملف محلي', 'locked_by' => 'محمي بواسطة', 'lock_document' => 'حماية', 'lock_message' => 'هذا الملف محمي بواسطة [username]. فقط المستخدمين المصرح لهم يمكنهم تعديله.', 'lock_status' => 'حالة', +'logfile_loading' => '', 'login' => 'دخول', 'login_disabled_text' => 'حسابك معطل, غالبا بسبب المحاولات العديدة الخاطئة للدخول', 'login_disabled_title' => 'الحساب معطل', @@ -727,57 +729,57 @@ URL: [url]', 'login_error_title' => 'خطأ في الدخول', 'login_not_given' => 'لم يتم ادخال اسم المستخدم', 'login_ok' => 'دخول صحيح', -'login_restrictions_apply' => '', +'login_restrictions_apply' => 'تطبق لائحة القيود', 'logout' => 'خروج', -'log_management' => 'ادارة ملفات السجلات', -'lo_LA' => 'ﺎﻠﻤﻛﺎﻧ', -'malformed_expiration_date' => '', +'log_management' => 'ادارة سجلات الملفات', +'lo_LA' => 'لاوتاني', +'malformed_expiration_date' => 'خطأ في تاريخ انتهاء الصلاحية', 'manager' => 'مدير', -'manager_of_group' => '', -'mandatory_approvergroups' => '', -'mandatory_approvergroup_no_access' => '', -'mandatory_approvers' => '', -'mandatory_approver_no_access' => '', -'mandatory_reviewergroups' => '', -'mandatory_reviewergroup_no_access' => '', -'mandatory_reviewers' => '', -'mandatory_reviewer_no_access' => '', +'manager_of_group' => 'مدير المجموعة', +'mandatory_approvergroups' => 'موافقة المجموعة اجباري', +'mandatory_approvergroup_no_access' => 'ممنوع الدخول الى موافقة المجموعة الإجباري', +'mandatory_approvers' => 'موافقين اجباريين', +'mandatory_approver_no_access' => 'ممنوع دخول الموافق الإجباري', +'mandatory_reviewergroups' => 'مراجعة المجموعات اجباري', +'mandatory_reviewergroup_no_access' => 'ممنوع دخول مجموعة المراجعة الإجبارية', +'mandatory_reviewers' => 'مراجعين اجباريين', +'mandatory_reviewer_no_access' => 'ممنوع دخول المراجع الإجباري', 'march' => 'مارس', 'max_upload_size' => 'الحجم الاقصى للملف', 'may' => 'مايو', -'menu_dropfolder' => '', -'menu_upload_from_dropfolder' => '', -'mimetype' => 'Mime type', +'menu_dropfolder' => 'صفحة المجلد', +'menu_upload_from_dropfolder' => 'صفحة التحميل من المجلد', +'mimetype' => 'نوع الملف', 'minutes' => 'دقائق', 'misc' => 'متنوعات', -'missing_checksum' => 'فحص اخطاء مفقود', -'missing_file' => '', -'missing_filesize' => 'حجم ملف مفقود', -'missing_reception' => '', -'missing_request_object' => '', +'missing_checksum' => 'فحص الأخطاء مفقود', +'missing_file' => 'الملف غير موجود', +'missing_filesize' => 'حجم الملف مفقود', +'missing_reception' => 'الإستقبال غير موجود', +'missing_request_object' => 'طلب شيء غير موجود', 'missing_transition_user_group' => 'مستخدم/مجموعة مفقودة للتحول', 'monday' => 'الاثنين', 'monday_abbr' => 'ن', 'monthly' => 'شهريا', 'month_view' => 'عرض الشهر', -'more_objects_loading' => '', +'more_objects_loading' => 'يتم تحميل أشياء أخرى', 'move' => 'تحريك', -'move_clipboard' => '', +'move_clipboard' => 'تحريك القصاصة', 'move_document' => 'تحريك مستند', 'move_folder' => 'تحريك مجلد', 'my_account' => 'حسابي', 'my_documents' => 'مستنداتي', -'my_transmittals' => '', +'my_transmittals' => 'الإحالات الخاصة بي', 'name' => 'اسم', -'needs_correction' => '', +'needs_correction' => 'يحتاج الى تصحيح', 'needs_workflow_action' => 'هذا المستند يتطلب انتباهك . من فضلك تفقد زر مسار العمل', -'network_drive' => '', -'never' => '', +'network_drive' => 'قرص النترنت', +'never' => 'ابدا', 'new' => 'جديد', 'new_attrdef' => 'اضافة تعريف سمة', 'new_default_keywords' => 'اضافة كلمات بحث', -'new_default_keyword_category' => 'اضافة قسم', -'new_document_category' => 'اضافة قسم', +'new_default_keyword_category' => 'من فضلك اضف قسم', +'new_document_category' => 'من فضلك اضف قسم', 'new_document_email' => 'مستند جديد', 'new_document_email_body' => 'مستند جديد اسم: [name] @@ -810,6 +812,7 @@ URL: [url]', 'next_state' => 'حالة جديدة', 'nl_NL' => 'الهولندي', 'no' => 'لا', +'notification' => '', 'notify_added_email' => 'تم اضافتك الى قائمة التنبيهات', 'notify_added_email_body' => 'تم اضافتك الى قائمة التنبيهات اسم: [name] @@ -830,42 +833,43 @@ URL: [url]', 'no_approval_needed' => 'لايوجد موافقات منتظره', 'no_attached_files' => 'لا يوجد مرفقات', 'no_backup_dir' => '', -'no_current_version' => '', +'no_current_version' => 'لا يوجد اصدار جديد', 'no_default_keywords' => 'لايوجد كلمات بحثية متاحة', -'no_docs_checked_out' => '', +'no_docs_checked_out' => 'لم يتم سحب اي مستند', +'no_docs_expired' => '', 'no_docs_locked' => 'لايوجد مستندات حاليا مقفلة/محمية من التعديل', -'no_docs_needs_correction' => '', -'no_docs_rejected' => '', +'no_docs_needs_correction' => 'لا يوجد مستندات تحتاج الى تصحيح', +'no_docs_rejected' => 'لم يتم رفض اي مستند', 'no_docs_to_approve' => 'لايوجد مستندات حالية في انتظار الموافقة', 'no_docs_to_look_at' => 'لايوجد مستندات حاليا تستدعي انتباهك', -'no_docs_to_receipt' => '', +'no_docs_to_receipt' => 'لا يوجد مستندات للمستلم', 'no_docs_to_review' => 'لايوجد مستندات حاليا متاحة للمراجعة', -'no_docs_to_revise' => '', -'no_email_or_login' => '', +'no_docs_to_revise' => 'لا يوجد مستندات للمراجعة', +'no_email_or_login' => 'لا يوجد بريد الكتروني او تسجيل الدخول', 'no_fulltextindex' => 'لايوجد فهرس للنص الكامل متاح', 'no_groups' => 'لايوجد مجموعات', 'no_group_members' => 'هذه المجموعة لايوجد بها اعضاء', 'no_linked_files' => 'لايوجد ملفات مرتبطة', 'no_previous_versions' => 'لايوجد اصدارات سابقة', -'no_receipt_needed' => '', +'no_receipt_needed' => 'لا يحتاج لأي مستلم', 'no_review_needed' => 'لايوجد مراجعات في الانتظار', -'no_revision_needed' => '', -'no_revision_planed' => '', +'no_revision_needed' => 'لا يحتاج إلى مراجعة', +'no_revision_planed' => 'لم يخطط لأي مراجعة', 'no_update_cause_locked' => 'لايمكنك تعديل المستند. قم بمخاطبة المستخدم الذي قام بحمايته من التعديل', 'no_user_image' => 'لا يوجد صورة متاحة', -'no_version_check' => '', -'no_version_modification' => 'ﻻ ﺖﻋﺪﻴﻟ ﻊﻠﻳ ﺎﻠﻨﺴﺧﺓ', -'no_workflow_available' => '', +'no_version_check' => 'لم يتحقق من اي اصدار', +'no_version_modification' => 'لا تعديل على الإصدار', +'no_workflow_available' => 'لا يوجد سير عمل', 'objectcheck' => 'التحقق من مستند/مجلد', -'object_check_critical' => '', -'object_check_warning' => '', +'object_check_critical' => 'التحقق من الشيء في حالة حرجة', +'object_check_warning' => 'تحذير في التحقق من شيء', 'obsolete' => 'مهمل', 'october' => 'اكتوبر', 'old' => 'قديم', 'only_jpg_user_images' => 'فقط يمكنك استخدام ملفات من تنسيق jpg كصورة المستخدم', -'order_by_sequence_off' => '', +'order_by_sequence_off' => 'الترتيب بالتسلسل موقف', 'original_filename' => 'اسم الملف الاصلي', -'overall_indexing_progress' => '', +'overall_indexing_progress' => 'متابعة الفهرسة', 'owner' => 'المالك', 'ownership_changed_email' => 'تم تغيير المالك', 'ownership_changed_email_body' => 'تم تغيير المالك @@ -880,8 +884,8 @@ URL: [url]', 'password_already_used' => 'كلمة السر بالفعل تم ارسالها', 'password_expiration' => 'انتهاء صلاحية كلمة السر', 'password_expiration_text' => 'انتهت صلاحية كلمة السر. من فضلك قم باختيارها قبل ان تستكمل عملك بالنظام', -'password_expired' => '', -'password_expires_in_days' => '', +'password_expired' => 'انتهت صلاحية كلمة السر', +'password_expires_in_days' => 'كلمة السر نتهي صلاحيتها بعد أيام', 'password_forgotten' => 'نسيان كلمة السر', 'password_forgotten_email_body' => 'عزيزي مستخدم النظام,nnاستقبلنا طلبك لتغيير كلمة السر.nnيمكنك تغييرها عن طريق الرابط التالي:nn[url_prefix]out/out.ChangePassword.php?hash=[hash]nnIf you have still problems to login, then please contact your administrator.', 'password_forgotten_email_subject' => '[sitename]: نسيان كلمة السر', @@ -889,63 +893,63 @@ URL: [url]', 'password_forgotten_text' => 'قم بملء النموذج التالي واتبع التعليمات التى سيتم ارسالها اليك بالبريد الالكتروني', 'password_forgotten_title' => 'ارسال كلمة السر', 'password_repeat' => 'تكرار كلمة السر', -'password_send' => '', -'password_send_text' => '', +'password_send' => 'أرسل كلمة السر', +'password_send_text' => 'أرسل نموذج كلمة السر', 'password_strength' => 'قوة كلمة السر', 'password_strength_insuffient' => 'قوة كلمة السر غير كافية', 'password_wrong' => 'كلمة سر خاطئة', -'pdf_converters' => '', -'pending_approvals' => '', -'pending_receipt' => '', -'pending_reviews' => '', -'pending_revision' => '', -'pending_workflows' => '', +'pdf_converters' => 'تحويل إلى pdf', +'pending_approvals' => 'الموافقة قيد الإنتظار', +'pending_receipt' => 'إنتظار المستلمين', +'pending_reviews' => 'إنتظار الإستعراض', +'pending_revision' => 'إنتظار المراجعة', +'pending_workflows' => 'إنتظار سير العمل', 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية', -'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ', -'possible_substitutes' => '', -'preset_expires' => 'ﺕﺍﺮﻴﺧ ﺍﻼﻨﺘﻫﺍﺀ', -'preview' => 'ﻢﻋﺎﻴﻧﺓ', -'preview_converters' => '', -'preview_images' => '', -'preview_markdown' => '', -'preview_pdf' => '', -'preview_plain' => '', +'pl_PL' => 'البولندية', +'possible_substitutes' => 'بدلاء متاحين', +'preset_expires' => 'تاريخ الإنتهاء', +'preview' => 'معاينة', +'preview_converters' => 'محول المعاينات', +'preview_images' => 'معاينة الصور', +'preview_markdown' => 'معاينة التخفيضات', +'preview_pdf' => 'معاينة ملف pdf', +'preview_plain' => 'معاينة سطحية', 'previous_state' => 'حالة سابقة', 'previous_versions' => 'اصدارات سابقة', -'process' => '', -'process_without_user_group' => '', +'process' => 'سير العمل', +'process_without_user_group' => 'معالجة دون استعمال مستخدم من المجموعة', 'pt_BR' => 'البرتغالية (BR)', 'quota' => 'المساحة المخصصة', 'quota_exceeded' => 'لقد قمت بتعدي المساحة المخصصة لك بمقدار [bytes].', -'quota_is_disabled' => '', +'quota_is_disabled' => 'الغيت الكوتا', 'quota_warning' => 'اقصى مساحة للقرص الصلب تم تعديها بمقدار [bytes]. من فضلك قم بمسح بعض المستندات او اصدارات سابقة منها', -'receipts_accepted' => '', +'receipts_accepted' => 'تم الموافقة على الوصول', 'receipts_accepted_latest' => '', -'receipts_not_touched' => '', +'receipts_not_touched' => 'الوصول غير ملموسة', 'receipts_not_touched_latest' => '', -'receipts_rejected' => '', +'receipts_rejected' => 'تم رفض الوصول', 'receipts_rejected_latest' => '', -'receipts_without_group' => '', -'receipts_without_user' => '', -'receipt_deletion_email_body' => '', -'receipt_deletion_email_subject' => '', -'receipt_log' => '', -'receipt_request_email_body' => '', -'receipt_request_email_subject' => '', -'receipt_status' => '', -'receipt_summary' => '', -'receipt_update_failed' => '', -'recent_uploads' => 'ﺂﺧﺭ ﺎﻠﻤﻠﻓﺎﺗ ﺎﻠﻣﺮﻓﻮﻋﺓ"', -'reception' => '', -'reception_acknowleged' => '', -'reception_noaction' => '', -'reception_rejected' => '', -'recipients' => '', -'recipient_already_removed' => '', -'redraw' => '', +'receipts_without_group' => 'وصل دون مجموعة', +'receipts_without_user' => 'وصل دون مستخدم', +'receipt_deletion_email_body' => 'إيصال لإلغاء محتوى البريد الإلكتروني', +'receipt_deletion_email_subject' => 'إيصال لإلغال موضوع البريد الإلكتروني', +'receipt_log' => 'إيصال سجل', +'receipt_request_email_body' => 'طلب إيصال من محتوى البريد الإلكتروني', +'receipt_request_email_subject' => 'طلب إيصال من موضوع البريد الإلكتروني', +'receipt_status' => 'حالة الإيصال', +'receipt_summary' => 'ملخص الإيصال', +'receipt_update_failed' => 'فشل في تحديث الإيصال', +'recent_uploads' => 'الإضافات الأخيرة', +'reception' => 'إستقبال', +'reception_acknowleged' => 'موافقة على الإستقبال', +'reception_noaction' => 'ابستقبال بلا نشاط', +'reception_rejected' => 'إستقبال مرفوض', +'recipients' => 'المستلمين', +'recipient_already_removed' => 'تم إيزال المستلم', +'redraw' => 'إعادة رسم', 'refresh' => 'اعادة تحميل', 'rejected' => 'مرفوض', -'released' => 'منشور', +'released' => 'صدر', 'removed_approver' => 'تم ازالته من قائمة الموافقون', 'removed_file_email' => 'تم ازالة المرفقات', 'removed_file_email_body' => 'تم ازالة المرفقات @@ -953,9 +957,9 @@ URL: [url]', المستخدم: [username] URL: [url]', 'removed_file_email_subject' => '[sitename]: [document] - تم ازالة المرفقات', -'removed_recipient' => '', +'removed_recipient' => 'إزالة المستلم', 'removed_reviewer' => 'تم ازالته من قائمة المراجعة', -'removed_revisor' => '', +'removed_revisor' => 'إزالة المراجع', 'removed_workflow_email_body' => 'تم ازالة مسار العمل من اصدار المستند مستند: [name] اصدار: [version] @@ -964,14 +968,14 @@ Parent folder: [folder_path] مستخدم: [username] URL: [url]', 'removed_workflow_email_subject' => '[sitename]: [name] - تم ازالة مسار العمل من اصدار المستند', -'removeFolderFromDropFolder' => '', +'removeFolderFromDropFolder' => 'إزالة مجلد من إسقاط لائحة', 'remove_marked_files' => 'ازالة الملفات المختارة', 'repaired' => 'تم اصلاحه', 'repairing_objects' => 'تحضير المستندات والمجلدات.', -'request_workflow_action_email_body' => '', -'request_workflow_action_email_subject' => '', -'reset_checkout' => '', -'restrict_access' => '', +'request_workflow_action_email_body' => 'طلب سير عمل في نشاط محتوى البريد الإلكتروني', +'request_workflow_action_email_subject' => 'طلب سير العمل في نشاط موضوع البريد الإلكتروني', +'reset_checkout' => 'إعادة تعيين الخروج', +'restrict_access' => 'الحد من تسجيل الدخول', 'results_page' => 'صفحة النتائج', 'return_from_subworkflow' => 'العودة من مسار العمل الفرعي', 'return_from_subworkflow_email_body' => 'عودة من مسار عمل فرعي @@ -983,27 +987,27 @@ Parent folder: [folder_path] مستخدم: [username] URL: [url]', 'return_from_subworkflow_email_subject' => '[sitename]: [name] - عودة من مسار عمل فرعي', -'reverse_links' => '', +'reverse_links' => 'الروابط العكسية', 'reviewers' => 'المراجعون', 'reviewer_already_assigned' => 'بالفعل تم تخصيصة كمراجع', 'reviewer_already_removed' => 'بالفعل تم ازالته من عملية المراجعة او تم تقديمه للمراجعة', -'reviews_accepted' => '', +'reviews_accepted' => 'تم الموافقة على المراجعات', 'reviews_accepted_latest' => '', -'reviews_not_touched' => '', +'reviews_not_touched' => 'مراجعات غير ملموسة', 'reviews_not_touched_latest' => '', -'reviews_rejected' => '', +'reviews_rejected' => 'تم رفض المراجعة', 'reviews_rejected_latest' => '', -'reviews_without_group' => '', -'reviews_without_user' => '', +'reviews_without_group' => 'مراجعات بلا مجموعة', +'reviews_without_user' => 'مراجعات بلا مستخدم', 'review_deletion_email' => 'طلب المراجعة تم مسحه', -'review_deletion_email_body' => '', -'review_deletion_email_subject' => '', -'review_file' => '', +'review_deletion_email_body' => 'مراجعة البريد الإلكتروني قبل مسحه', +'review_deletion_email_subject' => 'مراجعة موضوع البريد الإلكتروني قبل مسحه', +'review_file' => 'مراجعة ملف', 'review_group' => 'مجموعة المراجعة', -'review_log' => 'ﺲﺠﻟ ﺎﻠﻣﺭﺎﺠﻋﺓ', +'review_log' => 'سجل المراجعة', 'review_request_email' => 'طلب مراجعة', -'review_request_email_body' => '', -'review_request_email_subject' => '', +'review_request_email_body' => 'طلب مراجعة محتوى البريد الإلكتروني', +'review_request_email_subject' => 'طلب مراجعة موضوع البريد الإلكتروني', 'review_status' => 'حالة المراجعة:', 'review_submit_email' => 'تم تقديم المراجعة', 'review_submit_email_body' => 'تم تقديم المراجعة @@ -1017,29 +1021,29 @@ URL: [url]', 'review_submit_email_subject' => '[sitename]: [name] - تم تقديم المراجعة', 'review_summary' => 'ملخص المراجعة', 'review_update_failed' => 'خطأ في تحديث حالة المراجعة. التحديث فشل.', -'revise_document' => '', -'revise_document_on' => '', -'revisions_accepted' => '', +'revise_document' => 'راجع المستند', +'revise_document_on' => 'راجع المستند على', +'revisions_accepted' => 'تم الموافقة على المراجعات', 'revisions_accepted_latest' => '', -'revisions_not_touched' => '', +'revisions_not_touched' => 'المراجعات غير ملموسة', 'revisions_not_touched_latest' => '', -'revisions_pending' => '', +'revisions_pending' => 'المراجعات قيد الإنتظار', 'revisions_pending_latest' => '', -'revisions_rejected' => '', +'revisions_rejected' => 'تم رفض المراجعات', 'revisions_rejected_latest' => '', -'revisions_without_group' => '', -'revisions_without_user' => '', -'revision_date' => '', -'revision_log' => '', -'revision_request_email_body' => '', -'revision_request_email_subject' => '', -'revision_status' => '', -'revision_submit_email_body' => '', -'revision_submit_email_subject' => '', +'revisions_without_group' => 'مراجعات بلا مجموعة', +'revisions_without_user' => 'مراجعات بلا مستخدم', +'revision_date' => 'تاريخ المراجعة', +'revision_log' => 'سجل المراجعة', +'revision_request_email_body' => 'طلب مراجعة محتوى البريد الإلكتروني', +'revision_request_email_subject' => 'طلب مراجعة موضوع البريد الإلكتروني', +'revision_status' => 'حالة المراجعة', +'revision_submit_email_body' => 'تم تقديم مراجعة محتوى البريد الإلكتروني', +'revision_submit_email_subject' => 'تم تقديم مراجعة موضوع البريد الإلكتروني', 'revision_summary' => '', -'revisors' => '', -'revisor_already_assigned' => '', -'revisor_already_removed' => '', +'revisors' => 'المراجعين', +'revisor_already_assigned' => 'تم تعيين المراجع', +'revisor_already_removed' => 'تم إزالة المراجع', 'rewind_workflow' => 'اعادة بدء مسار العمل', 'rewind_workflow_email_body' => 'اعادة بدء مسار العمل المستند: [name] @@ -1051,21 +1055,21 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - اعادة بدء مسار العمل', 'rewind_workflow_warning' => 'لو قمت باعادة تشغيل مسار العمل لحالته الاصلية، سيتم مسح سجلات مسار العمل للمستند ولايمكن استعادته', 'rm_attrdef' => 'ازالة تعريف سمة', -'rm_attrdefgroup' => '', -'rm_attr_value' => '', +'rm_attrdefgroup' => 'ازالة تعريف سمة المجموعة', +'rm_attr_value' => 'ازالة سمة الرقم', 'rm_default_keyword_category' => 'ازالة القسم', 'rm_document' => 'ازالة المستند', 'rm_document_category' => 'ازالة القسم', -'rm_event' => '', +'rm_event' => 'ازالة هدف', 'rm_file' => 'ازالة الملف', 'rm_folder' => 'ازالة المجلد', 'rm_from_clipboard' => 'ازالة من لوحة القصاصات', 'rm_group' => 'ازالة هذه المجموعة', -'rm_role' => '', -'rm_transmittal' => '', -'rm_transmittalitem' => '', +'rm_role' => 'ازالة دور', +'rm_transmittal' => 'ازالة محول', +'rm_transmittalitem' => 'ازالة حاجة المحول', 'rm_user' => 'ازالة هذا المستخدم', -'rm_user_from_processes' => '', +'rm_user_from_processes' => 'ازالة مستخدم من العمليات', 'rm_version' => 'ازالة اصدار', 'rm_workflow' => 'ازالة مسار عمل', 'rm_workflow_action' => 'ازالة اجراء مسار عمل', @@ -1074,12 +1078,12 @@ URL: [url]', 'role' => 'دور', 'role_admin' => 'مدير النظام', 'role_guest' => 'ضيف', -'role_info' => '', -'role_management' => '', -'role_name' => '', -'role_type' => '', +'role_info' => 'دور المعلومات', +'role_management' => 'دور الإدارة', +'role_name' => 'دور الإسم', +'role_type' => 'نوع الدور', 'role_user' => 'مستخدم', -'ro_RO' => 'ﺭﻮﻣﺎﻨﻳﺓ', +'ro_RO' => 'رومانية', 'run_subworkflow' => 'تشغيل مسار عمل فرعي', 'run_subworkflow_email_body' => 'مسار العمل الفرعي بدأ المستند: [name] @@ -1094,610 +1098,616 @@ URL: [url]', 'saturday' => 'السبت', 'saturday_abbr' => 'س', 'save' => 'حفظ', -'scheduler_class' => '', -'scheduler_class_description' => '', -'scheduler_class_parameter' => '', -'scheduler_class_tasks' => '', +'scheduler_class' => 'جدول الصف', +'scheduler_class_description' => 'تفصيل جدول الصف', +'scheduler_class_parameter' => 'معامل جدول الصف', +'scheduler_class_tasks' => 'مهام جدول الصف', 'scheduler_task_mgr' => '', 'search' => 'البحث', 'search_fulltext' => 'بحث في النص الكامل', 'search_in' => 'بحث في', 'search_mode_and' => 'كل الكلمات', -'search_mode_documents' => '', -'search_mode_folders' => '', +'search_mode_documents' => 'وضع البحث عن مستندات', +'search_mode_folders' => 'وضع البحث عن مجلدات', 'search_mode_or' => 'على الاقل كلمة واحدة', 'search_no_results' => 'لا يوجد مستند مطابق للبحث', 'search_query' => 'بحث عن', 'search_report' => 'وجد [doccount] مستند و [foldercount] مجلد في [searchtime] ثانية.', 'search_report_fulltext' => 'وجد [doccount] مستندات', -'search_resultmode' => '', -'search_resultmode_both' => '', +'search_resultmode' => 'وضع نتائج البحث', +'search_resultmode_both' => 'وضع نتائح البحث عن الإثنين', 'search_results' => 'نتائج البحث', 'search_results_access_filtered' => 'نتائج البحث من الممكن ان تحتوى بعد المستندات التى ليس لديك صلاحية اليها', 'search_time' => 'الوقت المتبقي: [time] sec.', 'seconds' => 'ثواني', 'selection' => 'اختيار', -'select_attrdefgrp_show' => '', -'select_attribute_value' => '', +'select_attrdefgrp_show' => 'حدد معرف سمة المجموعة', +'select_attribute_value' => 'اختيار سمة الرقم', 'select_category' => 'اضغط لاختيار قسم', -'select_group' => 'ﺎﺨﺘﻳﺍﺭ ﻢﺠﻣﻮﻋﺓ', +'select_group' => 'اختيار مجموعة', 'select_groups' => 'اضغط لاختيار مجموعة', 'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون', -'select_grp_ind_approvers' => '', -'select_grp_ind_notification' => '', -'select_grp_ind_recipients' => '', -'select_grp_ind_reviewers' => '', -'select_grp_ind_revisors' => '', -'select_grp_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﻤﺠﻣﻮﻋﺓ', -'select_grp_recipients' => '', +'select_grp_ind_approvers' => 'اختيار مجموعة موافقين', +'select_grp_ind_notification' => 'اختيار مجموعة اشعارات', +'select_grp_ind_recipients' => 'اختيار مجموعة مستلمين', +'select_grp_ind_reviewers' => 'اختيار مجموعة مراجعين', +'select_grp_ind_revisors' => 'اختيار مجموعة مراجعين', +'select_grp_notification' => 'اضغط لإختيار مجموعة الشعارات', +'select_grp_recipients' => 'اختيار مجموعة مستلمين', 'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون', -'select_grp_revisors' => '', +'select_grp_revisors' => 'اختيار مجموعة مراجعين', 'select_ind_approvers' => 'اضغط لاختيار موافق فردي', -'select_ind_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﺸﺨﺻ', -'select_ind_recipients' => '', +'select_ind_notification' => 'اضغط لإختيار اشعار فردي', +'select_ind_recipients' => 'اختيار مستلم فردي', 'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي', -'select_ind_revisors' => '', +'select_ind_revisors' => 'اضغط لإختيار مراجعين فرديين', 'select_one' => 'اختر واحد', -'select_user' => 'ﺎﺨﺗﺭ ﻢﺴﺘﺧﺪﻣ', +'select_user' => 'اختر مستخدم', 'select_users' => 'اضغط لاختيار المستخدم', -'select_value' => 'ﺎﺨﺗﺭ ﺎﻠﻘﻴﻣﺓ ﺮﺟﺍﺀً', +'select_value' => 'ًاختار قيمة', 'select_workflow' => 'اختر مسار العمل', -'send_email' => '', -'send_login_data' => '', -'send_login_data_body' => '', -'send_login_data_subject' => '', -'send_test_mail' => '', +'send_email' => 'بعث بريد الكتروني', +'send_login_data' => 'ارسل بيانات تسجيل الدخول', +'send_login_data_body' => 'ارسل محتوى بيانات تسجيل الدخول', +'send_login_data_subject' => 'ارسل موضوع بيانات تسجيل الدخول', +'send_test_mail' => 'ارسل رسالة تجريبية', 'september' => 'سبتمبر', 'sequence' => 'تتابع', 'seq_after' => 'بعد "[prevname]"', 'seq_end' => 'في الاخر', 'seq_keep' => 'حافظ على المرتبة', 'seq_start' => 'اول مرتبة', -'sessions' => '', -'setDateFromFile' => '', -'setDateFromFolder' => '', +'sessions' => 'صفوف', +'setDateFromFile' => 'وضع تاريخ من الملف', +'setDateFromFolder' => 'تحديد التاريخ من المجلد', 'settings' => 'الإعدادات', 'settings_activate_module' => 'Activate module', 'settings_activate_php_extension' => 'Activate PHP extension', 'settings_adminIP' => 'Admin IP', -'settings_adminIP_desc' => '', +'settings_adminIP_desc' => 'ِAdmin IP', 'settings_Advanced' => 'متقدم', -'settings_advancedAcl' => '', -'settings_advancedAcl_desc' => '', -'settings_allowChangeRevAppInProcess' => '', -'settings_allowChangeRevAppInProcess_desc' => '', -'settings_allowReviewerOnly' => '', -'settings_allowReviewerOnly_desc' => '', +'settings_advancedAcl' => 'متقدم', +'settings_advancedAcl_desc' => 'متقدم', +'settings_allowChangeRevAppInProcess' => 'السماح بتغيير التطبيق في العملية', +'settings_allowChangeRevAppInProcess_desc' => 'السماح بتغيير التطبيق في العملية', +'settings_allowReviewerOnly' => 'السماح بالمراجع فقط', +'settings_allowReviewerOnly_desc' => 'السماح بالمراجع فقط', 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite', -'settings_Authentication' => '', -'settings_autoLoginUser' => '', -'settings_autoLoginUser_desc' => '', -'settings_available_languages' => '', -'settings_available_languages_desc' => '', -'settings_backupDir' => '', -'settings_backupDir_desc' => '', -'settings_cacheDir' => '', -'settings_cacheDir_desc' => '', +'settings_Authentication' => 'المصادقة', +'settings_autoLoginUser' => 'تسجيل الدخول التلقائي', +'settings_autoLoginUser_desc' => 'تسجيل الدخول التلقائي', +'settings_available_languages' => 'اللغات الموجودة', +'settings_available_languages_desc' => 'اللغات الموجودة', +'settings_backupDir' => 'backupDir', +'settings_backupDir_desc' => 'backupDir', +'settings_cacheDir' => 'cacheDir', +'settings_cacheDir_desc' => 'cacheDir', 'settings_Calendar' => 'اعدادات التقويم', 'settings_calendarDefaultView' => 'العرض الافتراضي للتقويم', 'settings_calendarDefaultView_desc' => 'العرض الافتراضي للتقويم', -'settings_cannot_disable' => '', -'settings_checkOutDir' => '', -'settings_checkOutDir_desc' => '', -'settings_cmdTimeout' => '', -'settings_cmdTimeout_desc' => '', +'settings_cannot_disable' => 'لا يمكن التعطيل', +'settings_checkOutDir' => 'checkOutDir', +'settings_checkOutDir_desc' => 'checkOutDir', +'settings_cmdTimeout' => 'انتهاء مدة cmd', +'settings_cmdTimeout_desc' => 'انتهاء مدة cmd', 'settings_contentDir' => 'مجلد المحتوى', -'settings_contentDir_desc' => '', -'settings_contentOffsetDir' => '', -'settings_contentOffsetDir_desc' => '', -'settings_convertToPdf' => '', -'settings_convertToPdf_desc' => '', -'settings_cookieLifetime' => '', -'settings_cookieLifetime_desc' => '', -'settings_coreDir' => '', -'settings_coreDir_desc' => '', -'settings_createCheckOutDir' => '', -'settings_createCheckOutDir_desc' => '', -'settings_createdatabase' => '', -'settings_createdirectory' => '', -'settings_currentvalue' => '', -'settings_Database' => '', -'settings_dbDatabase' => '', -'settings_dbDatabase_desc' => '', -'settings_dbDriver' => '', -'settings_dbDriver_desc' => '', -'settings_dbHostname' => '', -'settings_dbHostname_desc' => '', -'settings_dbPass' => '', -'settings_dbPass_desc' => '', -'settings_dbUser' => '', -'settings_dbUser_desc' => '', -'settings_dbVersion' => '', -'settings_defaultAccessDocs' => '', -'settings_defaultAccessDocs_desc' => '', -'settings_defaultDocPosition' => '', -'settings_defaultDocPosition_desc' => '', -'settings_defaultDocPosition_val_end' => '', -'settings_defaultDocPosition_val_start' => '', -'settings_defaultSearchMethod' => '', -'settings_defaultSearchMethod_desc' => '', -'settings_defaultSearchMethod_valdatabase' => '', -'settings_defaultSearchMethod_valfulltext' => '', -'settings_delete_install_folder' => '', -'settings_disableSelfEdit' => '', -'settings_disableSelfEdit_desc' => '', -'settings_disable_install' => '', +'settings_contentDir_desc' => 'محتوى المجلد', +'settings_contentOffsetDir' => 'محتوى المجلد', +'settings_contentOffsetDir_desc' => 'محتوى المجلد', +'settings_convertToPdf' => 'تحويل الى pdf', +'settings_convertToPdf_desc' => 'تحويل الى pdf', +'settings_cookieLifetime' => 'ملف تعريف الارتباط', +'settings_cookieLifetime_desc' => 'ملف تعريف الارتباط', +'settings_coreDir' => 'coreDir', +'settings_coreDir_desc' => 'coreDir', +'settings_createCheckOutDir' => 'اختراع سحب', +'settings_createCheckOutDir_desc' => 'اختراع سحب', +'settings_createdatabase' => 'اختراح بيانات', +'settings_createdirectory' => 'انشاء دليل', +'settings_currentvalue' => 'القيمة الحالية', +'settings_Database' => 'قاعدة البيانات', +'settings_dbDatabase' => 'قاعدة البيانات', +'settings_dbDatabase_desc' => 'قاعدة البيانات', +'settings_dbDriver' => 'القرص', +'settings_dbDriver_desc' => 'القرص', +'settings_dbHostname' => 'اسم المضيف', +'settings_dbHostname_desc' => 'اسم المضيف', +'settings_dbPass' => 'كلمة السر', +'settings_dbPass_desc' => 'كلمة السر', +'settings_dbUser' => 'مستخدم', +'settings_dbUser_desc' => 'مستخدم', +'settings_dbVersion' => 'إصدار', +'settings_defaultAccessDocs' => 'مستندات الوصول الافتراضية', +'settings_defaultAccessDocs_desc' => 'مستندات الوصول الافتراضية', +'settings_defaultDocPosition' => 'الموقف الافتراضي للوثيقة', +'settings_defaultDocPosition_desc' => 'الموقف الافتراضي للوثيقة', +'settings_defaultDocPosition_val_end' => 'الموقف الافتراضي للوثيقة نهاية القيمة', +'settings_defaultDocPosition_val_start' => 'الموقف الافتراضي للوثيقة بداية القيمة', +'settings_defaultSearchMethod' => 'طريقة البحث الافتراضية', +'settings_defaultSearchMethod_desc' => 'طريقة البحث الافتراضية', +'settings_defaultSearchMethod_valdatabase' => 'طريقة البحث الافتراضية في قاعدة البيانات', +'settings_defaultSearchMethod_valfulltext' => 'طريقة البحث الافتراضية في جمل كاملة', +'settings_delete_install_folder' => 'مسح مثبت المجلد', +'settings_disableSelfEdit' => 'تعطيل التحرير الذاتي', +'settings_disableSelfEdit_desc' => 'تعطيل التحرير الذاتي', +'settings_disable_install' => 'تعطيل التثبيت', 'settings_Display' => 'اعدادات العرض', -'settings_dropFolderDir' => '', -'settings_dropFolderDir_desc' => '', +'settings_dropFolderDir' => 'dropFolderDir', +'settings_dropFolderDir_desc' => 'dropFolderDir', 'settings_Edition' => 'اعدادات التحرير', -'settings_editOnlineFileTypes' => '', -'settings_editOnlineFileTypes_desc' => '', -'settings_enable2FactorAuthentication' => '', -'settings_enable2FactorAuthentication_desc' => '', -'settings_enableAcknowledgeWorkflow' => '', -'settings_enableAcknowledgeWorkflow_desc' => '', -'settings_enableAdminReceipt' => '', -'settings_enableAdminReceipt_desc' => '', -'settings_enableAdminRevApp' => '', -'settings_enableAdminRevApp_desc' => '', -'settings_enableCalendar' => '', -'settings_enableCalendar_desc' => '', -'settings_enableClipboard' => '', -'settings_enableClipboard_desc' => '', -'settings_enableConverting' => '', -'settings_enableConverting_desc' => '', -'settings_enableDropFolderList' => '', -'settings_enableDropFolderList_desc' => '', -'settings_enableDropUpload' => '', -'settings_enableDropUpload_desc' => '', -'settings_enableDuplicateDocNames' => '', +'settings_editOnlineFileTypes' => 'تحرير أنواع الملفات على الإنترنت', +'settings_editOnlineFileTypes_desc' => 'تحرير أنواع الملفات على الإنترنت', +'settings_enable2FactorAuthentication' => 'تمكين عامل المصادقة الثنائي', +'settings_enable2FactorAuthentication_desc' => 'تمكين عامل المصادقة الثنائي', +'settings_enableAcknowledgeWorkflow' => 'تمكين سير العمل المعترف به', +'settings_enableAcknowledgeWorkflow_desc' => 'تمكين سير العمل المعترف به', +'settings_enableAdminReceipt' => 'تمكين استلام المسؤول', +'settings_enableAdminReceipt_desc' => 'تمكين استلام المسؤول', +'settings_enableAdminRevApp' => 'تمكين المسؤول من مراجعة التطبيق', +'settings_enableAdminRevApp_desc' => 'تمكين المسؤول من مراجعة التطبيق', +'settings_enableCalendar' => 'تمكين التقويم', +'settings_enableCalendar_desc' => 'تمكين التقويم', +'settings_enableClipboard' => 'تمكين الحافظة', +'settings_enableClipboard_desc' => 'تمكين الحافظة', +'settings_enableConverting' => 'تمكين التحويل', +'settings_enableConverting_desc' => 'تمكين التحويل', +'settings_enableDropFolderList' => 'تمكين إسقاط قائمة المجلدات', +'settings_enableDropFolderList_desc' => 'تمكين إسقاط قائمة المجلدات', +'settings_enableDropUpload' => 'تمكين التحميل السريع', +'settings_enableDropUpload_desc' => 'تمكين التحميل السريع', +'settings_enableDuplicateDocNames' => 'تمكين أسماء مكررة للوثيقة', 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', -'settings_enableEmail' => '', -'settings_enableEmail_desc' => 'Enable/disable automatic email notification', -'settings_enableFilterReceipt' => '', -'settings_enableFilterReceipt_desc' => '', -'settings_enableFolderTree' => '', -'settings_enableFolderTree_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'تمكين أسماء مكررة للمجلدات الفرعية', +'settings_enableDuplicateSubFolderNames_desc' => 'تمكين أسماء مكررة للمجلدات الفرعية', +'settings_enableEmail' => 'تمكين البريد الإلكتروني', +'settings_enableEmail_desc' => 'تمكين البريد الإلكتروني', +'settings_enableFilterReceipt' => 'تمكين الاستلام حسب الفلتر', +'settings_enableFilterReceipt_desc' => 'تمكين الاستلام حسب الفلتر', +'settings_enableFolderTree' => 'تمكين شجرة المجلد', +'settings_enableFolderTree_desc' => 'تمكين شجرة المجلد', 'settings_enableFullSearch' => 'تفعيل البحث بالنص الكامل', 'settings_enableFullSearch_desc' => 'تفعيل البحث بالنص الكامل', -'settings_enableGuestAutoLogin' => '', -'settings_enableGuestAutoLogin_desc' => '', -'settings_enableGuestLogin' => '', -'settings_enableGuestLogin_desc' => '', -'settings_enableHelp' => '', -'settings_enableHelp_desc' => '', -'settings_enableLanguageSelector' => '', -'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.', -'settings_enableLargeFileUpload' => 'Enable large file upload', -'settings_enableLargeFileUpload_desc' => '', -'settings_enableMenuTasks' => '', -'settings_enableMenuTasks_desc' => '', -'settings_enableMultiUpload' => '', -'settings_enableMultiUpload_desc' => '', -'settings_enableNotificationAppRev' => '', -'settings_enableNotificationAppRev_desc' => '', -'settings_enableNotificationWorkflow' => '', -'settings_enableNotificationWorkflow_desc' => '', -'settings_enableOwnerNotification' => '', -'settings_enableOwnerNotification_desc' => '', -'settings_enableOwnerReceipt' => '', -'settings_enableOwnerReceipt_desc' => '', -'settings_enableOwnerRevApp' => '', -'settings_enableOwnerRevApp_desc' => '', -'settings_enablePasswordForgotten' => '', -'settings_enablePasswordForgotten_desc' => '', -'settings_enableReceiptReject' => '', -'settings_enableReceiptReject_desc' => '', -'settings_enableReceiptWorkflow' => '', -'settings_enableReceiptWorkflow_desc' => '', -'settings_enableRecursiveCount' => '', -'settings_enableRecursiveCount_desc' => '', +'settings_enableGuestAutoLogin' => 'تمكين تسجيل دخول ضيف تلقائي', +'settings_enableGuestAutoLogin_desc' => 'تمكين تسجيل دخول ضيف تلقائي', +'settings_enableGuestLogin' => 'تمكين دخول ضيف', +'settings_enableGuestLogin_desc' => 'تمكين دخول ضيف', +'settings_enableHelp' => 'تمكين المساعدة', +'settings_enableHelp_desc' => 'تمكين المساعدة', +'settings_enableLanguageSelector' => 'تمكين تحديد اللغة', +'settings_enableLanguageSelector_desc' => 'تمكين تحديد اللغة', +'settings_enableLargeFileUpload' => 'تمكين تحميل الملفات الكبيرة', +'settings_enableLargeFileUpload_desc' => 'تمكين تحميل الملفات الكبيرة', +'settings_enableMenuTasks' => 'تمكين مهام القائمة', +'settings_enableMenuTasks_desc' => 'تمكين مهام القائمة', +'settings_enableMultiUpload' => 'تمكين تحميل متعدد', +'settings_enableMultiUpload_desc' => 'تمكين تحميل متعدد', +'settings_enableNotificationAppRev' => 'تمكيين اشعارات لمراجعة التطبيق', +'settings_enableNotificationAppRev_desc' => 'تمكيين اشعارات لمراجعة التطبيق', +'settings_enableNotificationWorkflow' => 'تمكيين اشعار لسير العمل', +'settings_enableNotificationWorkflow_desc' => 'تمكيين اشعار لسير العمل', +'settings_enableOwnerNotification' => 'تمكين إشعار المالك', +'settings_enableOwnerNotification_desc' => 'تمكين إشعار المالك', +'settings_enableOwnerReceipt' => 'تمكين استلام المالك', +'settings_enableOwnerReceipt_desc' => 'تمكين استلام المالك', +'settings_enableOwnerRevApp' => 'تمكين المالك من مراجعة التطبيق', +'settings_enableOwnerRevApp_desc' => 'تمكين المالك من مراجعة التطبيق', +'settings_enablePasswordForgotten' => 'تمكين نسيان كلمة المرور', +'settings_enablePasswordForgotten_desc' => 'تمكين نسيان كلمة المرور', +'settings_enableReceiptReject' => 'تمكين رفض الاستلام', +'settings_enableReceiptReject_desc' => 'تمكين رفض الاستلام', +'settings_enableReceiptWorkflow' => 'تمكين استلام سير العمل', +'settings_enableReceiptWorkflow_desc' => 'تمكين استلام سير العمل', +'settings_enableRecursiveCount' => 'تمكين عدد المستندات / المجلدات العودية', +'settings_enableRecursiveCount_desc' => 'تمكين عدد المستندات / المجلدات العودية', 'settings_enableRevisionOneVoteReject' => '', 'settings_enableRevisionOneVoteReject_desc' => '', -'settings_enableRevisionOnVoteReject' => '', -'settings_enableRevisionOnVoteReject_desc' => '', -'settings_enableRevisionWorkflow' => '', -'settings_enableRevisionWorkflow_desc' => '', -'settings_enableSelfReceipt' => '', -'settings_enableSelfReceipt_desc' => '', -'settings_enableSelfRevApp' => '', -'settings_enableSelfRevApp_desc' => '', -'settings_enableSessionList' => '', -'settings_enableSessionList_desc' => '', -'settings_enableThemeSelector' => '', -'settings_enableThemeSelector_desc' => '', -'settings_enableUpdateReceipt' => '', -'settings_enableUpdateReceipt_desc' => '', -'settings_enableUpdateRevApp' => '', -'settings_enableUpdateRevApp_desc' => '', -'settings_enableUserImage' => '', -'settings_enableUserImage_desc' => '', -'settings_enableUsersView' => '', -'settings_enableUsersView_desc' => '', -'settings_enableVersionDeletion' => '', -'settings_enableVersionDeletion_desc' => '', -'settings_enableVersionModification' => '', -'settings_enableVersionModification_desc' => '', -'settings_enableWebdavReplaceDoc' => '', -'settings_enableWebdavReplaceDoc_desc' => '', -'settings_enableXsendfile' => '', -'settings_enableXsendfile_desc' => '', -'settings_encryptionKey' => '', -'settings_encryptionKey_desc' => '', +'settings_enableRevisionOnVoteReject' => 'تمكين رفض مراجعة التصويت', +'settings_enableRevisionOnVoteReject_desc' => 'تمكين رفض مراجعة التصويت', +'settings_enableRevisionWorkflow' => 'تمكين مراجعة سير العمل', +'settings_enableRevisionWorkflow_desc' => 'تمكين مراجعة سير العمل', +'settings_enableSelfReceipt' => 'تمكين الاستلام الذاتي', +'settings_enableSelfReceipt_desc' => 'تمكين الاستلام الذاتي', +'settings_enableSelfRevApp' => 'تمكيين المراجعة الذاتية للتطبيق', +'settings_enableSelfRevApp_desc' => 'تمكيين المراجعة الذاتية للتطبيق', +'settings_enableSessionList' => 'تمكين قائمة الجلسة', +'settings_enableSessionList_desc' => 'تمكين قائمة الجلسة', +'settings_enableThemeSelector' => 'تمكين سمة محددة', +'settings_enableThemeSelector_desc' => 'تمكين سمة محددة', +'settings_enableUpdateReceipt' => 'تمكين تحديث الاستلام', +'settings_enableUpdateReceipt_desc' => 'تمكين تحديث الاستلام', +'settings_enableUpdateRevApp' => 'تمكين تحديث مراجعة التطبيق', +'settings_enableUpdateRevApp_desc' => 'تمكين تحديث مراجعة التطبيق', +'settings_enableUserImage' => 'تمكين صورة المستخدم', +'settings_enableUserImage_desc' => 'تمكين صورة المستخدم', +'settings_enableUsersView' => 'تمكين واجهة المستخدم', +'settings_enableUsersView_desc' => 'تمكين واجهة المستخدم', +'settings_enableVersionDeletion' => 'تمكين حذف اصدارات مسبقة', +'settings_enableVersionDeletion_desc' => 'تمكين حذف اصدارات مسبقة', +'settings_enableVersionModification' => 'تمكين تعديل الإصدار', +'settings_enableVersionModification_desc' => 'تمكين تعديل الإصدار', +'settings_enableWebdavReplaceDoc' => 'webdav بالمستند تمكين استبدال', +'settings_enableWebdavReplaceDoc_desc' => 'webdav بالمستند تمكين استبدال', +'settings_enableXsendfile' => 'تمكين إرسال الملف', +'settings_enableXsendfile_desc' => 'تمكين إرسال الملف', +'settings_encryptionKey' => 'مفتاح التشفير', +'settings_encryptionKey_desc' => 'مفتاح التشفير', 'settings_error' => 'خطأ', -'settings_expandFolderTree' => '', -'settings_expandFolderTree_desc' => 'Expand Folder Tree', -'settings_expandFolderTree_val0' => '', -'settings_expandFolderTree_val1' => '', -'settings_expandFolderTree_val2' => '', -'settings_Extensions' => 'ﺎﻠﻤﻠﺤﻗﺎﺗ', -'settings_extraPath' => '', -'settings_extraPath_desc' => '', -'settings_firstDayOfWeek' => '', -'settings_firstDayOfWeek_desc' => '', -'settings_footNote' => '', -'settings_footNote_desc' => '', -'settings_fullSearchEngine' => '', -'settings_fullSearchEngine_desc' => '', +'settings_expandFolderTree' => 'قم بتوسيع شجرة المجلد', +'settings_expandFolderTree_desc' => 'قم بتوسيع شجرة المجلد', +'settings_expandFolderTree_val0' => 'قم بتوسيع شجرة المجلد قيمة0', +'settings_expandFolderTree_val1' => 'قم بتوسيع شجرة المجلد قيمة1', +'settings_expandFolderTree_val2' => 'قم بتوسيع شجرة المجلد قيمة2', +'settings_Extensions' => 'الملحقات', +'settings_extraPath' => 'مسار اضافي', +'settings_extraPath_desc' => 'مسار اضافي', +'settings_firstDayOfWeek' => 'اول يوم في الأسبوع', +'settings_firstDayOfWeek_desc' => 'اول يوم في الأسبوع', +'settings_footNote' => 'رابط', +'settings_footNote_desc' => 'رابط', +'settings_fullSearchEngine' => 'محرك البحث الكامل', +'settings_fullSearchEngine_desc' => 'محرك البحث الكامل', 'settings_fullSearchEngine_vallucene' => 'Zend Lucene', -'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS', -'settings_guestID' => '', -'settings_guestID_desc' => '', -'settings_httpRoot' => '', -'settings_httpRoot_desc' => '', -'settings_incItemsPerPage' => '', -'settings_incItemsPerPage_desc' => '', -'settings_initialDocumentStatus' => '', -'settings_initialDocumentStatus_desc' => '', -'settings_initialDocumentStatus_draft' => '', -'settings_initialDocumentStatus_released' => '', -'settings_installADOdb' => '', -'settings_install_disabled' => '', -'settings_install_pear_package_log' => '', -'settings_install_pear_package_webdav' => '', -'settings_install_success' => '', -'settings_install_welcome_text' => '', -'settings_install_welcome_title' => '', -'settings_install_zendframework' => '', -'settings_language' => '', -'settings_language_desc' => '', -'settings_libraryFolder' => '', -'settings_libraryFolder_desc' => '', -'settings_logFileEnable' => '', -'settings_logFileEnable_desc' => '', -'settings_logFileRotation' => '', -'settings_logFileRotation_desc' => '', -'settings_loginFailure' => 'Login failure', -'settings_loginFailure_desc' => '', -'settings_luceneClassDir' => '', -'settings_luceneClassDir_desc' => '', -'settings_luceneDir' => '', -'settings_luceneDir_desc' => '', -'settings_maxDirID' => '', -'settings_maxDirID_desc' => '', -'settings_maxExecutionTime' => '', -'settings_maxExecutionTime_desc' => '', -'settings_maxItemsPerPage' => '', -'settings_maxItemsPerPage_desc' => '', -'settings_maxRecursiveCount' => '', -'settings_maxRecursiveCount_desc' => '', -'settings_maxSizeForFullText' => '', -'settings_maxSizeForFullText_desc' => '', -'settings_maxUploadSize' => '', -'settings_maxUploadSize_desc' => '', -'settings_more_settings' => '', +'settings_fullSearchEngine_valsqlitefts' => 'SQLITEFTS', +'settings_guestID' => 'معرف الضيف', +'settings_guestID_desc' => 'معرف الضيف', +'settings_httpRoot' => 'httpRoot', +'settings_httpRoot_desc' => 'httpRoot', +'settings_incItemsPerPage' => 'زيادة العناصر في الصفحة', +'settings_incItemsPerPage_desc' => 'زيادة العناصر في الصفحة', +'settings_initialDocumentStatus' => 'حالة المستند الأولي', +'settings_initialDocumentStatus_desc' => 'حالة المستند الأولي', +'settings_initialDocumentStatus_draft' => 'حالة المستند الأولي, المسودة', +'settings_initialDocumentStatus_released' => 'حالة المستند الأولي, صدر', +'settings_installADOdb' => 'تثبيت ADOdb', +'settings_install_disabled' => 'توقيف المثبت', +'settings_install_pear_package_log' => 'تثبيت سجل الحزمة', +'settings_install_pear_package_webdav' => 'تثبيت سجل الحزمة', +'settings_install_success' => 'تم التثبيت بنجاح', +'settings_install_welcome_text' => 'تثبيت نص الترحيب', +'settings_install_welcome_title' => 'تثبيت عنوان الترحيب', +'settings_install_zendframework' => 'تثبيت إطار زند', +'settings_language' => 'اللغة', +'settings_language_desc' => 'اللغة', +'settings_libraryFolder' => 'مجلد المكتبة', +'settings_libraryFolder_desc' => 'مجلد المكتبة', +'settings_logFileEnable' => 'تمكين سجل الملف', +'settings_logFileEnable_desc' => 'تمكين سجل الملف', +'settings_logFileRotation' => 'سجل ملف التناوب', +'settings_logFileRotation_desc' => 'سجل ملف التناوب', +'settings_loginFailure' => 'فشل في تسجيل الدخول', +'settings_loginFailure_desc' => 'فشل في تسجيل الدخول', +'settings_luceneClassDir' => 'luceneClassDir', +'settings_luceneClassDir_desc' => 'luceneClassDir', +'settings_luceneDir' => 'luceneDir', +'settings_luceneDir_desc' => 'luceneDir', +'settings_maxDirID' => 'maxDirID', +'settings_maxDirID_desc' => 'maxDirID', +'settings_maxExecutionTime' => 'الحد الأقصى لوقت التنفيذ', +'settings_maxExecutionTime_desc' => 'الحد الأقصى لوقت التنفيذ', +'settings_maxItemsPerPage' => 'الحد الأقصى للعناصر في كل صفحة', +'settings_maxItemsPerPage_desc' => 'الحد الأقصى للعناصر في كل صفحة', +'settings_maxRecursiveCount' => 'الحد الأقصى لتكرارية العد', +'settings_maxRecursiveCount_desc' => 'الحد الأقصى لتكرارية العد', +'settings_maxSizeForFullText' => 'الحد الأقصى لحجم النص الكامل', +'settings_maxSizeForFullText_desc' => 'الحد الأقصى لحجم النص الكامل', +'settings_maxUploadSize' => 'الحد الأقصى لتحميل الحجم', +'settings_maxUploadSize_desc' => 'الحد الأقصى لتحميل الحجم', +'settings_more_settings' => 'المزيد من الإعدادات', 'settings_noDocumentFormFields' => '', 'settings_noDocumentFormFields_desc' => '', -'settings_notfound' => '', -'settings_Notification' => '', -'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ', -'settings_no_content_dir' => '', +'settings_notfound' => 'غير موجود', +'settings_Notification' => 'اشعار', +'settings_notwritable' => 'غير قابل للكتابة', +'settings_no_content_dir' => 'no content dir', 'settings_onePageMode' => '', 'settings_onePageMode_desc' => '', -'settings_overrideMimeType' => '', -'settings_overrideMimeType_desc' => '', -'settings_partitionSize' => '', -'settings_partitionSize_desc' => '', -'settings_passwordExpiration' => 'Password expiration', -'settings_passwordExpiration_desc' => '', -'settings_passwordHistory' => '', -'settings_passwordHistory_desc' => '', -'settings_passwordStrength' => '', -'settings_passwordStrengthAlgorithm' => '', -'settings_passwordStrengthAlgorithm_desc' => '', -'settings_passwordStrengthAlgorithm_valadvanced' => '', -'settings_passwordStrengthAlgorithm_valsimple' => '', -'settings_passwordStrength_desc' => '', -'settings_pear_log' => '', -'settings_pear_webdav' => '', -'settings_perms' => '', +'settings_overrideMimeType' => 'تجاوز نوع الملف', +'settings_overrideMimeType_desc' => 'تجاوز نوع الملف', +'settings_partitionSize' => 'حجم القسم', +'settings_partitionSize_desc' => 'حجم القسم', +'settings_passwordExpiration' => 'انتهاء صلاحية كلمة المرور', +'settings_passwordExpiration_desc' => 'انتهاء صلاحية كلمة المرور', +'settings_passwordHistory' => 'تاريخ كلمة السر', +'settings_passwordHistory_desc' => 'تاريخ كلمة السر', +'settings_passwordStrength' => 'قوة كلمة السر', +'settings_passwordStrengthAlgorithm' => 'قوة كلمة السر الخوارزمية', +'settings_passwordStrengthAlgorithm_desc' => 'قوة كلمة السر الخوارزمية', +'settings_passwordStrengthAlgorithm_valadvanced' => 'قوة كلمة السر الخوارزمية, القيمة متطورة', +'settings_passwordStrengthAlgorithm_valsimple' => 'قوة كلمة السر الخوارزمية, القيمة عادية', +'settings_passwordStrength_desc' => 'قوة كلمة السر', +'settings_pear_log' => 'سجل', +'settings_pear_webdav' => 'webdav', +'settings_perms' => 'perms', 'settings_php_dbDriver' => 'PHP extension : php_\'see current value\'', 'settings_php_gd2' => 'PHP extension : php_gd2', 'settings_php_mbstring' => 'PHP extension : php_mbstring', -'settings_php_version' => '', -'settings_presetExpirationDate' => '', -'settings_presetExpirationDate_desc' => '', -'settings_previewWidthDetail' => '', -'settings_previewWidthDetail_desc' => '', -'settings_previewWidthDropFolderList' => '', -'settings_previewWidthDropFolderList_desc' => '', -'settings_previewWidthList' => '', -'settings_previewWidthList_desc' => '', -'settings_previewWidthMenuList' => '', -'settings_previewWidthMenuList_desc' => '', -'settings_printDisclaimer' => '', -'settings_printDisclaimer_desc' => '', -'settings_quota' => '', -'settings_quota_desc' => '', -'settings_removeFromDropFolder' => '', -'settings_removeFromDropFolder_desc' => '', -'settings_repositoryUrl' => '', -'settings_repositoryUrl_desc' => '', -'settings_restricted' => '', -'settings_restricted_desc' => '', -'settings_rootDir' => '', -'settings_rootDir_desc' => '', -'settings_rootFolderID' => '', -'settings_rootFolderID_desc' => '', -'settings_SaveError' => '', -'settings_Server' => '', -'settings_showFullPreview' => '', -'settings_showFullPreview_desc' => '', -'settings_showMissingTranslations' => '', -'settings_showMissingTranslations_desc' => '', -'settings_showSingleSearchHit' => '', -'settings_showSingleSearchHit_desc' => '', +'settings_php_version' => 'php version', +'settings_presetExpirationDate' => 'تاريخ انتهاء الصلاحية المسبقة', +'settings_presetExpirationDate_desc' => 'تاريخ انتهاء الصلاحية المسبقة', +'settings_previewWidthDetail' => 'عرض معاينة الصور (التفاصيل)', +'settings_previewWidthDetail_desc' => 'عرض معاينة الصور (التفاصيل)', +'settings_previewWidthDropFolderList' => 'عرض معاينة الصور (إسقاط قائمة المجلدات)', +'settings_previewWidthDropFolderList_desc' => 'عرض معاينة الصور (إسقاط قائمة المجلدات):', +'settings_previewWidthList' => 'عرض معاينة الصور (القائمة)', +'settings_previewWidthList_desc' => 'عرض معاينة الصور (القائمة)', +'settings_previewWidthMenuList' => 'عرض معاينة الصور (جدول القائمة)', +'settings_previewWidthMenuList_desc' => ':عرض معاينة الصور (جدول القائمة)', +'settings_printDisclaimer' => 'طباعة تنويه', +'settings_printDisclaimer_desc' => 'طباعة تنويه', +'settings_quota' => 'الحد الاقصى', +'settings_quota_desc' => 'الحد الاقصى', +'settings_removeFromDropFolder' => 'إزالة من مجلد الإسقاط', +'settings_removeFromDropFolder_desc' => 'إزالة من مجلد الإسقاط', +'settings_repositoryUrl' => 'مستودع الرابط', +'settings_repositoryUrl_desc' => 'مستودع الرابط', +'settings_restricted' => 'محدد', +'settings_restricted_desc' => 'محدد', +'settings_rootDir' => 'rootDir', +'settings_rootDir_desc' => 'rootDir', +'settings_rootFolderID' => 'rootFolderID', +'settings_rootFolderID_desc' => 'rootFolderID', +'settings_SaveError' => 'خطأ في الحفظ', +'settings_Server' => 'الخادم', +'settings_showFullPreview' => 'عرض معاينة كاملة', +'settings_showFullPreview_desc' => 'عرض معاينة كاملة', +'settings_showMissingTranslations' => 'اظهار الترجمات المفقودة', +'settings_showMissingTranslations_desc' => 'اظهار الترجمات المفقودة', +'settings_showSingleSearchHit' => 'عرض بحث مفرد', +'settings_showSingleSearchHit_desc' => 'عرض بحث مفرد', 'settings_Site' => 'الموقع', -'settings_siteDefaultPage' => '', -'settings_siteDefaultPage_desc' => '', +'settings_siteDefaultPage' => 'موقع الصفحة الافتراضية', +'settings_siteDefaultPage_desc' => 'موقع الصفحة الافتراضية', 'settings_siteName' => 'اسم الموقع', -'settings_siteName_desc' => '', +'settings_siteName_desc' => 'اسم الموقع', 'settings_SMTP' => 'SMTP Server settings', -'settings_smtpPassword' => '', -'settings_smtpPassword_desc' => '', +'settings_smtpPassword' => 'smtp Password', +'settings_smtpPassword_desc' => 'smtp Password', 'settings_smtpPort' => 'SMTP Server port', -'settings_smtpPort_desc' => '', -'settings_smtpSendFrom' => '', -'settings_smtpSendFrom_desc' => '', -'settings_smtpSendTestMail' => '', -'settings_smtpSendTestMail_desc' => '', -'settings_smtpServer' => '', -'settings_smtpServer_desc' => '', -'settings_smtpUser' => '', -'settings_smtpUser_desc' => '', -'settings_sortFoldersDefault' => '', -'settings_sortFoldersDefault_desc' => '', -'settings_sortFoldersDefault_val_name' => '', -'settings_sortFoldersDefault_val_sequence' => '', -'settings_sortFoldersDefault_val_unsorted' => '', +'settings_smtpPort_desc' => 'SMTP Server port', +'settings_smtpSendFrom' => 'smtp Send From', +'settings_smtpSendFrom_desc' => 'smtp Send From', +'settings_smtpSendTestMail' => 'smtp Send Test Mail', +'settings_smtpSendTestMail_desc' => 'smtp Send Test Mail', +'settings_smtpServer' => 'smtp Server', +'settings_smtpServer_desc' => 'smtp Server', +'settings_smtpUser' => 'smtp User', +'settings_smtpUser_desc' => 'smtp User', +'settings_sortFoldersDefault' => 'فرز المجلدات الافتراضية', +'settings_sortFoldersDefault_desc' => 'فرز المجلدات الافتراضية', +'settings_sortFoldersDefault_val_name' => 'فرز المجلدات الافتراضية, قيمة الإسم', +'settings_sortFoldersDefault_val_sequence' => 'فرز المجلدات الافتراضية, قيمة التراتبية', +'settings_sortFoldersDefault_val_unsorted' => 'فرز المجلدات الافتراضية, غير مرتب', 'settings_sortUsersInList' => 'ترتيب المستخدمين في القائمة', -'settings_sortUsersInList_desc' => '', +'settings_sortUsersInList_desc' => 'ترتيب المستخدمين في القائمة', 'settings_sortUsersInList_val_fullname' => 'ترتيب بالاسم الكامل', 'settings_sortUsersInList_val_login' => 'ترتيب بواسطة الدخول', -'settings_stagingDir' => '', -'settings_stagingDir_desc' => '', -'settings_start_install' => '', -'settings_stopWordsFile' => '', -'settings_stopWordsFile_desc' => '', -'settings_strictFormCheck' => '', -'settings_strictFormCheck_desc' => '', -'settings_suggestionvalue' => '', +'settings_stagingDir' => 'staging Dir', +'settings_stagingDir_desc' => 'staging Dir', +'settings_start_install' => 'بدء التثبيت', +'settings_stopWordsFile' => 'مسار لإيقاف ملف الكلمات', +'settings_stopWordsFile_desc' => 'مسار لإيقاف ملف الكلمات', +'settings_strictFormCheck' => 'فحص نموذج صارم', +'settings_strictFormCheck_desc' => 'فحص نموذج صارم', +'settings_suggestionvalue' => 'قيمة الاقتراح', 'settings_System' => 'نظام', -'settings_tasksInMenu' => '', -'settings_tasksInMenu_approval' => '', -'settings_tasksInMenu_desc' => '', -'settings_tasksInMenu_needscorrection' => '', -'settings_tasksInMenu_receipt' => '', -'settings_tasksInMenu_review' => '', -'settings_tasksInMenu_revision' => '', -'settings_tasksInMenu_workflow' => '', +'settings_tasksInMenu' => 'قائمة المهام', +'settings_tasksInMenu_approval' => 'موافقة قائمة المهام', +'settings_tasksInMenu_desc' => 'قائمة المهام', +'settings_tasksInMenu_needscorrection' => 'قائمة المهام تحتاج إلى تصحيح', +'settings_tasksInMenu_receipt' => 'مستلم قائمة المهام', +'settings_tasksInMenu_review' => 'مراجعة قائمة المهام', +'settings_tasksInMenu_revision' => 'مراجعة قائمة المهام', +'settings_tasksInMenu_workflow' => 'سير عمل قائمة المهام', 'settings_theme' => 'الشكل الافتراضي', -'settings_theme_desc' => '', -'settings_titleDisplayHack' => '', -'settings_titleDisplayHack_desc' => '', -'settings_undelUserIds' => '', -'settings_undelUserIds_desc' => '', -'settings_updateDatabase' => '', +'settings_theme_desc' => 'الشكل الافتراضي', +'settings_titleDisplayHack' => 'عرض العنوان', +'settings_titleDisplayHack_desc' => 'عرض العنوان', +'settings_undelUserIds' => 'undelUserIds', +'settings_undelUserIds_desc' => 'undelUserIds', +'settings_updateDatabase' => 'تطوير قاعدة البيانات', 'settings_updateNotifyTime' => 'تحديث وقت التنبيه', -'settings_updateNotifyTime_desc' => '', -'settings_upgrade_php' => '', +'settings_updateNotifyTime_desc' => 'تحديث وقت التنبيه', +'settings_upgrade_php' => 'تطوير php', 'settings_versioningFileName' => 'اسم ملف الاصدار', -'settings_versioningFileName_desc' => '', -'settings_versiontolow' => '', +'settings_versioningFileName_desc' => 'اسم ملف الاصدار', +'settings_versiontolow' => 'نسخة منخفضة الجودة', 'settings_viewOnlineFileTypes' => 'الملفات التى يمكن عرضها اونلاين', -'settings_viewOnlineFileTypes_desc' => '', -'settings_webdav' => '', +'settings_viewOnlineFileTypes_desc' => 'الملفات التى يمكن عرضها اونلاين', +'settings_webdav' => 'webdav', 'settings_workflowMode' => 'حالة مسار العمل', -'settings_workflowMode_desc' => '', +'settings_workflowMode_desc' => 'حالة مسار العمل', 'settings_workflowMode_valadvanced' => 'متقدم', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'تقليدي', -'settings_workflowMode_valtraditional_only_approval' => '', +'settings_workflowMode_valtraditional_only_approval' => 'تقليدي', 'settings_zendframework' => 'Zend Framework', 'set_expiry' => 'تحديد انتهاء الصلاحية', 'set_owner' => 'تحديد المالك', 'set_owner_error' => 'خطأ في تحديد المالك', 'set_password' => 'تحديد كلمة السر', 'set_workflow' => 'تحديد مسار العمل', -'show_extension_changelog' => '', -'show_extension_version_list' => 'ﺎﻀﻫﺍﺭ ﻕﺎﺌﻣﺓ ﺍﻼﺻﺩﺍﺭﺎﺗ', +'show_extension_changelog' => 'تغيير سجل', +'show_extension_version_list' => 'لائحة الإصدارات', 'signed_in_as' => 'تسجيل الدخول بإسم', 'sign_in' => 'تسجيل الدخول', 'sign_out' => 'تسجيل الخروج', 'sign_out_user' => 'تسجيل خروج مستخدم', +'site_brand' => 'مجلس النواب اللبناني', 'sk_SK' => 'السلوفاكية', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'رتب حسب التاريخ', +'sort_by_name' => 'رتب حسب الإسم', +'sort_by_sequence' => 'رتب حسب التراتبية', 'space_used_on_data_folder' => 'المساحة المستخدمة لمجلد البيانات', -'splash_added_to_clipboard' => 'ﺖﻣ ﺎﻠﻨﺴﺧ ﻒﻳ ﺎﻠﺣﺎﻔﻇﺓ', -'splash_add_access' => '', -'splash_add_attribute' => '', -'splash_add_group' => '', -'splash_add_group_member' => '', -'splash_add_role' => '', -'splash_add_to_transmittal' => '', -'splash_add_transmittal' => '', -'splash_add_user' => '', -'splash_cleared_cache' => '', -'splash_cleared_clipboard' => '', -'splash_delete_access' => '', -'splash_document_added' => '', -'splash_document_checkedout' => '', -'splash_document_edited' => '', -'splash_document_indexed' => '', +'splash_added_to_clipboard' => 'تم النسخ في الحافظة', +'splash_add_access' => 'دفقة إضافة الوصول', +'splash_add_attribute' => 'اضافة سمة', +'splash_add_group' => 'اضافة مجموعة', +'splash_add_group_member' => 'اضافة مستخدم الى المجموعة', +'splash_add_role' => 'اضافة دور', +'splash_add_to_transmittal' => 'اضافة إلى الإحالة', +'splash_add_transmittal' => 'إضافة إحالة', +'splash_add_user' => 'اضافة مستخدم', +'splash_cleared_cache' => 'مسح ذاكرة التخزين المؤقت', +'splash_cleared_clipboard' => 'مسح الحافظة', +'splash_delete_access' => 'حذف الوصول', +'splash_document_added' => 'الوثيقة المضافة', +'splash_document_checkedout' => 'تم سحب المستند', +'splash_document_edited' => 'تم تحرير المستند', +'splash_document_indexed' => 'تم فهرسة المستند', 'splash_document_locked' => 'تم قفل المستند', 'splash_document_unlocked' => 'تم الغاء قفل المستند', -'splash_edit_access' => '', -'splash_edit_attribute' => '', -'splash_edit_event' => '', -'splash_edit_group' => '', -'splash_edit_role' => '', -'splash_edit_task' => '', +'splash_edit_access' => 'تحرير الدخول', +'splash_edit_attribute' => 'تحرير السمة', +'splash_edit_event' => 'تحرير الحدث', +'splash_edit_group' => 'تحرير المجموعة', +'splash_edit_role' => 'تحرير الدور', +'splash_edit_task' => 'تحرير المهمة', 'splash_edit_transmittal' => '', -'splash_edit_user' => '', -'splash_error_add_to_transmittal' => '', -'splash_error_rm_download_link' => '', -'splash_error_send_download_link' => '', -'splash_extension_getlist' => '', -'splash_extension_import' => '', -'splash_extension_refresh' => '', -'splash_extension_upload' => '', -'splash_folder_edited' => '', -'splash_importfs' => '', -'splash_inherit_access' => '', -'splash_invalid_folder_id' => '', -'splash_invalid_searchterm' => '', -'splash_link_document' => '', -'splash_moved_clipboard' => '', -'splash_move_document' => '', -'splash_move_folder' => '', -'splash_notinherit_access' => '', -'splash_receipt_update_success' => '', -'splash_removed_from_clipboard' => '', -'splash_rm_attribute' => '', -'splash_rm_attr_value' => '', +'splash_edit_user' => 'تحرير المستخدم', +'splash_error_add_to_transmittal' => 'خطأ الإضافة إلى الإحالة', +'splash_error_rm_download_link' => 'خطأ في إزالة رابط التنزيل', +'splash_error_send_download_link' => 'خطأ في إرسال رابط التنزيل', +'splash_extension_getlist' => 'قائمة التمديد', +'splash_extension_import' => 'استيراد', +'splash_extension_refresh' => 'تحديث', +'splash_extension_upload' => 'تحميل', +'splash_folder_edited' => 'تحرير مجلد', +'splash_importfs' => 'استيراد', +'splash_inherit_access' => 'يرث الوصول', +'splash_invalid_folder_id' => 'معرف المجلد غير صالح', +'splash_invalid_searchterm' => 'بحث غير صالح', +'splash_link_document' => 'رابط المستند', +'splash_moved_clipboard' => 'انتقلت الحافظة', +'splash_move_document' => 'نقل المستند', +'splash_move_folder' => 'نقل الملف', +'splash_notinherit_access' => 'لا يرث الوصول', +'splash_receipt_update_success' => 'استلام التحديث بنجاح', +'splash_removed_from_clipboard' => 'ازيل من الحافظة', +'splash_rm_attribute' => 'إزالة السمة', +'splash_rm_attr_value' => 'إزالة سمة القيمة', 'splash_rm_document' => 'تم حذف المستند', -'splash_rm_download_link' => '', +'splash_rm_download_link' => 'تم حذف رابط التنزيل', 'splash_rm_folder' => 'تم حذف المجلد', -'splash_rm_group' => '', -'splash_rm_group_member' => '', -'splash_rm_role' => '', -'splash_rm_transmittal' => '', -'splash_rm_user' => '', -'splash_rm_user_processes' => '', -'splash_rm_workflow' => '', -'splash_rm_workflow_action' => '', -'splash_rm_workflow_state' => '', -'splash_saved_file' => '', -'splash_save_user_data' => '', -'splash_send_download_link' => '', -'splash_send_login_data' => '', -'splash_setowner' => '', -'splash_settings_saved' => '', -'splash_set_default_access' => '', -'splash_substituted_user' => '', -'splash_switched_back_user' => '', -'splash_toogle_group_manager' => '', -'splash_transfer_content' => '', -'splash_transfer_document' => '', -'splash_transfer_objects' => '', -'splash_trigger_workflow' => '', -'state_and_next_state' => '', -'statistic' => '', +'splash_rm_group' => 'تم حذف المجموعة', +'splash_rm_group_member' => 'تم حذف مستخدم من المجموعة', +'splash_rm_role' => 'تم حذف دور', +'splash_rm_transmittal' => 'تم حذف إحالة', +'splash_rm_user' => 'تم حذف مستخدم', +'splash_rm_user_processes' => 'تم حذف عملية مستخدم', +'splash_rm_workflow' => 'تم حذف سير عمل', +'splash_rm_workflow_action' => 'تم حذف عمل سير العمل', +'splash_rm_workflow_state' => 'تم حذف حالة سير العمل', +'splash_saved_file' => 'ملف محفظ', +'splash_save_user_data' => 'حفظ بيانات المستخدم', +'splash_send_download_link' => 'ارسال رابط التنزيل', +'splash_send_login_data' => 'ارسل بيانات تسجيل الدخول', +'splash_setowner' => 'تحديد المدير', +'splash_settings_saved' => 'تم حفظ الإعدادات', +'splash_set_default_access' => 'حدد الدخول الإفتراضي', +'splash_substituted_user' => 'مستخدم احتياطي', +'splash_switched_back_user' => 'تحويل الى مستخدم آخر', +'splash_toogle_group_manager' => 'تحديد مدير المجموعة', +'splash_transfer_content' => 'نقل المحتوى', +'splash_transfer_document' => 'نقل المستند', +'splash_transfer_objects' => 'نقل الأشياء', +'splash_trigger_workflow' => 'تفعيل سير العمل', +'state_and_next_state' => 'الحالة الحالية والحالة المقبلة', +'statistic' => 'إحصائيات', 'status' => 'الحالة', 'status_approval_rejected' => 'مسودة مرفوضة', 'status_approved' => 'تمت الموافقة', 'status_approver_removed' => 'تم ازالة موافق من العملية', -'status_needs_correction' => '', +'status_needs_correction' => 'الوضع يحتاج إلى تصحيح', 'status_not_approved' => 'لم تتم الموافقة بعد', -'status_not_receipted' => '', +'status_not_receipted' => 'الوضع غير مستلم', 'status_not_reviewed' => 'لم تتم مراجعته بعد', -'status_not_revised' => '', -'status_receipted' => '', -'status_receipt_rejected' => '', -'status_recipient_removed' => '', +'status_not_revised' => 'لم تتم مراجعته بعد', +'status_receipted' => 'تم استلامه', +'status_receipt_rejected' => 'تم رفض الإستلام', +'status_recipient_removed' => 'تم ازالة استلام الحالة', 'status_reviewed' => 'تمت المراجعة', 'status_reviewer_rejected' => 'مسودة مرفوضة', 'status_reviewer_removed' => 'تم ازالة مراجع من العملية', -'status_revised' => '', -'status_revision_rejected' => '', -'status_revision_sleeping' => '', -'status_revisor_removed' => '', +'status_revised' => 'تم مراجعة الحالة', +'status_revision_rejected' => 'تم رفض مراجعة الحالة', +'status_revision_sleeping' => 'مراجعة الوضع في حالة النوم', +'status_revisor_removed' => 'تم ازالة حالة المراجع', 'status_unknown' => 'مجهول', 'storage_size' => 'حجم التخزين', -'subfolder_duplicate_name' => '', -'submit_2_fact_auth' => '', +'subfolder_duplicate_name' => 'اسم مجلد فرعي مكرر', +'submit_2_fact_auth' => 'قدم ثنائي عامل التوثيق', 'submit_approval' => 'ادخال موافقة', 'submit_login' => 'تسجيل الدخول', 'submit_password' => 'تحديد كلمة سر جديدة', 'submit_password_forgotten' => 'بدء العملية', -'submit_receipt' => '', +'submit_receipt' => 'تقديم إيصال', 'submit_review' => 'بدأ المراجعة', -'submit_revision' => '', +'submit_revision' => 'تقديم مراجعة', 'submit_userinfo' => 'ادخال بيانات', -'subsribe_timelinefeed' => '', -'substitute_to_user' => '', +'subsribe_timelinefeed' => 'تغذية الجدول الزمني', +'substitute_to_user' => 'بديلا للمستخدم', 'substitute_user' => 'استبدال المستخدم', -'success_add_aro' => '', -'success_add_permission' => '', -'success_remove_permission' => '', -'success_toogle_permission' => '', +'success_add_aro' => 'نجاح إضافة الموالية', +'success_add_permission' => 'إذن إضافة النجاح', +'success_remove_permission' => 'اذن ازالة النجاح', +'success_toogle_permission' => 'اذن تفعيل النجاح', 'sunday' => 'الأحد', 'sunday_abbr' => 'ح', 'sv_SE' => 'السويدية', 'switched_to' => 'تحويل الى', -'takeOverAttributeValue' => '', -'takeOverGrpApprover' => '', -'takeOverGrpReviewer' => '', -'takeOverIndApprover' => '', -'takeOverIndReviewer' => '', -'tasks' => '', -'task_description' => '', -'task_disabled' => '', -'task_frequency' => '', -'task_last_run' => '', -'task_name' => '', -'task_next_run' => '', -'temp_jscode' => '', -'testmail_body' => '', -'testmail_subject' => '', +'takeOverAttributeValue' => 'اخذ قيمة السمة', +'takeOverGrpApprover' => 'اخذ موافقة المجموعة', +'takeOverGrpApprovers' => '', +'takeOverGrpReviewer' => 'اخذ مراجع المجموعة', +'takeOverGrpReviewers' => '', +'takeOverIndApprover' => 'اخذ فهرسة المجموعة', +'takeOverIndApprovers' => '', +'takeOverIndReviewer' => 'اخذ فهرسة المراجع', +'takeOverIndReviewers' => '', +'tasks' => 'مهمات', +'task_description' => 'تفصيل المهام', +'task_disabled' => 'تم توقيف المهمة', +'task_frequency' => 'تردد المهمة', +'task_last_run' => 'مهمة المدى الماضي', +'task_name' => 'اسم المهمة', +'task_next_run' => 'مدى المهمة القادمة', +'temp_jscode' => 'temp jscode', +'testmail_body' => 'محتوى البريد الإلكتروني التجريبي', +'testmail_subject' => 'موضوع البريد الإلكتروني التجريبي', 'theme' => 'شكل', 'thursday' => 'الخميس', 'thursday_abbr' => 'خ', -'timeline' => 'ﺎﻠﺨﻃ ﺎﻟﺰﻤﻨﻳ', -'timeline_add_file' => 'ﻡﺮﻔﻗ ﺝﺪﻳﺩ', -'timeline_add_version' => '', -'timeline_full_add_file' => '', -'timeline_full_add_version' => '', -'timeline_full_scheduled_revision' => '', -'timeline_full_status_change' => '', -'timeline_scheduled_revision' => '', -'timeline_selected_item' => '', -'timeline_skip_add_file' => '', -'timeline_skip_scheduled_revision' => '', -'timeline_skip_status_change_-1' => 'ﻡﺮﻓﻮﺿﺓ', -'timeline_skip_status_change_-3' => 'ﻢﻨﺘﻬﻳﺓ', -'timeline_skip_status_change_0' => '', -'timeline_skip_status_change_1' => '', -'timeline_skip_status_change_2' => '', -'timeline_skip_status_change_3' => '', -'timeline_skip_status_change_4' => '', -'timeline_skip_status_change_5' => '', -'timeline_status_change' => 'ﺖﻐﻳﺭ ﺎﻠﺣﺎﻟﺓ ﻢﻋ ﺎﻟﺰﻤﻧ', +'timeline' => 'الخط الزمني', +'timeline_add_file' => 'أضف ملف', +'timeline_add_version' => 'أضف اصدار', +'timeline_full_add_file' => 'أضف ملف كامل', +'timeline_full_add_version' => 'أضف اصدار كامل', +'timeline_full_scheduled_revision' => 'تحديد مراجعة كاملة في التاريخ', +'timeline_full_status_change' => 'تغيير كامل للحالة', +'timeline_scheduled_revision' => 'مراجعة في التاريخ', +'timeline_selected_item' => 'اشياء محددة', +'timeline_skip_add_file' => 'تخطى وأضف ملف', +'timeline_skip_scheduled_revision' => 'تخطي المراجعة المحددة في التاريخ', +'timeline_skip_status_change_-1' => 'تخطي تغيير الحالة -1', +'timeline_skip_status_change_-3' => 'تخطي تغيير الحالة -3', +'timeline_skip_status_change_0' => 'تخطي تغيير الحالة 0', +'timeline_skip_status_change_1' => 'تخطي تغيير الحالة 1', +'timeline_skip_status_change_2' => 'تخطي تغيير الحالة 2', +'timeline_skip_status_change_3' => 'تخطي تغيير الحالة 3', +'timeline_skip_status_change_4' => 'تخطي تغيير الحالة 4', +'timeline_skip_status_change_5' => 'تخطي تغيير الحالة 5', +'timeline_status_change' => 'تغير الحالة', 'to' => 'الى', 'toggle_manager' => 'رجح مدير', -'toggle_qrcode' => '', -'to_before_from' => '', -'transfer_content' => '', -'transfer_document' => 'ﺕﺮﺠﻣ ﺎﻠﻤﻠﻓ', -'transfer_no_read_access' => '', -'transfer_no_write_access' => '', -'transfer_objects' => '', -'transfer_objects_to_user' => '', -'transfer_to_user' => '', +'toggle_qrcode' => 'toggle toggle', +'to_before_from' => 'إلى قبل من', +'transfer_content' => 'تحويل المحتوى', +'transfer_document' => 'تحويل مستند', +'transfer_no_read_access' => 'تحويل بلا دخول للقراءة', +'transfer_no_write_access' => 'تحويل بلا دخول للكتابة', +'transfer_objects' => 'تحويل أشياء', +'transfer_objects_to_user' => 'تحويل شيء إلى مستخدم', +'transfer_to_user' => 'تحويل إلى مستخدم', 'transition_triggered_email' => 'تم تحريك انتقال مسار العمل', 'transition_triggered_email_body' => 'تم تحريك انتقال مسار العمل المستند: [name] @@ -1710,22 +1720,22 @@ Parent folder: [folder_path] المستخدم: [username] URL: [url]', 'transition_triggered_email_subject' => '[sitename]: [name] - تم تحريك انتقال مسار العمل', -'transmittal' => '', -'transmittalitem_removed' => '', -'transmittalitem_updated' => '', -'transmittal_comment' => '', -'transmittal_name' => '', -'transmittal_size' => '', -'tree_loading' => 'ﻱﺮﺟﻯ ﺍﻼﻨﺘﻇﺍﺭ، ﺢﺗﻯ ﻲﺘﻣ ﻉﺮﺿ ﻕﺎﺌﻣﺓ ﺎﻠﻤﻠﻓﺎﺗ ...', +'transmittal' => 'الإحالة', +'transmittalitem_removed' => 'تم إزالة الإحالة', +'transmittalitem_updated' => 'تم تحديث الإحالة', +'transmittal_comment' => 'تعليق الإحالة', +'transmittal_name' => 'اسم الإحالة', +'transmittal_size' => 'حجم الإحالة', +'tree_loading' => 'تحميل الشجرة', 'trigger_workflow' => 'مسار العمل', -'tr_TR' => 'ﺕﺮﻜﻳﺓ', +'tr_TR' => 'التركية', 'tuesday' => 'الثلاثاء', 'tuesday_abbr' => 'ث', -'type_of_hook' => '', +'type_of_hook' => 'نوع المسار', 'type_to_search' => 'اكتب لتبحث', 'uk_UA' => 'ﺍﻮﻛﺭﺎﻨﻳ', 'under_folder' => 'في المجلد', -'unknown_attrdef' => '', +'unknown_attrdef' => 'تعريف سمة غير معروفة', 'unknown_command' => 'لم يتم التعرف على الأمر.', 'unknown_document_category' => 'قسم مجهول', 'unknown_group' => 'معرف قسم مجهول', @@ -1734,8 +1744,8 @@ URL: [url]', 'unknown_owner' => 'معرف مالك مجهول', 'unknown_user' => 'معرف مستخدم مجهول', 'unlinked_content' => 'محتوى غير مربوط', -'unlinked_documents' => '', -'unlinked_folders' => '', +'unlinked_documents' => 'مستندات غير مربوطة', +'unlinked_folders' => 'مجلدات غير مربوطة', 'unlinking_objects' => 'محتوى غير مربوط', 'unlock_cause_access_mode_all' => 'يمكنك تحديثه لانك تملك الصلاحيات. سيتم ازالة الحماية تلقائية', 'unlock_cause_locking_user' => 'يمكنك تحديثه لانك من قمت بحمايته. سيتم ازالة الحماية تلقائية.', @@ -1746,38 +1756,38 @@ URL: [url]', 'update_fulltext_index' => 'تحديث فهرس النص الكامل', 'update_info' => 'تحديث المعلومات', 'update_locked_msg' => 'هذا المستند محمي من التعديل.', -'update_recipients' => '', +'update_recipients' => 'تطوير المستلم', 'update_reviewers' => 'تحيث قائمة المراجعين', -'update_revisors' => '', -'update_transmittalitem' => '', +'update_revisors' => 'تحديث المراجعين', +'update_transmittalitem' => 'تحديث الإحالة', 'uploaded_by' => 'تم الرفع بواسطة', 'uploading_failed' => 'عملية رفع واحد من ملفاتك فشلت . من فضلك قم بالتأكد من اقصى ملف يمكن تحميله', 'uploading_maxsize' => 'الملف المرفوع يتخطى حجم الملف القياسي المسموح', 'uploading_zerosize' => 'تحميل ملف فارغ. عملية التحميل الغيت', 'used_discspace' => 'المساحة المستخدمة', 'user' => 'مستخدم', -'userid_groupid' => '', +'userid_groupid' => 'هوية المجموعة', 'users' => 'مستخدمين', -'users_and_groups' => '', -'users_done_work' => '', +'users_and_groups' => 'مستخدمين ومجموعات', +'users_done_work' => 'المستخدمين انجزو العمل', 'user_exists' => 'المستخدم موجود بالفعل.', -'user_group' => '', +'user_group' => 'مستخدممجموعة', 'user_group_management' => 'إدارة المستخدمين/المجموعات', 'user_image' => 'صورة', 'user_info' => 'بيانات المستخدمين', -'user_list' => 'قائمة بالمستخدمين', -'user_login' => 'اسم المستخدم', +'user_list' => 'قائمة المستخدمين', +'user_login' => 'الإسم', 'user_management' => 'إدارة المستخدمين', -'user_name' => 'الاسم بالكامل', -'use_comment_of_document' => 'ﺎﺴﺘﺧﺪﻣ ﺎﻠﺘﻌﻠﻴﻗﺎﺗ ﻞﻟﻮﺜﻴﻗﺓ', +'user_name' => 'الاسم المستعار', +'use_comment_of_document' => 'استخدم التعليقات للوثيقة', 'use_default_categories' => 'استخدم اقسام سابقة التعريف', 'use_default_keywords' => 'استخدام كلمات بحثية معدة مسبقا', -'valid_till' => '', +'valid_till' => 'صالح ل', 'version' => 'اصدار', 'versioning_file_creation' => 'انشاء ملف الاصدارات', 'versioning_file_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف يحتوى معلومات الاصدار لمجمل مجلد النظام. بعد الانشاء كل ملف سيتم حفظه داخل المجلد الخاص به', 'versioning_info' => 'معلومات الاصدار', -'versiontolow' => '', +'versiontolow' => 'الإصدار خفيف الجودة', 'version_comment' => '', 'version_deleted_email' => 'تم مسح الاصدار', 'version_deleted_email_body' => 'تم مسح الاصدار @@ -1796,32 +1806,32 @@ URL: [url]', 'weeks' => 'اسابيع', 'week_view' => 'عرض الاسبوع', 'workflow' => 'مسار عمل', -'workflows_involded' => '', +'workflows_involded' => 'اشراك سير العمل', 'workflow_actions_management' => 'ادارة اجراءات مسار العمل', 'workflow_action_in_use' => 'هذا الاجراء مستخدم حاليا في مسار عمل', 'workflow_action_name' => 'اسم', 'workflow_editor' => 'محرر مسارات العمل', 'workflow_group_summary' => 'ملخص المجموعة', -'workflow_has_cycle' => '', -'workflow_initstate' => 'الحالة الابتدائية', +'workflow_has_cycle' => 'لدى سير العمل دورة', +'workflow_initstate' => 'الحالة الأولية', 'workflow_in_use' => 'مسار العمل هذا مستخدم حاليا لمستندات', -'workflow_layoutdata_saved' => '', +'workflow_layoutdata_saved' => 'تم حفظ بيانات تخطيط سير العمل', 'workflow_management' => 'ادارة مسار العمل', 'workflow_name' => 'اسم', -'workflow_no_doc_rejected_state' => '', -'workflow_no_doc_released_state' => '', -'workflow_no_initial_state' => '', +'workflow_no_doc_rejected_state' => 'حالة الوثيقة مرفوضة', +'workflow_no_doc_released_state' => 'حالة الوثيقة مرفوضة', +'workflow_no_initial_state' => 'لا يوجد حالة بدائية في سير العمل', 'workflow_no_states' => 'يجب تحديد حالات مسار العمل قبل تحديد مسار العمل.', -'workflow_save_layout' => '', -'workflow_state' => '', +'workflow_save_layout' => 'حفظ تخطيط سير العمل', +'workflow_state' => 'حالة سير العمل', 'workflow_states_management' => 'ادارة حالات مسار العمل', 'workflow_state_docstatus' => 'حالة المستند', 'workflow_state_in_use' => 'هذه الحالة مستخدمة من قبل مسار عمل', 'workflow_state_name' => 'اسم', 'workflow_summary' => 'ملخص مسار العمل', -'workflow_transition_without_user_group' => '', +'workflow_transition_without_user_group' => 'تحويل سير العمل بدون استخدام مستخدم من المجموعة', 'workflow_user_summary' => 'ملخص المستخدم', -'x_more_objects' => 'ﺎﻟﺮﻘﻣ', +'x_more_objects' => 'اشياء أكثر', 'year_view' => 'عرض السنة', 'yes' => 'نعم', 'zh_CN' => 'الصينية (CN)', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 108636bd8..6e52f26aa 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -505,6 +505,7 @@ $text = array( 'folder_renamed_email_body' => '', 'folder_renamed_email_subject' => '', 'folder_title' => 'Папка \'[foldername]\'', +'foot_note' => '', 'force_update' => '', 'friday' => 'петък', 'friday_abbr' => '', @@ -649,6 +650,7 @@ $text = array( 'lock_document' => 'Блокирай', 'lock_message' => 'Документът е блокиран [username]. Само имащите права могат да го разблокират.', 'lock_status' => 'Статус', +'logfile_loading' => '', 'login' => 'Име', 'login_disabled_text' => 'Вашия акаунт е забранен, вероятно заради прекалено много погрешни опити за влизане.', 'login_disabled_title' => 'Вашия акаунт е забранен', @@ -723,6 +725,7 @@ $text = array( 'next_state' => 'Ново състояние', 'nl_NL' => 'Холандски', 'no' => 'Не', +'notification' => '', 'notify_added_email' => 'Вие сте добавен в списъка с уведомявани', 'notify_added_email_body' => '', 'notify_added_email_subject' => '', @@ -738,6 +741,7 @@ $text = array( 'no_current_version' => '', 'no_default_keywords' => 'Няма ключови думи', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => 'Няма блокирани документи', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1376,6 +1380,7 @@ $text = array( 'settings_workflowMode' => 'Вид процес', 'settings_workflowMode_desc' => 'Специален/advanced процес позволява да зададете Ваш специфичен процес за версия на документ.', 'settings_workflowMode_valadvanced' => 'advanced', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'traditional', 'settings_workflowMode_valtraditional_only_approval' => '', 'settings_zendframework' => 'Zend Framework', @@ -1390,6 +1395,7 @@ $text = array( 'sign_in' => 'вход', 'sign_out' => 'изход', 'sign_out_user' => '', +'site_brand' => '', 'sk_SK' => 'Словашки', 'sort_by_date' => 'Сортирай по дата"', 'sort_by_name' => 'Сортирай по име', @@ -1514,9 +1520,13 @@ $text = array( 'switched_to' => '', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 261339bad..768c872ee 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -510,6 +510,7 @@ URL: [url]', 'folder_renamed_email_body' => '', 'folder_renamed_email_subject' => '', 'folder_title' => 'Carpeta \'[foldername]\'', +'foot_note' => '', 'force_update' => '', 'friday' => 'Divendres', 'friday_abbr' => '', @@ -654,6 +655,7 @@ URL: [url]', 'lock_document' => 'Bloquejar', 'lock_message' => 'Aquest document ha estat bloquejat per [username]. Només els usuaris autoritzats poden desbloquejar aquest document (vegeu al final de la pàgina).', 'lock_status' => 'Estat', +'logfile_loading' => '', 'login' => '', 'login_disabled_text' => '', 'login_disabled_title' => '', @@ -728,6 +730,7 @@ URL: [url]', 'next_state' => '', 'nl_NL' => 'Holandès', 'no' => 'No', +'notification' => '', 'notify_added_email' => 'Se us ha afegit a la llista de notificació', 'notify_added_email_body' => '', 'notify_added_email_subject' => '', @@ -743,6 +746,7 @@ URL: [url]', 'no_current_version' => '', 'no_default_keywords' => 'No hi ha mots clau disponibles', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => 'No hi ha documents bloquejats.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1381,6 +1385,7 @@ URL: [url]', 'settings_workflowMode' => '', 'settings_workflowMode_desc' => '', 'settings_workflowMode_valadvanced' => '', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => '', 'settings_workflowMode_valtraditional_only_approval' => '', 'settings_zendframework' => '', @@ -1395,6 +1400,7 @@ URL: [url]', 'sign_in' => 'sign in', 'sign_out' => 'desconnectar', 'sign_out_user' => '', +'site_brand' => '', 'sk_SK' => 'Eslovac', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1519,9 +1525,13 @@ URL: [url]', 'switched_to' => '', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index c22ed3ba1..080990069 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1528), kreml (579) +// Translators: Admin (1530), kreml (579) $text = array( '2_factor_auth' => 'dvoufaktorové ověření', @@ -614,6 +614,7 @@ Uživatel: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Složka přejmenována', 'folder_title' => 'Složka \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Aktualizace', 'friday' => 'Pátek', 'friday_abbr' => 'Pá', @@ -758,6 +759,7 @@ URL: [url]', 'lock_document' => 'Zamknout', 'lock_message' => 'Tento dokument zamknul [username]. Pouze oprávnění uživatelé ho mohou odemknout (viz konec stránky).', 'lock_status' => 'Stav', +'logfile_loading' => '', 'login' => 'Přihlášení', 'login_disabled_text' => 'Váš účet je zakázán, pravděpodobně z důvodu příliš mnoha neúspěšných přihlášení.', 'login_disabled_title' => 'Účet je zakázaný.', @@ -848,6 +850,7 @@ URL: [url]', 'next_state' => 'Nový stav', 'nl_NL' => 'Holandština', 'no' => 'Ne', +'notification' => '', 'notify_added_email' => 'Byl/a jste přidán/a do seznamu pro oznámení', 'notify_added_email_body' => 'Přidáno do seznamu oznámení Název: [name] @@ -871,6 +874,7 @@ URL: [url]', 'no_current_version' => 'Používáte starou verzi SeedDMS. Nejnovější dostupná verze je [latestversion].', 'no_default_keywords' => 'Nejsou dostupná žádná klíčová slova.', 'no_docs_checked_out' => 'Nebyly odbaveny žádné dokumenty', +'no_docs_expired' => '', 'no_docs_locked' => 'Žádné uzamčené dokumenty', 'no_docs_needs_correction' => 'Nejsou žádné dokumenty, které je třeba opravit', 'no_docs_rejected' => 'Nebyly zamítnuty žádné dokumenty.', @@ -1468,7 +1472,7 @@ Jméno: [username] 'settings_maxUploadSize' => 'Maximální velikost nahraných souborů', 'settings_maxUploadSize_desc' => 'Toto je maximální velikost nahraných souborů. Bude mít vliv na verze dokumentů a přílohy.', 'settings_more_settings' => 'Konfigurovat další nastavení. Výchozí přihlášení: admin / admin', -'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields' => 'Nezobrazovat tato pole', 'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nenalezeno', 'settings_Notification' => 'Nastavení upozornění', @@ -1592,6 +1596,7 @@ Jméno: [username] 'settings_workflowMode' => 'Režím workflow', 'settings_workflowMode_desc' => 'Pokročilé workflow umožňuje definovat vlastní workflow pro uvolňování verzí dokumentů.', 'settings_workflowMode_valadvanced' => 'pokročilý', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'tradiční', 'settings_workflowMode_valtraditional_only_approval' => 'tradiční (bez recenzí)', 'settings_zendframework' => 'Zend Framework', @@ -1606,6 +1611,7 @@ Jméno: [username] 'sign_in' => 'Přihlásit', 'sign_out' => 'Odhlásit', 'sign_out_user' => 'Odhlášení uživatele', +'site_brand' => '', 'sk_SK' => 'Slovenština', 'sort_by_date' => '', 'sort_by_name' => 'Třídit podle jména', @@ -1730,9 +1736,13 @@ Jméno: [username] 'switched_to' => 'Přepnuto na', 'takeOverAttributeValue' => 'Převzít hodnotu atributu z poslední verze', 'takeOverGrpApprover' => 'Převzít skupinu schvalovatelů od poslední verze.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Převzít skupinu recenzentů z poslední verze.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Převzít individuální schvalující osobu od poslední verze.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Převzít jednotlivého recenzenta z poslední verze.', +'takeOverIndReviewers' => '', 'tasks' => 'Úkoly', 'task_description' => 'Popis', 'task_disabled' => 'Vypnuto', @@ -1857,7 +1867,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Pomocí této operace můžete vytvořit soubor obsahující informace o verzování celé složky DMS. Po vytvoření bude každý soubor uložen uvnitř složky dokumentů.', 'versioning_info' => 'Info verzování', 'versiontolow' => 'Příliš nízká verze', -'version_comment' => '', +'version_comment' => 'Poznámka k verzi', 'version_deleted_email' => 'Verze smazána', 'version_deleted_email_body' => 'Verze smazána Dokument: [name] diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ebf627712..2f7f60151 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2726), dgrutsch (22) +// Translators: Admin (2735), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -613,6 +613,7 @@ Benutzer: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Ordner umbenannt', 'folder_title' => 'SeedDMS - Ordner: [foldername]', +'foot_note' => '', 'force_update' => 'Aktualisieren', 'friday' => 'Freitag', 'friday_abbr' => 'Fr', @@ -757,6 +758,7 @@ URL: [url]', 'lock_document' => 'Sperren', 'lock_message' => 'Dieses Dokument ist durch [username] gesperrt. Nur authorisierte Benutzer können diese Sperrung aufheben.', 'lock_status' => 'Status', +'logfile_loading' => 'Bitte warten, bis die Log-Datei geladen ist …', 'login' => 'Login', 'login_disabled_text' => 'Ihr Konto ist gesperrt. Der Grund sind möglicherweise zu viele gescheiterte Anmeldeversuche.', 'login_disabled_title' => 'Konto gesperrt', @@ -846,6 +848,7 @@ URL: [url]', 'next_state' => 'Neuer Status', 'nl_NL' => 'Niederländisch', 'no' => 'Nein', +'notification' => 'Beobachter', 'notify_added_email' => 'Benachrichtigung per Mail wurde eingerichtet', 'notify_added_email_body' => 'Added to notification list Name: [name] @@ -869,6 +872,7 @@ URL: [url]', 'no_current_version' => 'Sie verwenden eine ältere Version als die zur Zeit verfügbare Version [latestversion].', 'no_default_keywords' => 'Keine Vorlagen vorhanden', 'no_docs_checked_out' => 'Keine Dokumente ausgecheckt', +'no_docs_expired' => 'Keine abgelaufenen Dokumente', 'no_docs_locked' => 'Keine Dokumente gesperrt.', 'no_docs_needs_correction' => 'Keine Dokumente, die korrigiert werden müssen', 'no_docs_rejected' => 'Keine Dokumente abgelehnt.', @@ -1602,6 +1606,7 @@ Name: [username] 'settings_workflowMode' => 'Workflow mode', 'settings_workflowMode_desc' => 'Der erweiterte Workflow-Modes erlaubt es eigene Workflows zu erstellen.', 'settings_workflowMode_valadvanced' => 'erweitert', +'settings_workflowMode_valnone' => 'keiner', 'settings_workflowMode_valtraditional' => 'traditionell', 'settings_workflowMode_valtraditional_only_approval' => 'traditional (ohne Prüfung)', 'settings_zendframework' => 'Zend Framework', @@ -1616,6 +1621,7 @@ Name: [username] 'sign_in' => 'Anmelden', 'sign_out' => 'Abmelden', 'sign_out_user' => 'Benutzer abmelden', +'site_brand' => '', 'sk_SK' => 'Slovakisch', 'sort_by_date' => 'Nach Datum sortieren', 'sort_by_name' => 'Nach Name sortieren', @@ -1740,9 +1746,13 @@ Name: [username] 'switched_to' => 'Gewechselt zu', 'takeOverAttributeValue' => 'Attributwert von vorheriger Version übernehmen', 'takeOverGrpApprover' => 'Übernehme Gruppe von Freigebenden von letzter Version.', +'takeOverGrpApprovers' => 'Gruppenfreigeber übernehmen', 'takeOverGrpReviewer' => 'Übernehme Gruppe von Prüfern von letzter Version.', +'takeOverGrpReviewers' => 'Gruppenprüfer übernehmen', 'takeOverIndApprover' => 'Übernehme Einzelfreigebende von letzter Version.', +'takeOverIndApprovers' => 'Einzelfreigeber übernehmen', 'takeOverIndReviewer' => 'Übernehme die Einzelprüfer von der letzten Version.', +'takeOverIndReviewers' => 'Einzelprüfer übernehmen', 'tasks' => 'Aufgaben', 'task_description' => 'Beschreibung', 'task_disabled' => 'Deaktiviert', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index f29395c96..0a98fa212 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (282) +// Translators: Admin (292) $text = array( '2_factor_auth' => '', @@ -52,7 +52,7 @@ $text = array( 'add_approval' => '', 'add_attrdefgroup' => '', 'add_document' => 'Νέο έγγραφο', -'add_document_link' => '', +'add_document_link' => 'Προσθήκη σύνδεσης', 'add_document_notify' => '', 'add_doc_reviewer_approver_warning' => '', 'add_doc_workflow_warning' => '', @@ -208,7 +208,7 @@ $text = array( 'change_password_message' => 'Ο κωδικός σας έχει αλλάξει.', 'change_recipients' => '', 'change_revisors' => '', -'change_status' => '', +'change_status' => 'Αλλαγή κατάστασης', 'charts' => 'Διαγράμματα', 'chart_docsaccumulated_title' => 'Αριθμός Εγγράφων', 'chart_docspercategory_title' => 'Έγγραφα κατά κατηγορία', @@ -239,7 +239,7 @@ $text = array( 'choose_workflow_action' => '', 'choose_workflow_state' => '', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => 'Εκκαθάριση στιγμιαίας μνήμης', 'clear_clipboard' => '', 'clear_password' => '', 'clipboard' => 'Πρόχειρο', @@ -357,7 +357,7 @@ $text = array( 'document_status_changed_email' => '', 'document_status_changed_email_body' => '', 'document_status_changed_email_subject' => '', -'document_title' => '', +'document_title' => 'Τίτλος εγγράφου', 'document_transfered_email_body' => '', 'document_transfered_email_subject' => '', 'document_updated_email' => '', @@ -392,9 +392,9 @@ $text = array( 'duplicate_content' => '', 'edit' => '', 'edit_attributes' => '', -'edit_comment' => '', +'edit_comment' => 'Επεξερασία σχόλιου', 'edit_default_keywords' => '', -'edit_document_access' => '', +'edit_document_access' => 'Επεξεργασία πρόσβασης', 'edit_document_notify' => '', 'edit_document_props' => 'Επεξεργασία εγγράφου', 'edit_event' => '', @@ -505,6 +505,7 @@ $text = array( 'folder_renamed_email_body' => '', 'folder_renamed_email_subject' => '', 'folder_title' => 'Όνομα Φακέλου', +'foot_note' => '', 'force_update' => '', 'friday' => 'Παρασκευή', 'friday_abbr' => 'Πα', @@ -633,7 +634,7 @@ $text = array( 'legend' => 'Ιστορικό', 'librarydoc' => '', 'linked_documents' => 'Σχετικά Έγγραφα', -'linked_files' => '', +'linked_files' => 'Συνδεμένα αρχεία', 'linked_to_current_version' => '', 'linked_to_document' => '', 'linked_to_this_version' => '', @@ -649,6 +650,7 @@ $text = array( 'lock_document' => 'Κλείδωμα', 'lock_message' => '', 'lock_status' => 'Κατάσταση', +'logfile_loading' => '', 'login' => 'Είσοδος', 'login_disabled_text' => '', 'login_disabled_title' => '', @@ -734,6 +736,7 @@ URL: [url]', 'next_state' => '', 'nl_NL' => 'Δανέζικα', 'no' => 'Όχι', +'notification' => '', 'notify_added_email' => '', 'notify_added_email_body' => '', 'notify_added_email_subject' => '', @@ -749,6 +752,7 @@ URL: [url]', 'no_current_version' => '', 'no_default_keywords' => '', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => '', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -772,7 +776,7 @@ URL: [url]', 'no_version_check' => '', 'no_version_modification' => '', 'no_workflow_available' => '', -'objectcheck' => '', +'objectcheck' => 'Αναζήτηση σε αρχεία και φακέλους', 'object_check_critical' => '', 'object_check_warning' => '', 'obsolete' => '', @@ -855,7 +859,7 @@ URL: [url]', 'redraw' => '', 'refresh' => '', 'rejected' => '', -'released' => '', +'released' => 'Εκδόθηκε', 'removed_approver' => '', 'removed_file_email' => '', 'removed_file_email_body' => '', @@ -1387,6 +1391,7 @@ URL: [url]', 'settings_workflowMode' => '', 'settings_workflowMode_desc' => '', 'settings_workflowMode_valadvanced' => '', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => '', 'settings_workflowMode_valtraditional_only_approval' => '', 'settings_zendframework' => '', @@ -1401,6 +1406,7 @@ URL: [url]', 'sign_in' => 'Σύνδεση', 'sign_out' => 'Αποσύνδεση', 'sign_out_user' => 'Αποσύνδεση χρήστη', +'site_brand' => '', 'sk_SK' => 'Σλοβάκικα', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1525,9 +1531,13 @@ URL: [url]', 'switched_to' => '', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', @@ -1566,7 +1576,7 @@ URL: [url]', 'toggle_qrcode' => '', 'to_before_from' => '', 'transfer_content' => '', -'transfer_document' => '', +'transfer_document' => 'Μεταφορά εγγράφου', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', 'transfer_objects' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index d288ca3b4..800fe6daa 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1822), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1830), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -614,6 +614,7 @@ User: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Folder renamed', 'folder_title' => 'Folder \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Update', 'friday' => 'Friday', 'friday_abbr' => 'Fr', @@ -758,6 +759,7 @@ URL: [url]', 'lock_document' => 'Lock', 'lock_message' => 'This document is locked by [username]. Only authorized users can unlock this document.', 'lock_status' => 'Status', +'logfile_loading' => 'Pleae wait, until log file is loaded …', 'login' => 'Login', 'login_disabled_text' => 'Your account is disabled, probably because of too many failed logins.', 'login_disabled_title' => 'Account is disabled', @@ -848,6 +850,7 @@ URL: [url]', 'next_state' => 'New state', 'nl_NL' => 'Dutch', 'no' => 'No', +'notification' => 'Notification', 'notify_added_email' => 'You\'ve been added to notify list', 'notify_added_email_body' => 'Added to notification list Name: [name] @@ -871,6 +874,7 @@ URL: [url]', 'no_current_version' => 'You are running an old version of SeedDMS. The latest available version is [latestversion].', 'no_default_keywords' => 'No keywords available', 'no_docs_checked_out' => 'No documents checked out', +'no_docs_expired' => 'No expired documents', 'no_docs_locked' => 'No documents locked.', 'no_docs_needs_correction' => 'No documents, that need to be corrected', 'no_docs_rejected' => 'No documents rejected.', @@ -1597,6 +1601,7 @@ Name: [username] 'settings_workflowMode' => 'Workflow mode', 'settings_workflowMode_desc' => 'The advanced workflow allows to specify your own release workflow for document versions.', 'settings_workflowMode_valadvanced' => 'advanced', +'settings_workflowMode_valnone' => 'none', 'settings_workflowMode_valtraditional' => 'traditional', 'settings_workflowMode_valtraditional_only_approval' => 'traditional (without review)', 'settings_zendframework' => 'Zend Framework', @@ -1611,6 +1616,7 @@ Name: [username] 'sign_in' => 'Sign in', 'sign_out' => 'Sign out', 'sign_out_user' => 'Sign out user', +'site_brand' => '', 'sk_SK' => 'Slovak', 'sort_by_date' => 'Sort by date', 'sort_by_name' => 'Sort by name', @@ -1735,9 +1741,13 @@ Name: [username] 'switched_to' => 'Switched to', 'takeOverAttributeValue' => 'Take over attribute value from last version', 'takeOverGrpApprover' => 'Take over group of approvers from last version.', +'takeOverGrpApprovers' => 'Take Over Group Approvers', 'takeOverGrpReviewer' => 'Take over group of reviewers from last version.', +'takeOverGrpReviewers' => 'Take Over Group Reviewers', 'takeOverIndApprover' => 'Take over individual approver from last version.', +'takeOverIndApprovers' => 'Take Over Individual Approvers', 'takeOverIndReviewer' => 'Take over individual reviewer from last version.', +'takeOverIndReviewers' => 'Take Over Individual Reviewers', 'tasks' => 'Tasks', 'task_description' => 'Description', 'task_disabled' => 'Disabled', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 95a8113ed..c5e1df873 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -583,6 +583,7 @@ Usuario: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Carpeta renombrada', 'folder_title' => 'Carpeta \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Actualizar', 'friday' => 'Viernes', 'friday_abbr' => 'V', @@ -727,6 +728,7 @@ URL: [url]', 'lock_document' => 'Bloquear', 'lock_message' => 'Este documento ha sido bloqueado por [username]. Sólo usuarios autorizados pueden desbloquear este documento (vea el final de la página).', 'lock_status' => 'Estado', +'logfile_loading' => '', 'login' => 'Iniciar sesión', 'login_disabled_text' => 'Su cuenta está deshabilitada, probablemente es debido a demasiados intentos de acceso fallidos.', 'login_disabled_title' => 'La cuenta está deshabilitada', @@ -817,6 +819,7 @@ URL: [url]', 'next_state' => 'Nuevo estado', 'nl_NL' => 'Holandes', 'no' => 'No', +'notification' => '', 'notify_added_email' => 'Ha sido añadido a la lista de notificación', 'notify_added_email_body' => 'Añadido a la lista de notificación Nombre: [name] @@ -840,6 +843,7 @@ URL: [url]', 'no_current_version' => 'Está utilizando una versión desactualizada de este producto. La última versión disponible es [latestversion].', 'no_default_keywords' => 'No hay palabras clave disponibles', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => 'No hay documentos bloqueados.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1528,6 +1532,7 @@ URL: [url]', 'settings_workflowMode' => 'Workflow mode', 'settings_workflowMode_desc' => 'El flujo de trabajo avanzado permite especificar su propia versión de flujo para las versiones de documento.', 'settings_workflowMode_valadvanced' => 'avanzado', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'tradicional', 'settings_workflowMode_valtraditional_only_approval' => 'Tradicional(sin revisión)', 'settings_zendframework' => 'Zend Framework', @@ -1542,6 +1547,7 @@ URL: [url]', 'sign_in' => 'Conectar', 'sign_out' => 'Salir', 'sign_out_user' => 'Desconectar usuario', +'site_brand' => '', 'sk_SK' => 'Slovaco', 'sort_by_date' => 'Ordenar por Fecha', 'sort_by_name' => 'Ordenar por nombre', @@ -1666,9 +1672,13 @@ URL: [url]', 'switched_to' => 'Cambiar a', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Tomar control de la revisión de la última versión', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 151063a97..0d27a2fc3 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1094), jeromerobert (50), lonnnew (9), Oudiceval (755) +// Translators: Admin (1099), jeromerobert (50), lonnnew (9), Oudiceval (767) $text = array( '2_factor_auth' => 'Authentification forte', @@ -130,7 +130,7 @@ Commentaire : [comment] Utilisateur : [username] URL : [url]', 'approval_submit_email_subject' => '[sitename]: [name] - Approbation soumise', -'approval_summary' => 'Vue d’ensemble approbation', +'approval_summary' => 'Récapitulatif approbation', 'approval_update_failed' => 'Erreur de la mise à jour du statut d\'approbation. Echec de la mise à jour.', 'approvers' => 'Approbateurs', 'approver_already_assigned' => 'L’utilisateur est déjà affecté comme approbateur.', @@ -614,6 +614,7 @@ Utilisateur: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Dossier renommé', 'folder_title' => 'Dossier \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Mettre à jour', 'friday' => 'Vendredi', 'friday_abbr' => 'Ven.', @@ -633,14 +634,14 @@ URL: [url]', 'global_workflow_states' => 'États de Workflow', 'group' => 'Groupe', 'groups' => 'Groupes', -'group_approval_summary' => 'Vue d’ensemble groupe approbation', +'group_approval_summary' => 'Récapitulatif groupe approbation', 'group_exists' => 'Ce groupe existe déjà.', 'group_info' => 'Informations du groupe', 'group_management' => 'Gestion des groupes', 'group_members' => 'Membres du groupe', -'group_receipt_summary' => 'Vue d’ensemble groupe réception', -'group_review_summary' => 'Vue d’ensemble groupe vérification', -'group_revision_summary' => '', +'group_receipt_summary' => 'Récapitulatif groupe réception', +'group_review_summary' => 'Récapitulatif groupe vérification', +'group_revision_summary' => 'Récapitulatif groupe révision', 'guest_login' => 'Se connecter comme invité', 'guest_login_disabled' => 'Connexion d\'invité désactivée.', 'hash' => 'Hash', @@ -758,6 +759,7 @@ URL: [url]', 'lock_document' => 'Verrouiller', 'lock_message' => 'Ce document a été verrouillé par [username]. Seuls les utilisateurs autorisés peuvent déverrouiller ce document.', 'lock_status' => 'Statut', +'logfile_loading' => '', 'login' => 'Identification', 'login_disabled_text' => 'Votre compte est désactivé, sans doute à cause de trop nombreuses connexions qui ont échoué.', 'login_disabled_title' => 'Compte désactivé', @@ -848,6 +850,7 @@ URL : [url]', 'next_state' => 'Nouvel état', 'nl_NL' => 'Danois', 'no' => 'Non', +'notification' => 'Alerte', 'notify_added_email' => 'Vous avez été ajouté à la liste des notifications.', 'notify_added_email_body' => 'Ajouté à la liste des notifications Nom : [name] @@ -871,6 +874,7 @@ URL: [url]', 'no_current_version' => 'Vous utilisez une vieille version de SeedDMS. La dernière version disponible est la [latestversion].', 'no_default_keywords' => 'Aucun mot-clé disponible', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => 'Aucun document verrouillé', 'no_docs_needs_correction' => 'Aucun document ne nécessite de correction', 'no_docs_rejected' => 'Aucun document rejeté.', @@ -988,7 +992,7 @@ Utilisateur : [username] URL : [url]', 'receipt_request_email_subject' => '[sitename] : [name] - Demande de réception', 'receipt_status' => 'Statut', -'receipt_summary' => 'Vue d’ensemble réception', +'receipt_summary' => 'Récapitulatif réception', 'receipt_update_failed' => 'La confirmation de réception a échoué', 'recent_uploads' => 'Téléchargements récents', 'reception' => 'Réception', @@ -1079,7 +1083,7 @@ Dossier parent : [folder_path] Utilisateur : [username] URL : [url]', 'review_submit_email_subject' => '[sitename] : [name] - Vérification faite', -'review_summary' => 'Vue d’ensemble vérification', +'review_summary' => 'Récapitulatif vérification', 'review_update_failed' => 'Erreur lors de la mise à jour du statut de vérification. Échec de la mise à jour.', 'revise_document' => 'Réviser le document', 'revise_document_on' => 'Prochaine révision de la version du document le [date]', @@ -1105,7 +1109,7 @@ URL : [url]', 'revision_status' => 'État', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', -'revision_summary' => '', +'revision_summary' => 'Récapitulatif révision', 'revisors' => 'Réviseurs', 'revisor_already_assigned' => 'L’utilisateur est déjà attribué en tant que réviseur.', 'revisor_already_removed' => 'Le réviseur a déjà été retiré du processus de révision ou a déjà révisé le document.', @@ -1457,14 +1461,14 @@ Nom : [username] 'settings_maxUploadSize' => 'Taille max. des fichiers', 'settings_maxUploadSize_desc' => 'Taille maximale (en octets) pour les fichiers téléversés. Concerne les versions d’un document et les fichiers attachés.', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', -'settings_noDocumentFormFields' => '', -'settings_noDocumentFormFields_desc' => '', +'settings_noDocumentFormFields' => 'N\'afficher pas ce champ', +'settings_noDocumentFormFields_desc' => 'Ce champ ne sera pas visible quand vous ajoutez ou éditez un document. Les valeurs existantes seront retenues.', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', 'settings_no_content_dir' => 'Répertoire de contenu', 'settings_onePageMode' => 'Mode une page', -'settings_onePageMode_desc' => '', +'settings_onePageMode_desc' => 'Le mode Page unique activera le code javascript dans la page AfficherDossier, qui va mettre à jour la liste Dossier/Document, navigation, etc quand vous cliquez sur un dossier ou vous changer le parametre de l\'ordre d\'affichage.', 'settings_overrideMimeType' => 'Passer outre le type MIME', 'settings_overrideMimeType_desc' => 'Ne pas tenir compte du type MIME envoyé par le navigateur quand un fichier est téléversé. Le type MIME sera déterminé par SeedDMS.', 'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader', @@ -1581,6 +1585,7 @@ Nom : [username] 'settings_workflowMode' => 'Mode workflow', 'settings_workflowMode_desc' => 'Le workflow avancé permet de définir son propre workflow de parution pour les versions de documents.', 'settings_workflowMode_valadvanced' => 'avancé', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'traditionnel', 'settings_workflowMode_valtraditional_only_approval' => 'traditionnel (sans revue)', 'settings_zendframework' => 'Zend Framework', @@ -1595,6 +1600,7 @@ Nom : [username] 'sign_in' => 'Connexion', 'sign_out' => 'Déconnexion', 'sign_out_user' => 'Déconnecter l\'utilisateur', +'site_brand' => '', 'sk_SK' => 'Slovaque', 'sort_by_date' => 'Trier par date', 'sort_by_name' => 'Trier par nom', @@ -1719,9 +1725,13 @@ Nom : [username] 'switched_to' => 'Connexion provisoire sous', 'takeOverAttributeValue' => 'Récupérer la valeur de la dernière version', 'takeOverGrpApprover' => 'Récupérer le groupe d\'approbateurs de la dernière version.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Récupérer le groupe d\'examinateurs de la dernière version.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Récupérer les approbateurs de la dernière version.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Récupérer les examinateurs de la dernière version.', +'takeOverIndReviewers' => '', 'tasks' => 'Tâches', 'task_description' => 'Description', 'task_disabled' => 'Désactivée', @@ -1846,7 +1856,7 @@ URL : [url]', 'versioning_file_creation_warning' => 'Cette opération permet de créer, pour chaque document, un fichier texte contenant les informations générales et l’historique des versions du document. Chaque fichier sera enregistré dans le répertoire du document. Ces fichiers ne sont pas nécessaires au bon fonctionnement de SeedDMS, mais ils peuvent être utiles en cas de transfert des fichiers vers un autre système.', 'versioning_info' => 'Versions', 'versiontolow' => '', -'version_comment' => '', +'version_comment' => 'commentaire de la version', 'version_deleted_email' => 'Version supprimée', 'version_deleted_email_body' => 'Version supprimée Document: [name] @@ -1869,7 +1879,7 @@ URL: [url]', 'workflow_action_in_use' => 'Cette action est actuellement utilisée par des workflows.', 'workflow_action_name' => 'Nom', 'workflow_editor' => 'Editeur de Workflow', -'workflow_group_summary' => 'Vue d’ensemble du groupe', +'workflow_group_summary' => 'Récapitulatif groupe workflow', 'workflow_has_cycle' => '', 'workflow_initstate' => 'Etat initial', 'workflow_in_use' => 'Ce workflow est actuellement utilisé par des documents.', @@ -1886,9 +1896,9 @@ URL: [url]', 'workflow_state_docstatus' => 'Etat du document', 'workflow_state_in_use' => 'Cet état est actuellement utilisé par des workflows.', 'workflow_state_name' => 'Nom', -'workflow_summary' => 'Vue d’ensemble du workflow', +'workflow_summary' => 'Récapitulatif workflow', 'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !', -'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur', +'workflow_user_summary' => 'Récapitulatif utilisateur', 'x_more_objects' => '[number] objets supplémentaires', 'year_view' => 'Vue annuelle', 'yes' => 'Oui', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index e9d99399d..7df14ae1a 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -588,6 +588,7 @@ Korisnik: [username] Internet poveznica: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Preimenovana mapa', 'folder_title' => 'Mapa \'[foldername]\'', +'foot_note' => '', 'force_update' => '', 'friday' => 'Petak', 'friday_abbr' => 'Pe', @@ -732,6 +733,7 @@ Internet poveznica: [url]', 'lock_document' => 'Zaključaj', 'lock_message' => 'Ovaj dokument je zaključao [username]. Samo ovlašteni korisnici mogu otključati ovaj dokument.', 'lock_status' => 'Status', +'logfile_loading' => '', 'login' => 'Prijava', 'login_disabled_text' => 'Vaš korisnički račun je onemogućen, vjerojatno zbog previše neispravnih prijava.', 'login_disabled_title' => 'Korisnički račun je onemogućen', @@ -821,6 +823,7 @@ Internet poveznica: [url]', 'next_state' => 'Slijedeći status', 'nl_NL' => 'Nizozemski', 'no' => 'Ne', +'notification' => '', 'notify_added_email' => 'Dodani ste na popis obavijesti', 'notify_added_email_body' => 'Dodano na popis obavijesti Naziv: [name] @@ -844,6 +847,7 @@ Internet poveznica: [url]', 'no_current_version' => 'Koristite na staru verziju ProsperaDMS-a. Najnovija dostupna verzija je[latestversion].', 'no_default_keywords' => 'Nema dostupnih ključnih riječi', 'no_docs_checked_out' => 'Niti jedan dokument nije odjavljen', +'no_docs_expired' => '', 'no_docs_locked' => 'Nema zaključanih dokumenata.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1549,6 +1553,7 @@ Internet poveznica: [url]', 'settings_workflowMode' => 'Način rada toka rada', 'settings_workflowMode_desc' => 'Napredni tok rada vam omogućuje da odredite vaše vlastito izdanje toka rada za verzije dokumenta.', 'settings_workflowMode_valadvanced' => 'napredno', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'tradicionalno', 'settings_workflowMode_valtraditional_only_approval' => 'uobičajeno (bez revizije)', 'settings_zendframework' => 'Zend okruženje', @@ -1563,6 +1568,7 @@ Internet poveznica: [url]', 'sign_in' => 'Prijava u sustav', 'sign_out' => 'Odjava', 'sign_out_user' => 'Odjavi korisnika', +'site_brand' => '', 'sk_SK' => 'Slovački', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1687,9 +1693,13 @@ Internet poveznica: [url]', 'switched_to' => 'Promjenjeno u', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => 'Preuzimanje grupe odobravatelja iz zadnje verzije.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Preuzimanje grupe revizora iz zadnje verzije.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Preuzimanje pojedinačnog odobravatelja iz zadnje verzije.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Preuzimanje pojedinačnog revizora iz zadnje verzije.', +'takeOverIndReviewers' => '', 'tasks' => 'Zadaci', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 3548c9f9c..76cd8dac8 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (635), ribaz (1036) +// Translators: Admin (636), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -349,7 +349,7 @@ URL: [url]', 'documents_user_no_reception' => '', 'documents_user_obsolete' => '', 'documents_user_reception' => '', -'documents_user_rejected' => '', +'documents_user_rejected' => 'Felhasználó által visszautasított dokumentumok', 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani', 'documents_with_notification' => '', 'document_already_checkedout' => '', @@ -583,6 +583,7 @@ Felhasználó: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Mappa átnevezve', 'folder_title' => 'Mappa \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Frissít', 'friday' => 'Péntek', 'friday_abbr' => 'Pé', @@ -727,6 +728,7 @@ URL: [url]', 'lock_document' => 'Zárol', 'lock_message' => 'Ezt a dokumentumot [username] zárolta. Csak az arra jogosult felhasználó törölheti a zárolást (Lásd: lap alja).', 'lock_status' => 'Állapot', +'logfile_loading' => '', 'login' => 'Bejelentkezés', 'login_disabled_text' => 'Fiókja letiltásra került, valószínűleg a túl sok érvénytelen bejelentkezési kísérlet miatt.', 'login_disabled_title' => 'Hozzáférés letiltva', @@ -817,6 +819,7 @@ URL: [url]', 'next_state' => 'Új állapot', 'nl_NL' => 'Holland', 'no' => 'Nem', +'notification' => '', 'notify_added_email' => 'Ön felkerült az értesítési listára', 'notify_added_email_body' => 'Hozzáadva az értesítési listához Név: [name] @@ -840,6 +843,7 @@ URL: [url]', 'no_current_version' => 'Ön a SeedDMS régebbi változatát futtatja. A legutolsó elérhető verzió [latestversion].', 'no_default_keywords' => 'Nincsenek elérhető kulcsszavak', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => 'Nincsenek zárolt dokumentumok.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1527,6 +1531,7 @@ URL: [url]', 'settings_workflowMode' => 'Munkafolyamat mód', 'settings_workflowMode_desc' => 'A részletes munkafolyamat engedélyezi saját kiadási munkafolyamat megadását a dokumentum változatokhoz.', 'settings_workflowMode_valadvanced' => 'részletes', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'hagyományos', 'settings_workflowMode_valtraditional_only_approval' => 'hagyományos (áttekintés nélkül)', 'settings_zendframework' => 'Zend keretrendszer', @@ -1541,6 +1546,7 @@ URL: [url]', 'sign_in' => 'Bejelentkezés', 'sign_out' => 'Kijelentkezés', 'sign_out_user' => 'Kijelentkezés', +'site_brand' => '', 'sk_SK' => 'Szlovák', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1665,9 +1671,13 @@ URL: [url]', 'switched_to' => 'Felhasználó váltás', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 9e8715e6f..bd03282a9 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2014), rickr (144), s.pnt (26) +// Translators: Admin (2018), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', @@ -600,6 +600,7 @@ Utente: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Cartella rinominata', 'folder_title' => 'Cartella \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Aggiona', 'friday' => 'Venerdì', 'friday_abbr' => 'Ven', @@ -744,6 +745,7 @@ URL: [url]', 'lock_document' => 'Blocca', 'lock_message' => 'Questo documento è bloccato da [username]. Solo gli utenti autorizzati possono sbloccare questo documento.', 'lock_status' => 'Stato bloccaggio', +'logfile_loading' => '', 'login' => 'Accesso', 'login_disabled_text' => 'Il tuo account è stato disabilitato: troppi login falliti.', 'login_disabled_title' => 'L\'account è disabilitato', @@ -834,6 +836,7 @@ URL: [url]', 'next_state' => 'Nuovo stato', 'nl_NL' => 'Olandese', 'no' => 'No', +'notification' => '', 'notify_added_email' => 'Sei stato aggiunto alla lista di notifica', 'notify_added_email_body' => 'Aggiunto alla lista di notifica Nome: [name] @@ -857,6 +860,7 @@ URL: [url]', 'no_current_version' => 'La corrente versione di SeedDMS non è aggiornata. La versione più recente disponibile è la [latestversion].', 'no_default_keywords' => 'Nessuna parola-chiave disponibile', 'no_docs_checked_out' => 'Nessun documento approvato', +'no_docs_expired' => '', 'no_docs_locked' => 'Nessun documento bloccato.', 'no_docs_needs_correction' => 'Nessun documento che necessita di correzioni', 'no_docs_rejected' => 'Nessun documento rifiutato', @@ -1459,13 +1463,13 @@ Name: [username] 'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare', 'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', -'settings_noDocumentFormFields' => '', -'settings_noDocumentFormFields_desc' => '', +'settings_noDocumentFormFields' => 'Non mostrare questi campi', +'settings_noDocumentFormFields_desc' => 'Questo campo non verrà mostrato quando aggiungi o modifichi un documento. Il valore esistente verrà conservato.', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.', 'settings_no_content_dir' => 'Cartella contenitore', -'settings_onePageMode' => '', +'settings_onePageMode' => 'Modalità ad una pagina', 'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Ignora MimeType', 'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.', @@ -1583,6 +1587,7 @@ Name: [username] 'settings_workflowMode' => 'Modalità flusso di lavoro', 'settings_workflowMode_desc' => 'Il flusso di lavoro \'avanzato\' permette di pubblicare un proprio flusso di lavoro per le versioni dei documenti', 'settings_workflowMode_valadvanced' => 'Avanzato', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'Tradizionale', 'settings_workflowMode_valtraditional_only_approval' => 'Tradizionale (senza revisione)', 'settings_zendframework' => 'Framework Zend', @@ -1597,6 +1602,7 @@ Name: [username] 'sign_in' => 'Accesso', 'sign_out' => 'Disconnettiti', 'sign_out_user' => 'Disconnetti l\'utente', +'site_brand' => '', 'sk_SK' => 'Slovacco', 'sort_by_date' => 'Ordina per data', 'sort_by_name' => 'Ordina per nome', @@ -1721,9 +1727,13 @@ Name: [username] 'switched_to' => 'Passato a', 'takeOverAttributeValue' => 'Riprendi il valore dell\'attributo dall\'ultima versione', 'takeOverGrpApprover' => 'Riprendi il gruppo degli approvatori dall\'ultima versione.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Riprendi il gruppo dei revisori dall\'ultima versione.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.', +'takeOverIndReviewers' => '', 'tasks' => 'Attività', 'task_description' => 'Descrizione', 'task_disabled' => 'Disabilitata', @@ -1848,7 +1858,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Con questa operazione è possibile creare un file di backup delle informazioni di versione dei documenti di un\'intera cartella. Dopo la creazione ogni file viene salvato nella cartella del relativo documento.', 'versioning_info' => 'Informazioni di versione', 'versiontolow' => 'Versione obsoleta', -'version_comment' => '', +'version_comment' => 'Commento alla versione', 'version_deleted_email' => 'Cancellazione versione', 'version_deleted_email_body' => 'Versione cancellata Documento: [name] diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index ede9add6d..9fd264e16 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -589,6 +589,7 @@ URL : [url]', URL: [url]', 'folder_renamed_email_subject' => '[sitename] : [name] - 폴더 이름', 'folder_title' => '폴더 \'[foldername]\'', +'foot_note' => '', 'force_update' => '', 'friday' => '금요일', 'friday_abbr' => '금', @@ -733,6 +734,7 @@ URL: [url]', 'lock_document' => '잠그기', 'lock_message' => '이 문서는 [username].에 의해 잠겨 있습니다. 허가 된 사용자 만이 문서를 잠금을 해제 할 수 있습니다.', 'lock_status' => '상태', +'logfile_loading' => '', 'login' => '로그인', 'login_disabled_text' => '귀정 이상 로그인 실패로 당신의 계정을사용할 수 없습니다.', 'login_disabled_title' => '계정 비활성화', @@ -823,6 +825,7 @@ URL [url]', 'next_state' => '새 상태', 'nl_NL' => '네덜란드', 'no' => '아니오', +'notification' => '', 'notify_added_email' => '귀하는 알림목록에 추가되었습니다.', 'notify_added_email_body' => '알림 목록에 추가 이름: [name] @@ -846,6 +849,7 @@ URL : [url]', 'no_current_version' => '당신은 이전 버전의 SeedDMS를 사용하고 있습니다. 사용 가능한 최신 버전은 [latestversion] 입니다.', 'no_default_keywords' => '사용 가능한 키워드가 존재하지 않습니다.', 'no_docs_checked_out' => '체크아웃 문서가 없습니다.', +'no_docs_expired' => '', 'no_docs_locked' => '잠긴 문서가 없습니다.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1543,6 +1547,7 @@ URL : [url]', 'settings_workflowMode' => '워크플로우 모드', 'settings_workflowMode_desc' => '문서 버전에 대한 자신의 릴리스 워크플로우 지정하실 수 있습니다 .', 'settings_workflowMode_valadvanced' => '고급', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => '관습적', 'settings_workflowMode_valtraditional_only_approval' => '관습적 (리뷰 없음)', 'settings_zendframework' => '젠드 프레임 워크', @@ -1557,6 +1562,7 @@ URL : [url]', 'sign_in' => '로그인', 'sign_out' => '로그 아웃', 'sign_out_user' => '사용자가 로그 아웃', +'site_brand' => '', 'sk_SK' => '슬로바키아어', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1681,9 +1687,13 @@ URL : [url]', 'switched_to' => '전환', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '마지막 버전의 승인자의 그룹를 인수 합니다.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '최종 버전의 리뷰 그룹을 상속합니다.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '마지막 버전의 개별 승인자를 인수 합니다.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '최종 버전의 개인별 검수자를 상속합니다.', +'takeOverIndReviewers' => '', 'tasks' => '작업', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 0d0a86ca5..a221e6682 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -593,6 +593,7 @@ URL: [url]', URL: [url]', 'folder_renamed_email_subject' => '[sitename]:[name] - ປ່ຽນຊື່ໂຟລເດີ', 'folder_title' => 'ໂຟລເດີ "[foldername] "', +'foot_note' => '', 'force_update' => '', 'friday' => 'ວັນສຸກ', 'friday_abbr' => 'ວັນສຸກ', @@ -737,6 +738,7 @@ URL: [url]', 'lock_document' => 'ລັອກ', 'lock_message' => 'ເອກະສານນີ້ຖືກລັອກໂດຍ [username] ສະເພາະຜູ້ໄຊ້ທີ່ໄດ້ຮັບອະນຸຍາດເທົ່ານັ້ນທີ່ສາມາດປົດລັອກເອກະສານນີ້ໄດ້', 'lock_status' => 'ສະຖານະ', +'logfile_loading' => '', 'login' => 'ເຂົ້າສຸ່ລະບົບ', 'login_disabled_text' => 'ບັນຊີຂອງເຈົ້າໄດ້ຖືກປິດໄຊ້ງານອາດເປັນເພາະການລັອກອິນເຂົ້າລະບົບລົ້ມເຫຼວຫລາຍຄັ້ງເກີນໄປ', 'login_disabled_title' => 'ບັນຊີຖືກປິດໄຊ້ງານ', @@ -827,6 +829,7 @@ URL: [url]', 'next_state' => 'ລັດໄຫມ່', 'nl_NL' => 'ດັສ', 'no' => 'ບໍ່', +'notification' => '', 'notify_added_email' => 'ເຈົ້າໄດ້ຮັບການເພີ່ມລາຍຊື່ລົງໃນການແຈ້ງເຕືອນແລ້ວ', 'notify_added_email_body' => 'ເພີ່ມລົງໃນລາຍການແຈ້ງເຕືອນແລ້ວ ຊື່: [name] @@ -850,6 +853,7 @@ URL: [url]', 'no_current_version' => 'ເຈົ້າກຳລັງນຳໄຊ້ເວີຊັນເກົ່າຄື ຊິສ DMS. ສວນເວີຊັນທີ່ມີຢູ່ລ້າສຸດຄື [latestversion]', 'no_default_keywords' => 'ບໍ່ມີຄຳຫລັກ', 'no_docs_checked_out' => 'ບໍ່ມີເອກະສານທີ່ເອົາອອກໄປ', +'no_docs_expired' => '', 'no_docs_locked' => 'ເອກະສານທີ່ບໍຖືກລັອກ', 'no_docs_needs_correction' => '', 'no_docs_rejected' => 'ບໍ່ມີເອກະສານທີຖືກປະຕິເສດ', @@ -1576,6 +1580,7 @@ URL: [url]', 'settings_workflowMode' => 'ໂຫມດການເຮັດວຽກ', 'settings_workflowMode_desc' => 'ເວີກໂຟລຂັນສູງຊ່ວຍໃນການລະບຸເວີກໂຟລການເປີດຕົວຂອງເຈົ້າເອງສຳລັບເວີຊັນຂອງເອກະສານ', 'settings_workflowMode_valadvanced' => 'ຕຳແຫນ່ງສູງ', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'ແບບດັງເດີມ', 'settings_workflowMode_valtraditional_only_approval' => 'ແບບດັງເດີມ ບໍ່ມີການກວດກາ', 'settings_zendframework' => 'ເຊັນກອບຂອງງງານ', @@ -1590,6 +1595,7 @@ URL: [url]', 'sign_in' => 'ລົງຊື່ເຂົາໄຊ້', 'sign_out' => 'ອອກຈາກລະບົບ', 'sign_out_user' => 'ອອກຈາກລະບົບຜູ້ໄຊ້', +'site_brand' => '', 'sk_SK' => 'ສະໂລວາເກຍ', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1714,9 +1720,13 @@ URL: [url]', 'switched_to' => 'ປ່ຽນເປັນ', 'takeOverAttributeValue' => 'ໄຊ້ແອັດທີບິວຈາກເວີຊັ້ນລາສຸດ', 'takeOverGrpApprover' => 'ກຸ່ມຜູ້ອະນຸມັກຈາກເວີຊັ້ນລ່າສຸດ', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'ໄຊ້ກຸ່ມຜູ້ກວດສອບຈາກເວີຊັນລ້າສຸດ', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'ຮັບອານຸມັດຈາກເວີຊັນລ່າສຸດ', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'ການກວດສອບແຕ່ລະບຸກຄົນຈາກເວີຊັ້ນລ່າສຸດ', +'takeOverIndReviewers' => '', 'tasks' => 'ງານ', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 8b42c8adf..d347f9f6e 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -588,6 +588,7 @@ Gebruiker: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Folder hernoemd', 'folder_title' => 'Map naam \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Bijwerken', 'friday' => 'Vrijdag', 'friday_abbr' => 'FR', @@ -732,6 +733,7 @@ URL: [url]', 'lock_document' => 'Blokkeer', 'lock_message' => 'Dit document is geblokkeerd door [username]. Alleen geautoriseerde Gebruikers kunnen het de-blokeren.', 'lock_status' => 'Status', +'logfile_loading' => '', 'login' => 'Login', 'login_disabled_text' => 'Uw account is gedeactiveerd, mogelijk door teveel foutieve inlogpogingen.', 'login_disabled_title' => 'Account is gedeactiveerd', @@ -821,6 +823,7 @@ URL: [url]', 'next_state' => 'Nieuwe status', 'nl_NL' => 'Nederlands', 'no' => 'Nee', +'notification' => '', 'notify_added_email' => 'U bent toegevoegd aan de [notificatie lijst]', 'notify_added_email_body' => 'Toegevoegd aan notificatielijst Naam: [name] @@ -844,6 +847,7 @@ URL: [url]', 'no_current_version' => 'U werkt met een oude versie van SeedDMS. De laatste versie beschikbaar is [latestversion].', 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar', 'no_docs_checked_out' => 'Geen documenten in gebruik genomen', +'no_docs_expired' => '', 'no_docs_locked' => 'Geen documenten in gebruik.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => 'Geen documenten geweigerd', @@ -1573,6 +1577,7 @@ Name: [username] 'settings_workflowMode' => 'Workflow mode', 'settings_workflowMode_desc' => 'De uitgebreide workflow maakt het mogelijk om uw eigen workflow op te geven voor documentversies.', 'settings_workflowMode_valadvanced' => 'geavanceerd', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'Traditioneel', 'settings_workflowMode_valtraditional_only_approval' => 'Traditioneel (zonder beoordeling)', 'settings_zendframework' => 'Zend-Framework', @@ -1587,6 +1592,7 @@ Name: [username] 'sign_in' => 'Log in', 'sign_out' => 'Log uit', 'sign_out_user' => 'Log gebruiker uit', +'site_brand' => '', 'sk_SK' => 'Slowaaks', 'sort_by_date' => 'Sorteren op datum', 'sort_by_name' => 'Sorteren op naam', @@ -1711,9 +1717,13 @@ Name: [username] 'switched_to' => 'Overgeschakeld naar', 'takeOverAttributeValue' => 'Onthoud de waarde van het attribuut', 'takeOverGrpApprover' => 'Onthoud de laatste groep goedkeurders', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Onthoud de laatste groep herzieners', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Onthoud de laatste groep individuele goedkeurders', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Onthoud de laatste groep individuele herzieners', +'takeOverIndReviewers' => '', 'tasks' => 'taken', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index e9f01958a..9ee4f19af 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -576,6 +576,7 @@ Użytkownik: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Zmiana nazwy folderu', 'folder_title' => 'Folder \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Aktualizacja', 'friday' => 'Piątek', 'friday_abbr' => 'Fr', @@ -720,6 +721,7 @@ URL: [url]', 'lock_document' => 'Zablokuj', 'lock_message' => 'Ten dokument jest zablokowany przez [username]. Tylko uprawnieni użytkownicy mogą odblokować dokument.', 'lock_status' => 'Status', +'logfile_loading' => '', 'login' => 'Login', 'login_disabled_text' => 'Twoje konto jest zablokowane. Prawdopodobnie z powodu zbyt wielu nieudanych prób logowania.', 'login_disabled_title' => 'Konto jest zablokowane', @@ -810,6 +812,7 @@ URL: [url]', 'next_state' => 'Nowy status', 'nl_NL' => 'holenderski', 'no' => 'Nie', +'notification' => '', 'notify_added_email' => 'Twoje konto zostało dodane do listy powiadomień', 'notify_added_email_body' => 'Dodano do listy powiadomień Nazwa: [name] @@ -833,6 +836,7 @@ URL: [url]', 'no_current_version' => '', 'no_default_keywords' => 'Nie ma słów kluczowych', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => 'Brak zablokowanych dokumentów.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1507,6 +1511,7 @@ URL: [url]', 'settings_workflowMode' => 'Tryb procesu', 'settings_workflowMode_desc' => 'Zaawansowany proces pozwala określić własne release procesu zwalniający dla wersji dokumentu.', 'settings_workflowMode_valadvanced' => 'zaawansowane', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'tradycyjny', 'settings_workflowMode_valtraditional_only_approval' => '', 'settings_zendframework' => 'Zend Framework', @@ -1521,6 +1526,7 @@ URL: [url]', 'sign_in' => 'Zaloguj się', 'sign_out' => 'Wyloguj', 'sign_out_user' => 'Wyloguj użytkownika', +'site_brand' => '', 'sk_SK' => 'słowacki', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1645,9 +1651,13 @@ URL: [url]', 'switched_to' => 'Przełączone na', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 9e264c39f..42934534f 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -614,6 +614,7 @@ Usuário: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Pasta renomeada', 'folder_title' => 'Pasta [foldername]', +'foot_note' => '', 'force_update' => 'Atualizar', 'friday' => 'Sexta-feira', 'friday_abbr' => 'Se', @@ -758,6 +759,7 @@ URL: [url]', 'lock_document' => 'Travar', 'lock_message' => 'Este documento foi travado por [username]. Somente usuários autorizados podem remover a trava deste documento (veja no final da página).', 'lock_status' => 'Estado', +'logfile_loading' => '', 'login' => 'Login', 'login_disabled_text' => 'Sua conta está desativada, provavelmente por causa de muitos logins falhos.', 'login_disabled_title' => 'Conta desativada', @@ -847,6 +849,7 @@ URL: [url]', 'next_state' => 'Novo estado', 'nl_NL' => 'Holandês', 'no' => 'Não', +'notification' => '', 'notify_added_email' => 'Você foi adicionado a lista de notificação', 'notify_added_email_body' => 'Adicionado a lista de notificação Nome: [name] @@ -870,6 +873,7 @@ URL: [url]', 'no_current_version' => 'Você está executando uma versão antiga do SeedDMS. A última versão disponível é [latestversion].', 'no_default_keywords' => 'não há palavras-chave disponíveis', 'no_docs_checked_out' => 'Nenhum documento retirado', +'no_docs_expired' => '', 'no_docs_locked' => 'Nenhum documento bloqueado.', 'no_docs_needs_correction' => 'Nenhum documento que precise ser corrigido', 'no_docs_rejected' => 'Nenhum documento rejeitado.', @@ -1595,6 +1599,7 @@ Nome: [username] 'settings_workflowMode' => 'Modo de fluxo de trabalho', 'settings_workflowMode_desc' => 'O fluxo de trabalho avançado permite especificar seu próprio fluxo de trabalho de liberação de versões de documentos.', 'settings_workflowMode_valadvanced' => 'avançado', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'tradicional', 'settings_workflowMode_valtraditional_only_approval' => 'tradicional (sem revisão)', 'settings_zendframework' => 'Zend Framework', @@ -1609,6 +1614,7 @@ Nome: [username] 'sign_in' => 'Entrar', 'sign_out' => 'Sair', 'sign_out_user' => 'Sair usuário', +'site_brand' => '', 'sk_SK' => 'Eslovaco', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1733,9 +1739,13 @@ Nome: [username] 'switched_to' => 'Comutado para', 'takeOverAttributeValue' => 'Assuma o valor do atributo da última versão', 'takeOverGrpApprover' => 'Assuma o grupo de aprovadores da última versão.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Assuma o grupo de revisores da última versão.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Assumir o aprovador individual da última versão.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Assuma o revisor individual da última versão.', +'takeOverIndReviewers' => '', 'tasks' => 'Tarefas', 'task_description' => 'Descrição', 'task_disabled' => 'Desativado', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index f074695a5..71bc8d059 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -588,6 +588,7 @@ Utilizator: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Folder redenumit', 'folder_title' => 'Folder \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Actualizeaza', 'friday' => 'Vineri', 'friday_abbr' => 'Vi', @@ -732,6 +733,7 @@ URL: [url]', 'lock_document' => 'Blocare', 'lock_message' => 'Acest document este blocat de [username]. Numai utilizatorii autorizați pot debloca acest document.', 'lock_status' => 'Status', +'logfile_loading' => '', 'login' => 'Login', 'login_disabled_text' => 'Contul dumneavoastră este dezactivat, probabil din cauza prea multor login-uri eșuate.', 'login_disabled_title' => 'Contul este dezactivat', @@ -822,6 +824,7 @@ URL: [url]', 'next_state' => 'Stare nouă', 'nl_NL' => 'Olandeză', 'no' => 'Nu', +'notification' => '', 'notify_added_email' => 'Ai fost adăugat la lista de notificări', 'notify_added_email_body' => 'Adăugat la lista de notificări Nume: [name] @@ -845,6 +848,7 @@ URL: [url]', 'no_current_version' => 'Utilizați o versiune veche de SeedDMS. Cea mai recentă versiune disponibilă este [latestversion].', 'no_default_keywords' => 'Nu există cuvinte cheie disponibile', 'no_docs_checked_out' => 'Nu exista documente verificate', +'no_docs_expired' => '', 'no_docs_locked' => 'Nici un document blocat.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1550,6 +1554,7 @@ URL: [url]', 'settings_workflowMode' => 'Mod Workflow', 'settings_workflowMode_desc' => 'Workflow-ul avansat permite să specificați propriul flux de lucru(workflow) pentru versiunile de documente.', 'settings_workflowMode_valadvanced' => 'avansat', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'traditional', 'settings_workflowMode_valtraditional_only_approval' => 'traditional (fara revizuire)', 'settings_zendframework' => 'Zend Framework', @@ -1564,6 +1569,7 @@ URL: [url]', 'sign_in' => 'Sign in', 'sign_out' => 'Sign out', 'sign_out_user' => 'Sign out utilizator', +'site_brand' => '', 'sk_SK' => 'Slovacă', 'sort_by_date' => 'Sortare dupa data', 'sort_by_name' => 'Sortare dupa nume', @@ -1688,9 +1694,13 @@ URL: [url]', 'switched_to' => 'Comutat pe', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => 'Preia grupul de aprobatori din ultima versiune.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Preia grupul de revizuitori din ultima versiune.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Preia aprobatorul individual din ultima versiune.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Preia revizuitorul individual din ultima versiune.', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index f8ea3b82c..90054b316 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -588,6 +588,7 @@ URL: [url]', URL: [url]', 'folder_renamed_email_subject' => '[sitename]: переименован каталог «[name]»', 'folder_title' => 'Каталог [foldername]', +'foot_note' => '', 'force_update' => '', 'friday' => 'Пятница', 'friday_abbr' => 'Пт', @@ -732,6 +733,7 @@ URL: [url]', 'lock_document' => 'Заблокировать', 'lock_message' => 'Документ заблокировал(а) [username]. Только имеющие права могут его разблокировать.', 'lock_status' => 'Статус', +'logfile_loading' => '', 'login' => 'Логин', 'login_disabled_text' => 'Ваша учётная запись заблокирована, возможно, из-за нескольких неудачных попыток входа.', 'login_disabled_title' => 'Учётная запись заблокирована', @@ -821,6 +823,7 @@ URL: [url]', 'next_state' => 'Новое состояние', 'nl_NL' => 'Dutch', 'no' => 'Нет', +'notification' => '', 'notify_added_email' => 'Вы добавлены в список уведомлений', 'notify_added_email_body' => 'Вы добавлены в список уведомлений Имя: [name] @@ -844,6 +847,7 @@ URL: [url]', 'no_current_version' => 'Вы используете старую версию SeedDMS. Последняя доступная версия [latestversion].', 'no_default_keywords' => 'Нет меток', 'no_docs_checked_out' => 'Нет документов на рассмотрении', +'no_docs_expired' => '', 'no_docs_locked' => 'Нет заблокированных документов', 'no_docs_needs_correction' => '', 'no_docs_rejected' => 'Нет отклоненных докуметов', @@ -1557,6 +1561,7 @@ URL: [url]', 'settings_workflowMode' => 'Режим процесса', 'settings_workflowMode_desc' => 'Улучшенный режим позволяет указать ваш собственный процесс для документа.', 'settings_workflowMode_valadvanced' => 'улучшенный', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'традиционный', 'settings_workflowMode_valtraditional_only_approval' => 'традиционный (без рецензирования)', 'settings_zendframework' => 'Инфраструктура Zend', @@ -1571,6 +1576,7 @@ URL: [url]', 'sign_in' => 'Войти', 'sign_out' => 'Выйти', 'sign_out_user' => 'Пользовательский выход', +'site_brand' => '', 'sk_SK' => 'Slovak', 'sort_by_date' => 'Сортировка по дате', 'sort_by_name' => 'Сортировка по имени', @@ -1695,9 +1701,13 @@ URL: [url]', 'switched_to' => 'Переключён как', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => 'Использовать группу утверждающих из прошлой версии', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Использовать группу рецензентов из прошлой версии', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Использовать утверждающих из прошлой версии', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Использовать рецензентов из прошлой версии', +'takeOverIndReviewers' => '', 'tasks' => 'Задания', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index d85348683..6e1071be1 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -614,6 +614,7 @@ Používateľ: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Zložka bola premenovaná', 'folder_title' => 'Zložka \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Aktualizovať', 'friday' => 'Piatok', 'friday_abbr' => 'Pia', @@ -758,6 +759,7 @@ URL: [url]', 'lock_document' => 'Zamknúť', 'lock_message' => 'Tento dokument zamkol [username]. Iba oprávnení používatelia ho môžu odomknúť.', 'lock_status' => 'Stav', +'logfile_loading' => '', 'login' => 'Prihlásiť sa', 'login_disabled_text' => 'Váš účet bol zablokovaný, pravdepodobne veľa pokusov o prihlásenie zlyhalo.', 'login_disabled_title' => 'Účet je zablokovaný', @@ -848,6 +850,7 @@ URL: [url]', 'next_state' => 'Nový stav', 'nl_NL' => 'Holandština', 'no' => 'Nie', +'notification' => '', 'notify_added_email' => 'Boli ste pridaní do notifikačného zoznamu', 'notify_added_email_body' => 'Pridanie do notifikačného zoznamu Meno: [name] @@ -871,6 +874,7 @@ URL: [url]', 'no_current_version' => 'Neaktualizovaná verzia', 'no_default_keywords' => 'Nie sú dostupné žiadne kľúčové slová.', 'no_docs_checked_out' => 'No documents checked out', +'no_docs_expired' => '', 'no_docs_locked' => 'Žiadne uzamknuté dokumenty.', 'no_docs_needs_correction' => 'Žiadne dokumenty potrebné opraviť', 'no_docs_rejected' => 'Žiadne dokumenty neboli zamietnuté.', @@ -1597,6 +1601,7 @@ Meno: [username] 'settings_workflowMode' => 'Workflow mode', 'settings_workflowMode_desc' => 'The advanced workflow allows to specify your own release workflow for document versions.', 'settings_workflowMode_valadvanced' => 'pokročilý', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'traditional', 'settings_workflowMode_valtraditional_only_approval' => 'traditional (without review)', 'settings_zendframework' => 'Zend Framework', @@ -1611,6 +1616,7 @@ Meno: [username] 'sign_in' => 'Prihlásiť sa', 'sign_out' => 'odhlásiť', 'sign_out_user' => 'Odhlásiť používateľa', +'site_brand' => '', 'sk_SK' => 'Slovenčina', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1735,9 +1741,13 @@ Meno: [username] 'switched_to' => 'Prepnúť na', 'takeOverAttributeValue' => 'Take over attribute value from last version', 'takeOverGrpApprover' => 'Take over group of approvers from last version.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Take over group of reviewers from last version.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Take over individual approver from last version.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Take over individual reviewer from last version.', +'takeOverIndReviewers' => '', 'tasks' => 'Úlohy', 'task_description' => 'Description', 'task_disabled' => 'Disabled', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 9bb89509a..2993cc3f7 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -601,6 +601,7 @@ User: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Katalog har bytt namn', 'folder_title' => 'Katalog \'[foldername]\'', +'foot_note' => '', 'force_update' => '', 'friday' => 'Fredag', 'friday_abbr' => 'Fr', @@ -745,6 +746,7 @@ URL: [url]', 'lock_document' => 'Lås', 'lock_message' => 'Detta dokument har låsts av [username]. Bara auktoriserade användare kan låsa upp dokumentet.', 'lock_status' => 'Status', +'logfile_loading' => '', 'login' => 'Inloggning', 'login_disabled_text' => 'Ditt konto är inaktivt, förmodligen för att du har överskridit antalet tillåtna inloggningsförsök.', 'login_disabled_title' => 'Kontot är inaktivt', @@ -835,6 +837,7 @@ URL: [url]', 'next_state' => 'Ny status', 'nl_NL' => 'Holländska', 'no' => 'Nej', +'notification' => '', 'notify_added_email' => 'Du har lagts till för att få meddelanden', 'notify_added_email_body' => 'Tillägg för att få meddelanden Namn: [name] @@ -858,6 +861,7 @@ URL: [url]', 'no_current_version' => 'Du har en gammal version av SeedDMS. Senaste versionen är [latestversion].', 'no_default_keywords' => 'Inga nyckelord tillgängliga', 'no_docs_checked_out' => 'Inga utcheckade dokument', +'no_docs_expired' => '', 'no_docs_locked' => 'Inga låsta dokument.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => 'Det finns inga avvisade dokument.', @@ -1570,6 +1574,7 @@ Kommentar: [comment]', 'settings_workflowMode' => 'Typ av arbetsflöde', 'settings_workflowMode_desc' => 'Det avancerade arbetsflödet gör det möjligt att lägga upp ett eget definerat gransknings- och godkännandeflöde för dokumentversioner.', 'settings_workflowMode_valadvanced' => 'avancerat', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'traditionellt', 'settings_workflowMode_valtraditional_only_approval' => 'traditionellt (utan granskning)', 'settings_zendframework' => 'Zend Framework', @@ -1584,6 +1589,7 @@ Kommentar: [comment]', 'sign_in' => 'Logga in', 'sign_out' => 'Logga ut', 'sign_out_user' => 'Logga ut användare', +'site_brand' => '', 'sk_SK' => 'Slovakiska', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1708,9 +1714,13 @@ Kommentar: [comment]', 'switched_to' => 'Bytt till', 'takeOverAttributeValue' => 'Ta över attributvärde från senaste version', 'takeOverGrpApprover' => 'Ta över godkännandegrupp från senaste version', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Ta över granskningsgrupp från senaste version', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Ta över individuell godkännare från senaste version', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Ta över individuell granskare från senaste version', +'takeOverIndReviewers' => '', 'tasks' => 'Uppgifter', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 290652111..0269e842c 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1089), aydin (83) +// Translators: Admin (1091), aydin (83) $text = array( '2_factor_auth' => '', @@ -582,6 +582,7 @@ Kullanıcı: [username] URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - Klasörün adı değişti', 'folder_title' => 'Klasör \'[foldername]\'', +'foot_note' => '', 'force_update' => 'Güncelendi', 'friday' => 'Cuma', 'friday_abbr' => 'Cu', @@ -726,6 +727,7 @@ URL: [url]', 'lock_document' => 'Kilitle', 'lock_message' => 'Bu doküman [username] tarafından kilitlenmiştir. Sadece yetkilendirilmiş kişiler bu dokümanı açabilirler.', 'lock_status' => 'Durum', +'logfile_loading' => '', 'login' => 'Giriş', 'login_disabled_text' => 'Hesabınız devre dışı. Muhtemelen çok fazla hatalı giriş denemesi yapıldı.', 'login_disabled_title' => 'Hesap devre dışı', @@ -816,6 +818,7 @@ URL: [url]', 'next_state' => 'Yeni durum', 'nl_NL' => 'Hollandaca', 'no' => 'Hayır', +'notification' => '', 'notify_added_email' => 'Bildirim listesine eklendiniz', 'notify_added_email_body' => 'Bildirim listesine eklendiniz İsim: [name] @@ -839,6 +842,7 @@ URL: [url]', 'no_current_version' => 'Kullandığınız SeedDMS versiyonu eski görünüyor. Son versiyon [latestversion].', 'no_default_keywords' => 'Anahtar kelime yok', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => 'Kilitli doküman yok.', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1189,7 +1193,7 @@ URL: [url]', 'settings_autoLoginUser' => 'otomatik giriş', 'settings_autoLoginUser_desc' => '', 'settings_available_languages' => 'kullanılabilir diller', -'settings_available_languages_desc' => '', +'settings_available_languages_desc' => 'Sil seçim kutucuğunda yalnızca seçili diller yüklenecek ve görüntülenecektir.', 'settings_backupDir' => '', 'settings_backupDir_desc' => '', 'settings_cacheDir' => 'Cache klasörü', @@ -1411,7 +1415,7 @@ URL: [url]', 'settings_Notification' => 'Bildirim ayarları', 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.', 'settings_no_content_dir' => 'İçerik dizini', -'settings_onePageMode' => '', +'settings_onePageMode' => 'Tek sayfa modu', 'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', @@ -1529,6 +1533,7 @@ URL: [url]', 'settings_workflowMode' => 'İş Akış Modu', 'settings_workflowMode_desc' => 'Gelişmiş İş Akışı, dokümün versiyonları için kendi sürümlerinizi belirlemenizi sağlar.', 'settings_workflowMode_valadvanced' => 'gelişmiş', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'geleneksel', 'settings_workflowMode_valtraditional_only_approval' => 'Geleneksel(Ödülsüz)', 'settings_zendframework' => 'Zend Framework', @@ -1543,6 +1548,7 @@ URL: [url]', 'sign_in' => 'Giriş', 'sign_out' => 'Çıkış', 'sign_out_user' => 'Kullanıcı hesabından çıkış', +'site_brand' => '', 'sk_SK' => 'Slovakça', 'sort_by_date' => 'Tarihe göre sırala', 'sort_by_name' => 'Ada göre sırala', @@ -1667,9 +1673,13 @@ URL: [url]', 'switched_to' => 'Yerine geçilen', 'takeOverAttributeValue' => 'Son versiyondaki özellikleri devral', 'takeOverGrpApprover' => 'Bir önceki versiyon onayını yapan grubu al.', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Bir önceki versiyon kontrolünü yapan grubu al.', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Bir önceki versiyonu onaylayanı al.', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Bir önceki versiyonu kontrol edeni al.', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 6358e0149..65a340b61 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -588,6 +588,7 @@ URL: [url]', URL: [url]', 'folder_renamed_email_subject' => '[sitename]: перейменовано каталог «[name]»', 'folder_title' => 'Каталог [foldername]', +'foot_note' => '', 'force_update' => '', 'friday' => 'П\'ятниця', 'friday_abbr' => 'Пт', @@ -732,6 +733,7 @@ URL: [url]', 'lock_document' => 'Заблокувати', 'lock_message' => 'Документ заблокував користувач [username]. Тільки користувачі, які мають відповідні права, можуть його розблокувати.', 'lock_status' => 'Статус', +'logfile_loading' => '', 'login' => 'Логін', 'login_disabled_text' => 'Ваш обліковий запис заблоковано, можливо, через кілька невдалих спроб входу.', 'login_disabled_title' => 'Обліковий запис заблоковано', @@ -821,6 +823,7 @@ URL: [url]', 'next_state' => 'Новий стан', 'nl_NL' => 'Dutch', 'no' => 'Ні', +'notification' => '', 'notify_added_email' => 'Вас додали до списку сповіщення', 'notify_added_email_body' => 'Вас додали до списку сповіщення Назва: [name] @@ -844,6 +847,7 @@ URL: [url]', 'no_current_version' => 'Ви використовуєте застарілу версію SeedDMS. Остання версія [latestversion].', 'no_default_keywords' => 'Немає ключових слів', 'no_docs_checked_out' => 'Немає документів на опрацюванні', +'no_docs_expired' => '', 'no_docs_locked' => 'Немає заблокованих документів', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1550,6 +1554,7 @@ URL: [url]', 'settings_workflowMode' => 'Режим процесу', 'settings_workflowMode_desc' => 'Покращений режим дозволяє вказати ваш власний процес для документа.', 'settings_workflowMode_valadvanced' => 'покращений', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => 'традиційний', 'settings_workflowMode_valtraditional_only_approval' => 'традиційний (без рецензування)', 'settings_zendframework' => 'Інфраструктура Zend', @@ -1564,6 +1569,7 @@ URL: [url]', 'sign_in' => 'Увійти', 'sign_out' => 'Вийти', 'sign_out_user' => 'Вихід користувача', +'site_brand' => '', 'sk_SK' => 'Slovak', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1688,9 +1694,13 @@ URL: [url]', 'switched_to' => 'Переключено на', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => 'Використати групу затверджувачів з попередньої версії', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => 'Використати групу рецензентів з попередньої версії', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => 'Використати затверджувачів з попередньої версії', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => 'Використати рецензентів з попередньої версії', +'takeOverIndReviewers' => '', 'tasks' => 'Завдання', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index dfb71351d..b7997a58e 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -584,6 +584,7 @@ URL: [url]', URL: [url]', 'folder_renamed_email_subject' => '[sitename]: [name] - 文件夹已重命名', 'folder_title' => '文件夹 \'[foldername]\'', +'foot_note' => '', 'force_update' => '强制更新', 'friday' => 'Friday', 'friday_abbr' => '', @@ -728,6 +729,7 @@ URL: [url]', 'lock_document' => '锁定', 'lock_message' => '此文档已被 [username] 锁定. 只有授权用户才能解锁.', 'lock_status' => '锁定状态', +'logfile_loading' => '', 'login' => '登录', 'login_disabled_text' => '', 'login_disabled_title' => '账号已禁用', @@ -818,6 +820,7 @@ URL: [url]', 'next_state' => '新建状态', 'nl_NL' => '荷兰语', 'no' => '否', +'notification' => '', 'notify_added_email' => '您已被添加到了通知名单中', 'notify_added_email_body' => '添加到通知列表 名称: [name] @@ -841,6 +844,7 @@ URL: [url]', 'no_current_version' => '', 'no_default_keywords' => '无关键字', 'no_docs_checked_out' => '文档未签出', +'no_docs_expired' => '', 'no_docs_locked' => '无锁定的文档', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -1531,6 +1535,7 @@ URL: [url]', 'settings_workflowMode' => '工作流模式', 'settings_workflowMode_desc' => '', 'settings_workflowMode_valadvanced' => '先进...', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => '传统', 'settings_workflowMode_valtraditional_only_approval' => '', 'settings_zendframework' => '', @@ -1545,6 +1550,7 @@ URL: [url]', 'sign_in' => '登录', 'sign_out' => '登出', 'sign_out_user' => '退出登录', +'site_brand' => '', 'sk_SK' => '斯洛伐克语', 'sort_by_date' => '日期排序', 'sort_by_name' => '文件名排序', @@ -1669,9 +1675,13 @@ URL: [url]', 'switched_to' => '登录为', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '继承上一版本的审核人', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '继承上一版本的校对人', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '', +'takeOverIndReviewers' => '', 'tasks' => '任务', 'task_description' => '', 'task_disabled' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 02d6819c4..5667b8aa7 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2421) +// Translators: Admin (2423) $text = array( '2_factor_auth' => '', @@ -509,6 +509,7 @@ URL: [url]', 'folder_renamed_email_body' => '', 'folder_renamed_email_subject' => '', 'folder_title' => '資料夾 \'[foldername]\'', +'foot_note' => '', 'force_update' => '更新', 'friday' => 'Friday', 'friday_abbr' => '', @@ -653,6 +654,7 @@ URL: [url]', 'lock_document' => '鎖定', 'lock_message' => '此文檔已被 [username] 鎖定. 只有授權使用者才能解鎖.', 'lock_status' => '鎖定狀態', +'logfile_loading' => '', 'login' => '', 'login_disabled_text' => '', 'login_disabled_title' => '', @@ -727,6 +729,7 @@ URL: [url]', 'next_state' => '', 'nl_NL' => '荷蘭語', 'no' => '否', +'notification' => '', 'notify_added_email' => '您已被添加到了通知名單中', 'notify_added_email_body' => '', 'notify_added_email_subject' => '', @@ -742,6 +745,7 @@ URL: [url]', 'no_current_version' => '', 'no_default_keywords' => '無關鍵字', 'no_docs_checked_out' => '', +'no_docs_expired' => '', 'no_docs_locked' => '無鎖定的文檔', 'no_docs_needs_correction' => '', 'no_docs_rejected' => '', @@ -807,7 +811,7 @@ URL: [url]', 'pl_PL' => '波蘭語', 'possible_substitutes' => '', 'preset_expires' => '', -'preview' => '', +'preview' => '預覽', 'preview_converters' => '', 'preview_images' => '', 'preview_markdown' => '', @@ -1380,6 +1384,7 @@ URL: [url]', 'settings_workflowMode' => '', 'settings_workflowMode_desc' => '', 'settings_workflowMode_valadvanced' => '先進...', +'settings_workflowMode_valnone' => '', 'settings_workflowMode_valtraditional' => '傳統', 'settings_workflowMode_valtraditional_only_approval' => '', 'settings_zendframework' => '', @@ -1394,6 +1399,7 @@ URL: [url]', 'sign_in' => '', 'sign_out' => '登出', 'sign_out_user' => '', +'site_brand' => '', 'sk_SK' => '斯洛伐克語', 'sort_by_date' => '', 'sort_by_name' => '', @@ -1518,9 +1524,13 @@ URL: [url]', 'switched_to' => '', 'takeOverAttributeValue' => '', 'takeOverGrpApprover' => '', +'takeOverGrpApprovers' => '', 'takeOverGrpReviewer' => '', +'takeOverGrpReviewers' => '', 'takeOverIndApprover' => '', +'takeOverIndApprovers' => '', 'takeOverIndReviewer' => '從上個版本接管個別審稿人', +'takeOverIndReviewers' => '', 'tasks' => '', 'task_description' => '', 'task_disabled' => '', @@ -1559,7 +1569,7 @@ URL: [url]', 'toggle_qrcode' => '', 'to_before_from' => '', 'transfer_content' => '', -'transfer_document' => '', +'transfer_document' => '傳送檔案', 'transfer_no_read_access' => '', 'transfer_no_write_access' => '', 'transfer_objects' => '', From efec0c36bf98193a75cc5f7e1078f5faa28aa923 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 12:19:16 +0100 Subject: [PATCH 382/467] add method getWrongFiletypeDocumentContent() --- SeedDMS_Core/Core/inc.ClassDMS.php | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 58720b1a7..ed6e10995 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -3567,6 +3567,46 @@ class SeedDMS_Core_DMS { } /* }}} */ + /** + * Returns document content which has the incorrect file type + * + * This method is for finding document content with an incorrect + * or missing file type. It just checks documents contents + * with a certain mime type. + * @return bool|SeedDMS_Core_Document[] + */ + function getWrongFiletypeDocumentContent() { /* {{{ */ + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `mimeType` in ('application/pdf', 'image/png', 'image/gif', 'image/jpg')"; + $resArr = $this->db->getResultArray($queryStr); + if ($resArr === false) + return false; + + /** @var SeedDMS_Core_Document[] $versions */ + $versions = array(); + foreach($resArr as $row) { + $expect = ''; + switch($row['mimeType']) { + case "application/pdf": + case "image/png": + case "image/gif": + case "image/jpg": + $expect = substr($row['mimeType'], -3, 3); + break; + } + if($expect) { + if($row['fileType'] != '.'.$expect) { + /** @var SeedDMS_Core_Document $document */ + $document = new $this->classnames['document']($row['document'], '', '', '', '', '', '', '', '', '', '', ''); + $document->setDMS($this); + $version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']); + $versions[] = $version; + } + } + } + return $versions; + + } /* }}} */ + /** * Returns document content which is duplicated * From 9b2482759897d6bfe6ebbb7aebd9c7b90e14e751 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 12:19:43 +0100 Subject: [PATCH 383/467] add new method setFileType() --- SeedDMS_Core/Core/inc.ClassDocument.php | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 56b2c86bc..513c4af71 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -3491,6 +3491,40 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return true; } /* }}} */ + /** + * Set file type by evaluating the mime type + */ + function setFileType() { /* {{{ */ + $mimetype = $this->getMimeType(); + + switch($this->_mimeType) { + case "application/pdf": + case "image/png": + case "image/gif": + case "image/jpg": + $expect = substr($this->_mimeType, -3, 3); + break; + } + if($expect && '.'.$expect != $this->_fileType) { + $db = $this->_document->getDMS()->getDB(); + $db->startTransaction(); + $queryStr = "UPDATE `tblDocumentContent` SET `fileType`='.".$expect."' WHERE `id` = ". $this->_id; + $res = $db->getResult($queryStr); + if ($res) { + if(!SeedDMS_Core_File::renameFile($this->_dms->contentDir.$this->_document->getDir() . $this->_version . $this->_fileType, $this->_dms->contentDir.$this->_document->getDir() . $this->_version . '.' . $expect)) { + $db->rollbackTransaction(); + } else { + $db->commitTransaction(); + return true; + } + } else { + $db->rollbackTransaction(); + } + } + + return false; + } /* }}} */ + function setComment($newComment) { /* {{{ */ $db = $this->_document->getDMS()->getDB(); From 450bdc0b7f4ba64bd0b93c0b13e000ecc6a1f575 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 12:20:16 +0100 Subject: [PATCH 384/467] add check for wrong file type, fix repairing of checksum and filesize --- out/out.ObjectCheck.php | 12 ++++ views/bootstrap/class.ObjectCheck.php | 98 +++++++++++++++++++++------ 2 files changed, 91 insertions(+), 19 deletions(-) diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index 4fb1235b9..2d69e2b6a 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -66,6 +66,12 @@ if(isset($_GET['setchecksum']) && $_GET['setchecksum'] == 1) { $setchecksum = 0; } +if(isset($_GET['setfiletype']) && $_GET['setfiletype'] == 1) { + $setfiletype = 1; +} else { + $setfiletype = 0; +} + $folder = $dms->getFolder($settings->_rootFolderID); $unlinkedversions = $dms->getUnlinkedDocumentContent(); if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedFolders') @@ -84,6 +90,10 @@ if(!isset($_GET['action']) || $_GET['action'] == 'listMissingChecksum') $nochecksumversions = $dms->getNoChecksumDocumentContent(); else $nochecksumversions = null; +if(!isset($_GET['action']) || $_GET['action'] == 'listWrongFiletype') + $wrongfiletypeversions = $dms->getWrongFiletypeDocumentContent(); +else + $wrongfiletypeversions = null; if(!isset($_GET['action']) || $_GET['action'] == 'listDuplicateContent') $duplicateversions = $dms->getDuplicateDocumentContent(); else @@ -215,6 +225,7 @@ if($view) { $view->setParam('unlinkeddocuments', $unlinkeddocuments); $view->setParam('nofilesizeversions', $nofilesizeversions); $view->setParam('nochecksumversions', $nochecksumversions); + $view->setParam('wrongfiletypeversions', $wrongfiletypeversions); $view->setParam('duplicateversions', $duplicateversions); $view->setParam('docsinrevision', $docsinrevision); $view->setParam('docsinreception', $docsinreception); @@ -222,6 +233,7 @@ if($view) { $view->setParam('unlink', $unlink); $view->setParam('setfilesize', $setfilesize); $view->setParam('setchecksum', $setchecksum); + $view->setParam('setfiletype', $setfiletype); $view->setParam('repair', $repair); $view->setParam('showtree', showtree()); $view->setParam('rootfolder', $rootfolder); diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index 53c637779..89271526f 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -152,7 +152,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $this->contentHeading(getMLText("unlinked_documents")); if($unlinkeddocuments) { - print ""; + print "
          "; print "\n\n"; print "\n"; print "\n"; @@ -186,7 +186,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { } if($unlinkedcontent) { - print "
          ".getMLText("name")."".getMLText("id")."
          "; + print "
          "; print "\n\n"; print "\n"; print "\n"; @@ -215,11 +215,11 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $folder = $this->params['folder']; $nofilesizeversions = $this->params['nofilesizeversions']; - $setfilesize = $this->params['setfilesize']; + $repair = $this->params['repair']; $this->contentHeading(getMLText("missing_filesize")); if($nofilesizeversions) { - print "
          ".getMLText("document")."".getMLText("version")."
          "; + print "
          "; print "\n\n"; print "\n"; print "\n"; @@ -229,18 +229,25 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { print "\n\n\n"; foreach($nofilesizeversions as $version) { $doc = $version->getDocument(); - print ""; - echo ""; + echo ""; print "\n"; } print "
          ".getMLText("document")."".getMLText("version")."
          ".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType().""; - if($setfilesize) { - if($version->setFileSize()) - echo getMLText('repaired'); + $class = $msg = ''; + if($repair) { + if($version->setFileSize()) { + $msg = getMLText('repaired'); + $class = ' class="success"'; + } else { + $msg = getMLText('not_repaired'); + $class = ' class="error"'; + } } + print "".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType().""; + echo $msg; echo "
          \n"; - if($setfilesize == 0) { - echo '

          '.getMLText('do_object_setfilesize').'

          '; + if($repair == 0) { + echo '
          '.getMLText('do_object_setfilesize').'
          '; } } @@ -251,11 +258,12 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $folder = $this->params['folder']; $nochecksumversions = $this->params['nochecksumversions']; + $repair = $this->params['repair']; $this->contentHeading(getMLText("missing_checksum")); if($nochecksumversions) { - print ""; + print "
          "; print "\n\n"; print "\n"; print "\n"; @@ -265,18 +273,69 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { print "\n\n\n"; foreach($nochecksumversions as $version) { $doc = $version->getDocument(); - print ""; - echo ""; + echo ""; print "\n"; } print "
          ".getMLText("document")."".getMLText("version")."
          ".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType().""; - if($setchecksum) { - if($version->setChecksum()) - echo getMLText('repaired'); + $class = $msg = ''; + if($repair) { + if($version->setChecksum()) { + $msg = getMLText('repaired'); + $class = ' class="success"'; + } else { + $msg = getMLText('not_repaired'); + $class = ' class="error"'; + } } + print "".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType().""; + echo $msg; echo "
          \n"; - if($setchecksum == 0) { - echo '

          '.getMLText('do_object_setchecksum').'

          '; + if($repair == 0) { + echo '
          '.getMLText('do_object_setchecksum').'
          '; + } + } + } /* }}} */ + + function listWrongFiletype() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $wrongfiletypeversions = $this->params['wrongfiletypeversions']; + $repair = $this->params['repair']; + + $this->contentHeading(getMLText("wrong_filetype")); + + if($wrongfiletypeversions) { + print ""; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n\n\n"; + foreach($wrongfiletypeversions as $version) { + $doc = $version->getDocument(); + $class = $msg = ''; + if($repair) { + if($version->setFiletype()) { + $msg = getMLText('repaired'); + $class = ' class="success"'; + } else { + $msg = getMLText('not_repaired'); + $class = ' class="error"'; + } + } + print ""; + echo ""; + print "\n"; + } + print "
          ".getMLText("document")."".getMLText("version")."".getMLText("original_filename")."".getMLText("mimetype")."".getMLText("filetype")."
          ".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType()."".$version->getFileType().""; + echo $msg; + echo "
          \n"; + if($repair == 0) { + echo '
          '.getMLText('do_object_setfiletype').'
          '; } } } /* }}} */ @@ -504,6 +563,7 @@ $(document).ready( function() { echo '
        • '.count($unlinkedcontent).''.getMLText("unlinked_content").'
          • '; echo '
        • '.count($nofilesizeversions).''.getMLText("missing_filesize").'
          • '; echo '
        • '.count($nochecksumversions).''.getMLText("missing_checksum").'
          • '; + echo '
        • '.count($wrongfiletypeversions).''.getMLText("wrong_filetype").'
          • '; echo '
        '; $this->contentHeading(getMLText("object_check_warning")); echo '
          '; From bfc31fdb7d91d7987fc5afb59f4f5b85c2e12d24 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 12:38:16 +0100 Subject: [PATCH 385/467] minor updates --- languages/ar_EG/lang.inc | 4 ++++ languages/bg_BG/lang.inc | 4 ++++ languages/ca_ES/lang.inc | 4 ++++ languages/cs_CZ/lang.inc | 4 ++++ languages/de_DE/lang.inc | 6 +++++- languages/el_GR/lang.inc | 4 ++++ languages/en_GB/lang.inc | 6 +++++- languages/es_ES/lang.inc | 4 ++++ languages/fr_FR/lang.inc | 4 ++++ languages/hr_HR/lang.inc | 4 ++++ languages/hu_HU/lang.inc | 4 ++++ languages/it_IT/lang.inc | 4 ++++ languages/ko_KR/lang.inc | 4 ++++ languages/lo_LA/lang.inc | 4 ++++ languages/nl_NL/lang.inc | 4 ++++ languages/pl_PL/lang.inc | 4 ++++ languages/pt_BR/lang.inc | 4 ++++ languages/ro_RO/lang.inc | 4 ++++ languages/ru_RU/lang.inc | 4 ++++ languages/sk_SK/lang.inc | 4 ++++ languages/sv_SE/lang.inc | 4 ++++ languages/tr_TR/lang.inc | 4 ++++ languages/uk_UA/lang.inc | 4 ++++ languages/zh_CN/lang.inc | 4 ++++ languages/zh_TW/lang.inc | 4 ++++ 25 files changed, 102 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 48d54b046..de1c4cb1d 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -420,6 +420,7 @@ URL: [url]', 'do_object_repair' => 'إصلاح كل المستندات والمجلدات.', 'do_object_setchecksum' => 'تحديد فحص اخطاء', 'do_object_setfilesize' => 'تحديد حجم الملف', +'do_object_setfiletype' => '', 'do_object_unlink' => 'مسح اصدار مستند', 'draft' => 'مسودة', 'draft_pending_approval' => 'مسودة - قيد الموافقة', @@ -532,6 +533,7 @@ URL: [url]', 'files_deletion' => 'مسح الملف', 'files_deletion_warning' => 'من خلال تلك الخاصية يمكنك مسح كل الملفات على مجلدات النظام. ملفات معلومات الاصدارات فقط ستظل متاحة للرؤية.', 'files_loading' => 'تحميل الملفات', +'filetype' => '', 'file_size' => 'حجم الملف', 'filter_for_documents' => 'فلتر للمستندات', 'filter_for_folders' => 'فلتر للملفات', @@ -1707,6 +1709,7 @@ URL: [url]', 'transfer_no_write_access' => 'تحويل بلا دخول للكتابة', 'transfer_objects' => 'تحويل أشياء', 'transfer_objects_to_user' => 'تحويل شيء إلى مستخدم', +'transfer_process_to_user' => '', 'transfer_to_user' => 'تحويل إلى مستخدم', 'transition_triggered_email' => 'تم تحريك انتقال مسار العمل', 'transition_triggered_email_body' => 'تم تحريك انتقال مسار العمل @@ -1831,6 +1834,7 @@ URL: [url]', 'workflow_summary' => 'ملخص مسار العمل', 'workflow_transition_without_user_group' => 'تحويل سير العمل بدون استخدام مستخدم من المجموعة', 'workflow_user_summary' => 'ملخص المستخدم', +'wrong_filetype' => '', 'x_more_objects' => 'اشياء أكثر', 'year_view' => 'عرض السنة', 'yes' => 'نعم', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 6e52f26aa..46428ca6b 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -373,6 +373,7 @@ $text = array( 'do_object_repair' => 'Поправи всички папки и документи', 'do_object_setchecksum' => 'Установи контролна сума', 'do_object_setfilesize' => 'Установи размер на файла', +'do_object_setfiletype' => '', 'do_object_unlink' => '', 'draft' => '', 'draft_pending_approval' => 'Чернова - очаква утвърждаване', @@ -481,6 +482,7 @@ $text = array( 'files_deletion' => 'Изтриване на файлове', 'files_deletion_warning' => 'Тази операция ще изтрие всички файлове във всички папки. Информацията за версиите ще остане достъпна', 'files_loading' => 'Моля изчакайте докато се зареди списъкът на файловете', +'filetype' => '', 'file_size' => 'Размер', 'filter_for_documents' => '', 'filter_for_folders' => '', @@ -1570,6 +1572,7 @@ $text = array( 'transfer_no_write_access' => '', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => '', 'transition_triggered_email' => 'Забелязана промяна на процес', 'transition_triggered_email_body' => '', @@ -1680,6 +1683,7 @@ $text = array( 'workflow_summary' => 'Резюме за процес', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Резюме за потребител', +'wrong_filetype' => '', 'x_more_objects' => 'още [number] документа', 'year_view' => 'годишен изглед', 'yes' => 'Да', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 768c872ee..a2c556bff 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -378,6 +378,7 @@ URL: [url]', 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '', +'do_object_setfiletype' => '', 'do_object_unlink' => '', 'draft' => '', 'draft_pending_approval' => 'Esborrany - pendent d\'aprovació', @@ -486,6 +487,7 @@ URL: [url]', 'files_deletion' => 'Eliminació de fitxers', 'files_deletion_warning' => 'Amb aquesta opció es poden eliminar tots els fitxers del DMS complet. La informació de versionat romandrà visible.', 'files_loading' => 'Esperi, fins que l\'arxiu estigui carregat …', +'filetype' => '', 'file_size' => 'Mida', 'filter_for_documents' => '', 'filter_for_folders' => 'Filtre adicional per les carpetes', @@ -1575,6 +1577,7 @@ URL: [url]', 'transfer_no_write_access' => 'transferir sense poder escriure', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => '', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', @@ -1685,6 +1688,7 @@ URL: [url]', 'workflow_summary' => '', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => '', +'wrong_filetype' => '', 'x_more_objects' => '[number] objectes més', 'year_view' => 'Vista d\'any', 'yes' => 'Sí', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 080990069..9221f94cb 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -451,6 +451,7 @@ Odkaz je platný do [valid]. 'do_object_repair' => 'Opravit všechny složky a dokumenty.', 'do_object_setchecksum' => 'Nastavit kontrolní součet', 'do_object_setfilesize' => 'Nastavit velikost souboru', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Smazat verzi dokumentu', 'draft' => 'Návrh', 'draft_pending_approval' => 'Návrh - čeká na schválení', @@ -563,6 +564,7 @@ URL: [url]', 'files_deletion' => 'Soubor odstraněn', 'files_deletion_warning' => 'Pomocí této volby můžete odstranit všechny soubory z celé složky DMS. Verzovací informace zůstanou viditelné.', 'files_loading' => 'Vyčkejte dokud se nenahraje seznam souborů …', +'filetype' => '', 'file_size' => 'Velikost souboru', 'filter_for_documents' => 'Další filtr pro dokumenty', 'filter_for_folders' => 'Další filtr pro složky', @@ -1786,6 +1788,7 @@ Jméno: [username] 'transfer_no_write_access' => 'Uživatel nemá přístup k zápisu do složky', 'transfer_objects' => 'Přenos objektů', 'transfer_objects_to_user' => 'Nový vlastník', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Přenos k uživateli', 'transition_triggered_email' => 'Spuštěn přechod workflow', 'transition_triggered_email_body' => 'Spuštěn přechod workflow @@ -1910,6 +1913,7 @@ URL: [url]', 'workflow_summary' => 'Souhrn workflow', 'workflow_transition_without_user_group' => 'Alespoň jedna z transformací pracovního postupu nemá uživatele ani skupinu!', 'workflow_user_summary' => 'Přehled uživatelů', +'wrong_filetype' => '', 'x_more_objects' => 'Načíst další dokumenty ([number])', 'year_view' => 'Zobrazení roku', 'yes' => 'Ano', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 2f7f60151..ca05ec221 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2735), dgrutsch (22) +// Translators: Admin (2739), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -450,6 +450,7 @@ Der Link ist bis zum [valid] gültig. 'do_object_repair' => 'Repariere alle Ordner und Dokumente.', 'do_object_setchecksum' => 'Setze Check-Summe', 'do_object_setfilesize' => 'Setze Dateigröße', +'do_object_setfiletype' => 'Setze Dateityp', 'do_object_unlink' => 'Lösche Dokumentenversion', 'draft' => 'Entwurf', 'draft_pending_approval' => 'Entwurf - bevorstehende Freigabe', @@ -562,6 +563,7 @@ URL: [url]', 'files_deletion' => 'Dateien löschen', 'files_deletion_warning' => 'Durch diese Operation können Sie Dokumente des DMS löschen. Die Versions-Information bleibt erhalten.', 'files_loading' => 'Bitte warten, bis die Dateiliste geladen ist …', +'filetype' => 'Dateityp', 'file_size' => 'Dateigröße', 'filter_for_documents' => 'Zusätzliche Filter für Dokumente', 'filter_for_folders' => 'Zusätzliche Filter für Ordner', @@ -1796,6 +1798,7 @@ Name: [username] 'transfer_no_write_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte', 'transfer_objects' => 'Objekte übertragen', 'transfer_objects_to_user' => 'Neuer Eigentümer', +'transfer_process_to_user' => 'Prozess auf Benutzer übertragen', 'transfer_to_user' => 'Auf Benutzer übertragen', 'transition_triggered_email' => 'Workflow transition triggered', 'transition_triggered_email_body' => 'Workflow transition triggered @@ -1920,6 +1923,7 @@ URL: [url]', 'workflow_summary' => 'Übersicht Workflows', 'workflow_transition_without_user_group' => 'Mindestens eine Transition hat weder einen Benutzer noch eine Gruppe zugewiesen!', 'workflow_user_summary' => 'Übersicht Benutzer', +'wrong_filetype' => 'Falscher Dateityp', 'x_more_objects' => '[number] weitere Objekte', 'year_view' => 'Jahresansicht', 'yes' => 'Ja', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 0a98fa212..d2ac7cd16 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -373,6 +373,7 @@ $text = array( 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '', +'do_object_setfiletype' => '', 'do_object_unlink' => '', 'draft' => '', 'draft_pending_approval' => '', @@ -481,6 +482,7 @@ $text = array( 'files_deletion' => 'Διαγραφή αρχείων', 'files_deletion_warning' => '', 'files_loading' => 'Παρακαλώ περιμένετε, μέχρι να φορτωθεί το αρχείο', +'filetype' => '', 'file_size' => 'Μέγεθος αρχείου', 'filter_for_documents' => '', 'filter_for_folders' => '', @@ -1581,6 +1583,7 @@ URL: [url]', 'transfer_no_write_access' => '', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => '', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', @@ -1691,6 +1694,7 @@ URL: [url]', 'workflow_summary' => '', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => '', +'wrong_filetype' => '', 'x_more_objects' => '', 'year_view' => '', 'yes' => 'Ναι', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 800fe6daa..1a45b174a 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1830), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1834), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -451,6 +451,7 @@ The link is valid until [valid]. 'do_object_repair' => 'Repair all folders and documents.', 'do_object_setchecksum' => 'Set checksum', 'do_object_setfilesize' => 'Set file size', +'do_object_setfiletype' => 'Set file type', 'do_object_unlink' => 'Delete document version', 'draft' => 'Draft', 'draft_pending_approval' => 'Draft - pending approval', @@ -563,6 +564,7 @@ URL: [url]', 'files_deletion' => 'Files deletion', 'files_deletion_warning' => 'With this option you can delete all files of entire DMS folders. The versioning information will remain visible.', 'files_loading' => 'Please wait, until file list is loaded …', +'filetype' => 'File type', 'file_size' => 'Filesize', 'filter_for_documents' => 'Additional filter for documents', 'filter_for_folders' => 'Additional filter for folders', @@ -1791,6 +1793,7 @@ Name: [username] 'transfer_no_write_access' => 'The user does not have write access in the folder', 'transfer_objects' => 'Transfer objects', 'transfer_objects_to_user' => 'New owner', +'transfer_process_to_user' => 'Transfer process to user', 'transfer_to_user' => 'Transfer to user', 'transition_triggered_email' => 'Workflow transition triggered', 'transition_triggered_email_body' => 'Workflow transition triggered @@ -1915,6 +1918,7 @@ URL: [url]', 'workflow_summary' => 'Workflow summary', 'workflow_transition_without_user_group' => 'At least one of the transitions has neither a user nor a group!', 'workflow_user_summary' => 'User summary', +'wrong_filetype' => 'Wrong file type', 'x_more_objects' => '[number] more objects', 'year_view' => 'Year View', 'yes' => 'Yes', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index c5e1df873..14185edf1 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -427,6 +427,7 @@ URL: [url]', 'do_object_repair' => 'Reparar todas las carpetas y documentos.', 'do_object_setchecksum' => 'Set checksum', 'do_object_setfilesize' => 'Asignar tamaño de fichero', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Borrar versión del documento', 'draft' => '', 'draft_pending_approval' => 'Borador - pendiente de aprobación', @@ -539,6 +540,7 @@ URL: [url]', 'files_deletion' => 'Eliminación de ficheros', 'files_deletion_warning' => 'Con esta opción se puede eliminar todos los ficheros del DMS completo. La información de versionado permanecerá visible.', 'files_loading' => 'Por favor espere, mientras la lista de archivos es cargada', +'filetype' => '', 'file_size' => 'Tamaño', 'filter_for_documents' => 'Filtro adicional para documentos', 'filter_for_folders' => 'Filtro adicional para carpetas', @@ -1722,6 +1724,7 @@ URL: [url]', 'transfer_no_write_access' => 'El usuario no tiene acceso de escritura en la carpeta', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Transferir al usuario', 'transition_triggered_email' => 'Workflow transition triggered', 'transition_triggered_email_body' => 'Workflow transition triggered @@ -1846,6 +1849,7 @@ URL: [url]', 'workflow_summary' => 'Resumen Flujo de Trabajo', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Resumen Usuario', +'wrong_filetype' => '', 'x_more_objects' => '[number] más objetos', 'year_view' => 'Vista del año', 'yes' => 'Sí', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 0d27a2fc3..0a9ca669d 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -451,6 +451,7 @@ Le lien est valide jusqu’au [valid]. 'do_object_repair' => 'Réparer tous les dossiers et documents.', 'do_object_setchecksum' => 'Définir checksum', 'do_object_setfilesize' => 'Définir la taille du fichier', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Supprimer la version du document', 'draft' => 'Ébauche', 'draft_pending_approval' => 'Ébauche - en attente d’approbation', @@ -563,6 +564,7 @@ URL : [url]', 'files_deletion' => 'Suppression de fichiers', 'files_deletion_warning' => 'Avec cette option, vous pouvez supprimer tous les fichiers d\'un dossier DMS. Les informations de version resteront visibles.', 'files_loading' => 'Patientez pendant le chargement de la liste des fichiers', +'filetype' => '', 'file_size' => 'Taille', 'filter_for_documents' => 'Filtre additionnel pour les documents', 'filter_for_folders' => 'Filtre additionnel pour les dossiers', @@ -1775,6 +1777,7 @@ Nom : [username] 'transfer_no_write_access' => 'L’utilisateur n’a pas le droit d’écriture dans ce dossier', 'transfer_objects' => 'Transférer les objets', 'transfer_objects_to_user' => 'Nouveau propriétaire', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Transférer à l’utilisateur', 'transition_triggered_email' => 'Transition de workflow activé', 'transition_triggered_email_body' => 'Transition de workflow déclenchée @@ -1899,6 +1902,7 @@ URL: [url]', 'workflow_summary' => 'Récapitulatif workflow', 'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !', 'workflow_user_summary' => 'Récapitulatif utilisateur', +'wrong_filetype' => '', 'x_more_objects' => '[number] objets supplémentaires', 'year_view' => 'Vue annuelle', 'yes' => 'Oui', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 7df14ae1a..3cdd6c532 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -432,6 +432,7 @@ Internet poveznica: [url]', 'do_object_repair' => 'Popravi sve mape i dokumente.', 'do_object_setchecksum' => 'Postavi kontrolnu sumu', 'do_object_setfilesize' => 'Postavi veličinu datoteke', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Izbriši verziju dokumenta', 'draft' => 'Nacrt', 'draft_pending_approval' => 'Skica - čeka odobrenje', @@ -544,6 +545,7 @@ Internet poveznica: [url]', 'files_deletion' => 'Brisanje datoteke', 'files_deletion_warning' => 'Ovom opcijom možete izbrisati sve datoteke ili cjelokupne DMS mape. Informacije o verzijama će ostati vidljive.', 'files_loading' => 'Molimo pričekati dok se ne učita lista datoteka...', +'filetype' => '', 'file_size' => 'Veličina datoteke', 'filter_for_documents' => 'Dodatni filter za dokumente', 'filter_for_folders' => 'Dodatni filter za dokumente', @@ -1743,6 +1745,7 @@ Internet poveznica: [url]', 'transfer_no_write_access' => 'Korisnik nema pravo pisanja u ovom folderu', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Prijenos korisniku', 'transition_triggered_email' => 'Zatražena promjena toka rada', 'transition_triggered_email_body' => 'Zatražena promjena toka rada @@ -1867,6 +1870,7 @@ Internet poveznica: [url]', 'workflow_summary' => 'Pregled toka rada', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Pregled korisnika', +'wrong_filetype' => '', 'x_more_objects' => '[number] više objekata', 'year_view' => 'Pregled po godini', 'yes' => 'Da', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 76cd8dac8..aab00ffc9 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -427,6 +427,7 @@ URL: [url]', 'do_object_repair' => 'Valamennyi mappa és dokumentum helyreállítása.', 'do_object_setchecksum' => 'Ellenőrző összeg beállítása', 'do_object_setfilesize' => 'Állomány méret beállítása', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Dokumentum verzió törlése', 'draft' => 'piszkozat', 'draft_pending_approval' => 'Piszkozat - jóváhagyás folyamatban', @@ -539,6 +540,7 @@ URL: [url]', 'files_deletion' => 'Állományok törlése', 'files_deletion_warning' => 'Ezzel az opcióval törölheti az összes állományt valamennyi DMS mappában. A változási információk láthatók maradnak.', 'files_loading' => 'Kérem, várjon, amíg a fájl lista betöltődik ...', +'filetype' => '', 'file_size' => 'Állomány méret', 'filter_for_documents' => 'További dokumentum szűrők', 'filter_for_folders' => 'További mappa szűrők', @@ -1721,6 +1723,7 @@ URL: [url]', 'transfer_no_write_access' => '', 'transfer_objects' => 'Adatok átadása', 'transfer_objects_to_user' => 'Új tulajdonos', +'transfer_process_to_user' => '', 'transfer_to_user' => '', 'transition_triggered_email' => 'Munkamenet átmenet kiváltva', 'transition_triggered_email_body' => 'Munkafolyamat átmenet kiváltva @@ -1845,6 +1848,7 @@ URL: [url]', 'workflow_summary' => 'Munkafolyamat áttekintés', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Felhasználó áttekintés', +'wrong_filetype' => '', 'x_more_objects' => '', 'year_view' => 'Éves nézet', 'yes' => 'Igen', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index bd03282a9..5d1e58def 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -444,6 +444,7 @@ Il collegamento The link è ancora valido fino a [valid]. 'do_object_repair' => 'Ripara tutte le cartelle e i documenti.', 'do_object_setchecksum' => 'Imposta il checksum', 'do_object_setfilesize' => 'Imposta la dimensione del file', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Cancella la versione del documento', 'draft' => 'Bozza', 'draft_pending_approval' => 'Bozza - in approvazione', @@ -556,6 +557,7 @@ URL: [url]', 'files_deletion' => 'Cancellazione files', 'files_deletion_warning' => 'Con questa operazione è possible cancellare i file di intere cartelle. Dopo la cancellazione lo storico delle versioni rimarrà comunque disponibile.', 'files_loading' => 'Attendi che il file venga caricato per favore ...', +'filetype' => '', 'file_size' => 'Grandezza del file', 'filter_for_documents' => 'Filtro aggiuntivo per i documenti', 'filter_for_folders' => 'Filtro aggiuntivo per le cartelle', @@ -1777,6 +1779,7 @@ Name: [username] 'transfer_no_write_access' => 'L\'utente non ha i permessi in scrittura per la cartella', 'transfer_objects' => 'Trasferisci oggetti', 'transfer_objects_to_user' => 'Trasferisci all\'utente', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Trasferisci all\'utente', 'transition_triggered_email' => 'Inizio transizione del flusso di lavoro', 'transition_triggered_email_body' => 'Transizione del flusso di lavoro iniziata @@ -1901,6 +1904,7 @@ URL: [url]', 'workflow_summary' => 'Riepilogo flusso di lavoro', 'workflow_transition_without_user_group' => 'Almeno una delle transizioni non ha un utente o un gruppo!', 'workflow_user_summary' => 'Riepilogo utenti', +'wrong_filetype' => '', 'x_more_objects' => '[number] altri oggetti', 'year_view' => 'Vista anno', 'yes' => 'Sì', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 9fd264e16..88c4b0b7f 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -433,6 +433,7 @@ URL: [url]', 'do_object_repair' => '모든 폴더와 문서를 복구', 'do_object_setchecksum' => '오류 검사', 'do_object_setfilesize' => '파일 크기 설정', +'do_object_setfiletype' => '', 'do_object_unlink' => '문서 버전 삭제', 'draft' => '기본값', 'draft_pending_approval' => '초안 - 보류 승인', @@ -545,6 +546,7 @@ URL: [url]', 'files_deletion' => '파일 삭제', 'files_deletion_warning' => '이 옵션을 사용하면 전체 DMS 폴더의 모든 파일을 삭제할 수 있습니다. 버전 정보가 표시로 남을 것 입니다 files파일', 'files_loading' => '파일 목록을 가지고 오는 중 ...', +'filetype' => '', 'file_size' => '파일 크기', 'filter_for_documents' => '문서에 대한 추가 필터', 'filter_for_folders' => '폴더에 대한 추가 필터', @@ -1737,6 +1739,7 @@ URL : [url]', 'transfer_no_write_access' => '', 'transfer_objects' => '', 'transfer_objects_to_user' => '새 소유자', +'transfer_process_to_user' => '', 'transfer_to_user' => '', 'transition_triggered_email' => '워크플로우 전환 트리거', 'transition_triggered_email_body' => '워크플로우 전환 트리거 @@ -1861,6 +1864,7 @@ URL : [url]', 'workflow_summary' => '워크플로우 요약', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => '사용자 요약', +'wrong_filetype' => '', 'x_more_objects' => '', 'year_view' => '연간 단위로 보기', 'yes' => '예', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index a221e6682..e5d71b9d7 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -437,6 +437,7 @@ URL: [url]', 'do_object_repair' => 'ສ້ອມແຊມໂຟລເດີ ແລະເອກະສານທັງໝົດ', 'do_object_setchecksum' => 'ຕັ້ງຄ່າການກວດສອບ', 'do_object_setfilesize' => 'ຕັ້ງຂະໜາດຟາຍ', +'do_object_setfiletype' => '', 'do_object_unlink' => 'ລົບເວີຊັນຂອງເອກະສານ', 'draft' => 'ຮ່າງ', 'draft_pending_approval' => 'ຮ່າງ-ລໍຖ້າການອະນຸມັດ', @@ -549,6 +550,7 @@ URL: [url]', 'files_deletion' => 'ລົບໄຟລ', 'files_deletion_warning' => 'ດ້ວຍຕົວເລືອກນີ້ເຈົ້ສາມາດລົບໄຟລທັງໝົດຂອງ DMS ໂຟລເດີທັງໝົດ ຂໍ້ມູນການກຳນົດລຸ້ນຈະຍັງຄົງປາກົດຢູ່', 'files_loading' => 'ກະລຸນາລໍຖ້າ, ຈົນກວ່າລາຍການໄຟລຈະຖືກໂຫລດ …', +'filetype' => '', 'file_size' => 'ຂະໜາດ', 'filter_for_documents' => 'ຕົວກອງເພີ່ມເຕົມສຳລັບເອກະສານ', 'filter_for_folders' => 'ຕົວກອງເພີ່ມເຕີມສຳລັບໂຟລເດີ', @@ -1770,6 +1772,7 @@ URL: [url]', 'transfer_no_write_access' => '', 'transfer_objects' => 'ຖ່າຍໂອນວັດຖຸ', 'transfer_objects_to_user' => 'ເຈົ້າຂອງໄຫມ່', +'transfer_process_to_user' => '', 'transfer_to_user' => '', 'transition_triggered_email' => 'ປ່ຽນຮູບແບບການເຮັດວຽກຮຽບຮ້ອຍແລ້ວ', 'transition_triggered_email_body' => 'ໄດ້ປ່ຽນການເຮັດວຽກຂອງເວີກໂຟລ @@ -1894,6 +1897,7 @@ URL: [url]', 'workflow_summary' => 'ສະຫຼຸບການເຮັດວຽກ', 'workflow_transition_without_user_group' => 'ການປ່ຽນພາບຢ່າງນ້ອຍໜື່ງຄັ້ງບໍ່ມີທັງຜູ້ໄຊ້ແລະກຸ່ມ', 'workflow_user_summary' => 'ສະຫລູບຂໍ້ມູນຂອງຜູ້ໄຊ້', +'wrong_filetype' => '', 'x_more_objects' => '', 'year_view' => 'ແຜນປະຈຳປີ', 'yes' => 'ແມ່ນ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index d347f9f6e..1fe6bef8f 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -432,6 +432,7 @@ De link is geldig tot [valid]. 'do_object_repair' => 'Repareer alle mappen en documenten.', 'do_object_setchecksum' => 'Set checksum', 'do_object_setfilesize' => 'Voer bestandgrootte in', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Verwijdere documentversie', 'draft' => 'Concept', 'draft_pending_approval' => 'Draft - in afwachting van goedkeuring', @@ -544,6 +545,7 @@ URL: [url]', 'files_deletion' => 'Bestanden verwijderen', 'files_deletion_warning' => 'Met deze handeling verwijdert U ALLE bestanden uit het DMS. Versie informatie blijft beschikbaar', 'files_loading' => 'Even geduld. De lijst met bestanden wordt geladen ...', +'filetype' => '', 'file_size' => 'Bestandsomvang', 'filter_for_documents' => 'Extra filter voor documenten', 'filter_for_folders' => 'Extra filter voor mappen', @@ -1767,6 +1769,7 @@ Name: [username] 'transfer_no_write_access' => 'De gebruiker heeft geen schrijfrechten in deze map', 'transfer_objects' => 'Objecten overdragen', 'transfer_objects_to_user' => 'Objecten overdragen aan gebruiker', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Overdragen aan gebruiker', 'transition_triggered_email' => 'Workflow-overgang geactiveerd', 'transition_triggered_email_body' => 'Workflow Overgang @@ -1891,6 +1894,7 @@ URL: [url]', 'workflow_summary' => 'Workflow samenvatting', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Gebruiker samenvatting', +'wrong_filetype' => '', 'x_more_objects' => 'meer items', 'year_view' => 'Jaar Overzicht', 'yes' => 'Ja', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 9ee4f19af..b74b1dd77 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -420,6 +420,7 @@ URL: [url]', 'do_object_repair' => 'Napraw wszystkie katalogi i pliki.', 'do_object_setchecksum' => 'Ustaw sumę kontrolną', 'do_object_setfilesize' => 'Podaj rozmiar pliku', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Usuń wersję dokumentu', 'draft' => '', 'draft_pending_approval' => 'Szkic - w oczekiwaniu na akceptację', @@ -532,6 +533,7 @@ URL: [url]', 'files_deletion' => 'Usuwanie plików', 'files_deletion_warning' => 'Ta operacja pozwala usunąć wszystkie pliki z repozytorium. Informacje o wersjonowaniu pozostaną widoczne.', 'files_loading' => 'Proszę czekać do załadowania lista plików…', +'filetype' => '', 'file_size' => 'Rozmiar pliku', 'filter_for_documents' => 'Dodatkowe filtrowanie dla dokumentów', 'filter_for_folders' => 'Dodatkowe filtrowanie dla folderów', @@ -1701,6 +1703,7 @@ URL: [url]', 'transfer_no_write_access' => 'Użytkownik nie ma prawa do zapisu w tym folderze', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Przekaż użytkownikowi', 'transition_triggered_email' => 'Uruchomiono proces przepływu', 'transition_triggered_email_body' => 'Uruchomiono proces przepływu @@ -1825,6 +1828,7 @@ URL: [url]', 'workflow_summary' => 'Podsumowanie procesu', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Podsumowanie użytkownika', +'wrong_filetype' => '', 'x_more_objects' => '[number] więcej obiektów', 'year_view' => 'Widok roczny', 'yes' => 'Tak', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 42934534f..426f5fdd1 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -451,6 +451,7 @@ O link é válido até [valid]. 'do_object_repair' => 'Reparar todas as pastas e documentos.', 'do_object_setchecksum' => 'Defina soma de verificação', 'do_object_setfilesize' => 'Defina o tamanho do arquivo', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Excluir versão do documento', 'draft' => 'Rascunho', 'draft_pending_approval' => 'Rascunho - Aprovação pendente', @@ -563,6 +564,7 @@ URL: [url]', 'files_deletion' => 'Arquivos deletados', 'files_deletion_warning' => 'Com essa opção, você pode excluir todos os arquivos de pastas inteiras do DMS. As informações de versão permanecerão visíveis.', 'files_loading' => 'Pro favor aguarde ate a lista de ficheiros é carregado...', +'filetype' => '', 'file_size' => 'Tamanho', 'filter_for_documents' => 'Filtro adicional para documentos', 'filter_for_folders' => 'Filtro adicional para pasta', @@ -1789,6 +1791,7 @@ Nome: [username] 'transfer_no_write_access' => 'O usuário não possui acesso de escrita na pasta', 'transfer_objects' => 'Transferir objetos', 'transfer_objects_to_user' => 'Novo proprietário', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Transferir para o usuário', 'transition_triggered_email' => 'Transição de fluxo de trabalho desencadeado', 'transition_triggered_email_body' => 'Transição do fluxo de trabalho acionada @@ -1913,6 +1916,7 @@ URL: [url]', 'workflow_summary' => 'Sumário de fluxo de trabalho', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Sumário de usuário', +'wrong_filetype' => '', 'x_more_objects' => 'mais itens', 'year_view' => 'Visualização Anual', 'yes' => 'Sim', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 71bc8d059..8218d8285 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -432,6 +432,7 @@ URL: [url]', 'do_object_repair' => 'Repară toate folderele și documentele.', 'do_object_setchecksum' => 'Setare sumă de control(checksum)', 'do_object_setfilesize' => 'Setare dimensiune fișier', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Sterge versiune document', 'draft' => '', 'draft_pending_approval' => 'Proiect - în așteptarea aprobarii', @@ -544,6 +545,7 @@ URL: [url]', 'files_deletion' => 'Ștergere fișiere', 'files_deletion_warning' => 'Cu această opțiune puteți șterge toate fișierele din toate folderele DMS. Informațiile versiunilor vor rămâne vizibile.', 'files_loading' => 'Vă rog așteptați până la încărcarea listei cu fișiere', +'filetype' => '', 'file_size' => 'Mărimea fișierului', 'filter_for_documents' => 'Filtru suplimentar pentru documente', 'filter_for_folders' => 'Filtru suplimentar pentru foldere', @@ -1744,6 +1746,7 @@ URL: [url]', 'transfer_no_write_access' => 'Utilizatorul nu are drepturi de scriere pe acest dosar', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Trabsferare catre alt utilizator', 'transition_triggered_email' => 'Tranziție Workflow declanșată', 'transition_triggered_email_body' => 'Tranziție Workflow declanșată @@ -1868,6 +1871,7 @@ URL: [url]', 'workflow_summary' => 'Sumar Workflow', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Sumar Utilizator', +'wrong_filetype' => '', 'x_more_objects' => 'Mai multe', 'year_view' => 'Vizualizare an', 'yes' => 'Da', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 90054b316..97c152776 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -432,6 +432,7 @@ URL: [url]', 'do_object_repair' => 'Исправить все каталоги и документы', 'do_object_setchecksum' => 'Установить контрольную сумму', 'do_object_setfilesize' => 'Установить размер файла', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Удалить версию документа', 'draft' => 'Черновик', 'draft_pending_approval' => 'Черновик — ожидает утверждения', @@ -544,6 +545,7 @@ URL: [url]', 'files_deletion' => 'Удалить файлы', 'files_deletion_warning' => 'Эта операция удалит все файлы во всех каталогах. Информация о версиях останется доступна', 'files_loading' => 'Пожалуйста подождите, идет загрузка файла …', +'filetype' => '', 'file_size' => 'Размер', 'filter_for_documents' => 'Дополнительный фильтр по документам', 'filter_for_folders' => 'Дополнительный фильтр по папкам', @@ -1751,6 +1753,7 @@ URL: [url]', 'transfer_no_write_access' => 'Пользователь не имеет доступа на запись в этой папке', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Передать пользователю', 'transition_triggered_email' => 'Изменено состояние процесса', 'transition_triggered_email_body' => 'Изменено состояние процесса @@ -1875,6 +1878,7 @@ URL: [url]', 'workflow_summary' => 'Сводка по процессу', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Сводка по пользователю', +'wrong_filetype' => '', 'x_more_objects' => '', 'year_view' => 'Год', 'yes' => 'Да', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 6e1071be1..2617b835f 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -451,6 +451,7 @@ Odkaz je platný do [valid]. 'do_object_repair' => 'Opraviť všetky zložky a dokumenty.', 'do_object_setchecksum' => 'Nastaviť kontrolný súčet', 'do_object_setfilesize' => 'Nastaviť veľkosť súboru', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Zmazať verziu dokumentu', 'draft' => 'Návrh', 'draft_pending_approval' => 'Návrh - čaká na schválenie', @@ -563,6 +564,7 @@ URL: [url]', 'files_deletion' => 'Odstránenie súboru', 'files_deletion_warning' => 'Touto akciou môžete odstrániť všetky súbory celých DMS zložiek. Verziovacie informácie zostanú viditeľné.', 'files_loading' => 'Prosím počkajte, kým sa načíta zoznam súborov ...', +'filetype' => '', 'file_size' => 'Veľkosť súboru', 'filter_for_documents' => 'Ďalší filter pre dokumenty', 'filter_for_folders' => 'Ďalší filter pre zložky', @@ -1791,6 +1793,7 @@ Meno: [username] 'transfer_no_write_access' => 'Používateľ nemá práva na zapisovanie v adresári', 'transfer_objects' => 'Prenesené objekty', 'transfer_objects_to_user' => 'Nový vlastník', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Transfer používateľovi', 'transition_triggered_email' => 'Workflow transition triggered', 'transition_triggered_email_body' => 'Workflow transition triggered @@ -1915,6 +1918,7 @@ URL: [url]', 'workflow_summary' => 'Workflow summary', 'workflow_transition_without_user_group' => 'At least one of the transitions has neither a user nor a group!', 'workflow_user_summary' => 'User summary', +'wrong_filetype' => '', 'x_more_objects' => 'ďalších [number] objektov', 'year_view' => 'Rok', 'yes' => 'Áno', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 2993cc3f7..a09006af2 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -445,6 +445,7 @@ Länken är giltig t o m [valid]. 'do_object_repair' => 'Reparera alla kataloger och dokument.', 'do_object_setchecksum' => 'Lägg till checksumma', 'do_object_setfilesize' => 'Ange filstorlek', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Ta bort dokumentversion', 'draft' => 'Utkast', 'draft_pending_approval' => 'Utkast: väntar på godkännande', @@ -557,6 +558,7 @@ URL: [url]', 'files_deletion' => 'Ta bort filer', 'files_deletion_warning' => 'Med detta alternativ kan du ta bort alla filer i en dokumentkatalog. Versionsinformationen kommer fortfarande att visas.', 'files_loading' => 'Vänligen vänta tills listan med filer har laddats ...', +'filetype' => '', 'file_size' => 'Filstorlek', 'filter_for_documents' => 'Tilläggsfilter för dokument', 'filter_for_folders' => 'Tilläggsfilter för kataloger', @@ -1764,6 +1766,7 @@ Kommentar: [comment]', 'transfer_no_write_access' => 'Användaren har inte skrivrättigheter i katalogen', 'transfer_objects' => 'Överför objekt', 'transfer_objects_to_user' => 'Ny ägare', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Överför till användare', 'transition_triggered_email' => 'Arbetsflödesövergång utlöstes', 'transition_triggered_email_body' => 'Arbetsflödesövergång utlöstes @@ -1888,6 +1891,7 @@ URL: [url]', 'workflow_summary' => 'Sammanfattning arbetsflöde', 'workflow_transition_without_user_group' => 'Minst en av övergångarna i arbetsflödet saknar användare eller grupp.', 'workflow_user_summary' => 'Sammanfattning användare', +'wrong_filetype' => '', 'x_more_objects' => '[number] ytterligare objekt', 'year_view' => 'Årsvy', 'yes' => 'Ja', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 0269e842c..bb419c965 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -426,6 +426,7 @@ URL: [url]', 'do_object_repair' => 'Tüm klasörleri ve dokümanları onar.', 'do_object_setchecksum' => 'Sağlama (checksum) ayarla', 'do_object_setfilesize' => 'Dosya boyutu ayarla', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Doküman versiyonunu sil', 'draft' => '', 'draft_pending_approval' => 'Taslak - onay bekliyor', @@ -538,6 +539,7 @@ URL: [url]', 'files_deletion' => 'Dosya silme', 'files_deletion_warning' => 'Bu işlemle bütün DYS klasörlerindeki dosyaların tamamını silebilirsiniz. Versiyonlama bilgisi görülmeye devam edecek.', 'files_loading' => 'Döküman ağaç yapısı yüklenirken, lütfen bekleyiniz ...', +'filetype' => '', 'file_size' => 'Dosya boyutu', 'filter_for_documents' => 'Dokümanlar için ek filtreler', 'filter_for_folders' => 'Klasörler için ek filtreler', @@ -1723,6 +1725,7 @@ URL: [url]', 'transfer_no_write_access' => 'Kullanıcının klasör üzerinde yazma hakkı yok', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Kullanıcıya transfer et', 'transition_triggered_email' => 'İş Akış Geçişi Tetiklendi', 'transition_triggered_email_body' => 'İş Akış Geçişi Tetiklendi @@ -1847,6 +1850,7 @@ URL: [url]', 'workflow_summary' => 'İş akış özeti', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Kullanıcı özeti', +'wrong_filetype' => '', 'x_more_objects' => '[number] více objektů', 'year_view' => 'Yıllık Görünüm', 'yes' => 'Evet', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 65a340b61..2526cf871 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -432,6 +432,7 @@ URL: [url]', 'do_object_repair' => 'Виправити всі каталоги і документи', 'do_object_setchecksum' => 'Встановити контрольну суму', 'do_object_setfilesize' => 'Встановити розмір файлу', +'do_object_setfiletype' => '', 'do_object_unlink' => 'Видалити версію документа', 'draft' => 'Чернетка', 'draft_pending_approval' => 'Чернетка — Очікує на затвердження', @@ -544,6 +545,7 @@ URL: [url]', 'files_deletion' => 'Видалити файли', 'files_deletion_warning' => 'Ця операція видалить всі файли у всіх каталогах. Інформація про версії залишиться доступною', 'files_loading' => 'Будь ласка, зачекайте, поки завантажується файл …', +'filetype' => '', 'file_size' => 'Розмір', 'filter_for_documents' => 'Додатковий фільтр по документах', 'filter_for_folders' => 'Додатковий фільтр по каталогах', @@ -1744,6 +1746,7 @@ URL: [url]', 'transfer_no_write_access' => '', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => 'Передати користувачу', 'transition_triggered_email' => 'Змінено стан процесу', 'transition_triggered_email_body' => 'Змінено стан процесу @@ -1868,6 +1871,7 @@ URL: [url]', 'workflow_summary' => 'Підсумки по процесу', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Підсумки по користувачу', +'wrong_filetype' => '', 'x_more_objects' => '[number] більше об\'єктів', 'year_view' => 'Рік', 'yes' => 'Так', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index b7997a58e..473ae3ece 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -432,6 +432,7 @@ URL: [url]', 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '设置文件大小', +'do_object_setfiletype' => '', 'do_object_unlink' => '删除文档版本信息', 'draft' => '草稿', 'draft_pending_approval' => '待审核', @@ -540,6 +541,7 @@ URL: [url]', 'files_deletion' => '删除文件', 'files_deletion_warning' => '通过此操作，您可以删除整个DMS(文档管理系统)文件夹里的所有文件.但版本信息将被保留', 'files_loading' => '等待中，正在整理文件列表', +'filetype' => '', 'file_size' => '文件大小', 'filter_for_documents' => '文档新增过滤', 'filter_for_folders' => '文件夹新增过滤', @@ -1725,6 +1727,7 @@ URL: [url]', 'transfer_no_write_access' => '当前用户没有文件夹写入权限', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => '共享给其他用户', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', @@ -1840,6 +1843,7 @@ URL: [url]', 'workflow_summary' => '工作流概述', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => '用户概述', +'wrong_filetype' => '', 'x_more_objects' => '浏览更多', 'year_view' => '年视图', 'yes' => '是', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 5667b8aa7..a4d5899ca 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -377,6 +377,7 @@ URL: [url]', 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '設定檔案大小', +'do_object_setfiletype' => '', 'do_object_unlink' => '', 'draft' => '', 'draft_pending_approval' => '待審核', @@ -485,6 +486,7 @@ URL: [url]', 'files_deletion' => '刪除檔', 'files_deletion_warning' => '通過此操作，您可以刪除整個DMS(文檔管理系統)資料夾裡的所有檔.但版本資訊將被保留', 'files_loading' => '請稍候， 檔案讀取中', +'filetype' => '', 'file_size' => '文件大小', 'filter_for_documents' => '', 'filter_for_folders' => '', @@ -1574,6 +1576,7 @@ URL: [url]', 'transfer_no_write_access' => '', 'transfer_objects' => '', 'transfer_objects_to_user' => '', +'transfer_process_to_user' => '', 'transfer_to_user' => '', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', @@ -1684,6 +1687,7 @@ URL: [url]', 'workflow_summary' => '', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => '', +'wrong_filetype' => '', 'x_more_objects' => '增加[數值]物件', 'year_view' => '年視圖', 'yes' => '是', From 80ca2a71743899b8228fd2c3ff2b815213213524 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 13:25:35 +0100 Subject: [PATCH 386/467] remove debug echo --- SeedDMS_Core/Core/inc.ClassDocument.php | 1 - 1 file changed, 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 492061637..06fd32e4e 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -4845,7 +4845,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if($this->_fileType != '.'.$expect) { $db->startTransaction(); $queryStr = "UPDATE `tblDocumentContent` SET `fileType`='.".$expect."' WHERE `id` = ". $this->_id; - echo $queryStr."
          "; $res = $db->getResult($queryStr); if ($res) { if(!SeedDMS_Core_File::renameFile($this->_dms->contentDir.$this->_document->getDir() . $this->_version . $this->_fileType, $this->_dms->contentDir.$this->_document->getDir() . $this->_version . '.' . $expect)) { From c25c3fef6060ae2592e2a87571994c8c91124eaf Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 16:12:43 +0100 Subject: [PATCH 387/467] add js for clicking on a document row --- views/bootstrap/class.ObjectCheck.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index 5585f9c85..5ddfbb0fe 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -183,6 +183,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $this->printDeleteFolderButtonJs(); $this->printDeleteDocumentButtonJs(); + $this->printClickDocumentJs(); } /* }}} */ function show() { /* {{{ */ @@ -446,4 +447,3 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $this->htmlEndPage(); } /* }}} */ } -?> From dc5d742c45ac3da6385334b1bab5fca491e75eb9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2020 17:42:53 +0100 Subject: [PATCH 388/467] get docs with wrong file type in view, update page title when choosing list --- views/bootstrap/class.ObjectCheck.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index 405ad6be3..ce86b23c5 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -505,6 +505,7 @@ $(document).ready( function() { ev.preventDefault(); $('#kkkk.ajax').data('action', $(this).data('action')); $('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')}); + window.history.pushState({"html":"","pageTitle":""},"", '../out/out.ObjectCheck.php?list=' + $(this).data('action')); }); $('body').on('click', 'div.repair a', function(ev){ ev.preventDefault(); @@ -539,6 +540,7 @@ $(document).ready( function() { $docsinrevision = $this->params['docsinrevision']; $docsinreception = $this->params['docsinreception']; $processwithoutusergroup = $this->params['processwithoutusergroup']; + $wrongfiletypeversions = $this->params['wrongfiletypeversions']; $repair = $this->params['repair']; $unlink = $this->params['unlink']; $setfilesize = $this->params['setfilesize']; From 1293b9965e8e3478bcc7f480355501d9ec2bda32 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 17 Feb 2020 08:19:58 +0100 Subject: [PATCH 389/467] minor tranlation updates --- languages/ar_EG/lang.inc | 1 + languages/bg_BG/lang.inc | 1 + languages/ca_ES/lang.inc | 1 + languages/cs_CZ/lang.inc | 1 + languages/de_DE/lang.inc | 3 ++- languages/el_GR/lang.inc | 1 + languages/en_GB/lang.inc | 11 ++++++----- languages/es_ES/lang.inc | 1 + languages/fr_FR/lang.inc | 1 + languages/hr_HR/lang.inc | 1 + languages/hu_HU/lang.inc | 7 ++++--- languages/it_IT/lang.inc | 1 + languages/ko_KR/lang.inc | 1 + languages/lo_LA/lang.inc | 1 + languages/nl_NL/lang.inc | 1 + languages/pl_PL/lang.inc | 1 + languages/pt_BR/lang.inc | 1 + languages/ro_RO/lang.inc | 1 + languages/ru_RU/lang.inc | 1 + languages/sk_SK/lang.inc | 1 + languages/sv_SE/lang.inc | 1 + languages/tr_TR/lang.inc | 1 + languages/uk_UA/lang.inc | 1 + languages/zh_CN/lang.inc | 1 + languages/zh_TW/lang.inc | 1 + 25 files changed, 34 insertions(+), 9 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index de1c4cb1d..9fa19dde4 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -220,6 +220,7 @@ URL: [url]', 'category_in_use' => 'هذا القسم مستخدم حاليا بواسطة مستندات.', 'category_noname' => 'لم يتم كتابة اسم القسم.', 'ca_ES' => 'الكاتالونية', +'changelog_loading' => '', 'change_assignments' => 'تغيير التخصيصات', 'change_password' => 'تغيير كلمة السر', 'change_password_message' => 'تم تغيير كلمة السر.', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 46428ca6b..78e7d2123 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -203,6 +203,7 @@ $text = array( 'category_in_use' => 'Тази категория се използва от документите', 'category_noname' => 'Въведете име на категорията', 'ca_ES' => 'Каталунски', +'changelog_loading' => '', 'change_assignments' => 'Промени предназначението', 'change_password' => 'Промени паролата', 'change_password_message' => 'Паролата променена', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index a2c556bff..6ceb825e4 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -208,6 +208,7 @@ URL: [url]', 'category_in_use' => '', 'category_noname' => '', 'ca_ES' => 'Català', +'changelog_loading' => '', 'change_assignments' => 'Canviar assignacions', 'change_password' => '', 'change_password_message' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 9221f94cb..12b30b434 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Tato kategorie je používána dokumenty.', 'category_noname' => 'Není zadán název kategorie.', 'ca_ES' => 'Katalánština', +'changelog_loading' => '', 'change_assignments' => 'Změnit přiřazení', 'change_password' => 'Změnit heslo', 'change_password_message' => 'Vaše heslo bylo změněno.', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ca05ec221..2cdcc2d55 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2739), dgrutsch (22) +// Translators: Admin (2740), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Diese Kategorie wird zur Zeit von Dokumenten verwendet.', 'category_noname' => 'Kein Kategoriename eingetragen.', 'ca_ES' => 'Katalanisch', +'changelog_loading' => 'Bitte warten, bis die Liste der Änderungen geladen ist …', 'change_assignments' => 'Setze Prüfer/Freigeber', 'change_password' => 'Passwort ändern', 'change_password_message' => 'Ihr Passwort wurde geändert.', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index d2ac7cd16..715309939 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -203,6 +203,7 @@ $text = array( 'category_in_use' => 'Η Κατηγορία αυτή είναι σε χρήση.', 'category_noname' => 'Δεν δόθηκε όνομα κατηγορίας.', 'ca_ES' => 'Καταλανικά', +'changelog_loading' => '', 'change_assignments' => '', 'change_password' => 'Αλλαγή κωδικού', 'change_password_message' => 'Ο κωδικός σας έχει αλλάξει.', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 1a45b174a..118ecd4f5 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1834), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1839), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -224,7 +224,7 @@ URL: [url]', 'cannot_retrieve_review_snapshot' => 'Unable to retrieve review status snapshot for this document version.', 'cannot_rm_root' => 'Error: Cannot delete root folder.', 'categories' => 'Categories', -'categories_loading' => 'Please wait, until category list is loaded …', +'categories_loading' => 'Please wait, until the list of categories is loaded …', 'category' => 'Category', 'category_exists' => 'Category already exists.', 'category_filter' => 'Only categories', @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'This category is currently used by documents.', 'category_noname' => 'No category name given.', 'ca_ES' => 'Catalan', +'changelog_loading' => 'Please wait, until the change log is loaded …', 'change_assignments' => 'Set reviewer/approver', 'change_password' => 'Change password', 'change_password_message' => 'Your password has been changed.', @@ -563,7 +564,7 @@ URL: [url]', 'files' => 'Files', 'files_deletion' => 'Files deletion', 'files_deletion_warning' => 'With this option you can delete all files of entire DMS folders. The versioning information will remain visible.', -'files_loading' => 'Please wait, until file list is loaded …', +'files_loading' => 'Please wait, until the list of files is loaded …', 'filetype' => 'File type', 'file_size' => 'Filesize', 'filter_for_documents' => 'Additional filter for documents', @@ -736,7 +737,7 @@ URL: [url]', 'keep' => 'Do not change', 'keep_doc_status' => 'Keep document status', 'keywords' => 'Keywords', -'keywords_loading' => 'Please wait, until keyword list is loaded …', +'keywords_loading' => 'Please wait, until the list of keywords is loaded …', 'keyword_exists' => 'Keyword already exists', 'ko_KR' => 'Korean', 'language' => 'Language', @@ -1813,7 +1814,7 @@ URL: [url]', 'transmittal_comment' => 'Comment', 'transmittal_name' => 'Name', 'transmittal_size' => 'Size', -'tree_loading' => 'Please wait, until document tree is loaded …', +'tree_loading' => 'Please wait, until the document tree is loaded …', 'trigger_workflow' => 'Workflow', 'tr_TR' => 'Turkish', 'tuesday' => 'Tuesday', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 14185edf1..6fcfee4d7 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -227,6 +227,7 @@ URL: [url]', 'category_in_use' => 'Esta categoría está en uso por documentos.', 'category_noname' => 'No ha proporcionado un nombre de categoría.', 'ca_ES' => 'Catala', +'changelog_loading' => '', 'change_assignments' => 'cambiar asignaciones', 'change_password' => 'cambiar contraseña', 'change_password_message' => 'Su contraseña se ha modificado.', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 0a9ca669d..05c46e55c 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Cette catégorie est en cours d\'utilisation par des documents.', 'category_noname' => 'Aucun nom de catégorie fourni.', 'ca_ES' => 'Catalan', +'changelog_loading' => '', 'change_assignments' => 'Changer les affectations', 'change_password' => 'Changer de mot de passe', 'change_password_message' => 'Votre mot de passe a été changé.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 3cdd6c532..a22baf794 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -232,6 +232,7 @@ Internet poveznica: [url]', 'category_in_use' => 'Ovu kategoriju trenutno koriste dokumenti.', 'category_noname' => 'Nije dan naziv kategoriji.', 'ca_ES' => 'Katalonski', +'changelog_loading' => '', 'change_assignments' => 'Promjena zadataka', 'change_password' => 'Promjeni lozinku', 'change_password_message' => 'Vaša lozinka je promijenjena.', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index aab00ffc9..46dd35452 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (636), ribaz (1036) +// Translators: Admin (638), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -227,6 +227,7 @@ URL: [url]', 'category_in_use' => 'Dokumentumok használják ezt a kategóriát', 'category_noname' => 'Nem adott meg kategória nevet.', 'ca_ES' => 'Katalán', +'changelog_loading' => '', 'change_assignments' => 'Hozzárendelések módosítása', 'change_password' => 'Jelszó módosítása', 'change_password_message' => 'Jelszava módosításra került.', @@ -634,7 +635,7 @@ URL: [url]', 'include_content' => '', 'include_documents' => 'Tartalmazó dokumentumok', 'include_subdirectories' => 'Tartalmazó alkönyvtárak', -'indexing_tasks_in_queue' => '', +'indexing_tasks_in_queue' => 'Indexelés folyamatban', 'index_converters' => '', 'index_done' => '', 'index_error' => '', @@ -878,7 +879,7 @@ URL: [url]', 'only_jpg_user_images' => 'Felhasználói képként csak .jpg állományok adhatók meg', 'order_by_sequence_off' => '', 'original_filename' => 'Eredeti fájlnév', -'overall_indexing_progress' => '', +'overall_indexing_progress' => 'Teljes indexelési folyamat', 'owner' => 'Tulajdonos', 'ownership_changed_email' => 'Tulajdonos megváltozott', 'ownership_changed_email_body' => 'Tulajdonos megváltozott diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 5d1e58def..d7771c38b 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Questa categoria è attualmente in uso in alcuni documenti.', 'category_noname' => 'Non è stato attribuito un nome alla categoria.', 'ca_ES' => 'Catalano', +'changelog_loading' => '', 'change_assignments' => 'Modifica le assegnazioni', 'change_password' => 'Cambia la password', 'change_password_message' => 'La password è stata cambiata', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 88c4b0b7f..303a1cc14 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -234,6 +234,7 @@ URL: [url]', 'category_in_use' => '이 카테고리는 현재 문서에서 사용합니다.', 'category_noname' => '주어진 카테고리명이 없음.', 'ca_ES' => '카탈로니아어', +'changelog_loading' => '', 'change_assignments' => '검토자/승인자 설정', 'change_password' => '암호 바꾸기', 'change_password_message' => '암호를 바꾸었습니다.', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index e5d71b9d7..8c396a6b3 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -230,6 +230,7 @@ URL: [url]', 'category_in_use' => 'ປັດຈຸບັນມີການໃຊ້ໝວດໝູ່ນີ້ໃນເອກະສານ.', 'category_noname' => 'ບໍ່ລະບຸຊື່ປະເພດ', 'ca_ES' => 'ຄາຕາລັນ', +'changelog_loading' => '', 'change_assignments' => 'ຕັ້ງຜູ້ກວດກາ/ຜູ້ອະນຸມັດ', 'change_password' => 'ປ່ຽນລະຫັດຜ່ານ', 'change_password_message' => 'ປ່ຽນລະຫັດຜ່ານຂອງທ່ານຮຽບຮ້ອຍແລ້ວ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 1fe6bef8f..882d911b2 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -225,6 +225,7 @@ URL: [url]', 'category_in_use' => 'Categorie is in gebruik door documenten.', 'category_noname' => 'Geen Categorienaam opgegeven.', 'ca_ES' => 'Catalaans', +'changelog_loading' => '', 'change_assignments' => 'Wijzig taken/toewijzingen', 'change_password' => 'Wijzig wachtwoord', 'change_password_message' => 'Wachtwoord is gewijzigd.', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index b74b1dd77..ee1cd8898 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -220,6 +220,7 @@ URL: [url]', 'category_in_use' => 'Ta kategoria jest aktualnie używana przez dokumenty.', 'category_noname' => 'Nie podano nazwy kategorii.', 'ca_ES' => 'Kataloński', +'changelog_loading' => '', 'change_assignments' => 'Zmiana przypisania', 'change_password' => 'Zmiana hasła', 'change_password_message' => 'Twoje hasło zostało zmienione.', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 426f5fdd1..b158e678e 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Esta categoria é usada atualmente por documentos.', 'category_noname' => 'Nenhum nome de categoria foi fornecido.', 'ca_ES' => 'Catalão', +'changelog_loading' => '', 'change_assignments' => 'Definir revisor / aprovador', 'change_password' => 'Modificar senha', 'change_password_message' => 'Sua senha foi modificada.', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 8218d8285..8806b4383 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Această categorie este momentan utilizată de documente.', 'category_noname' => 'Nu s-a furnizat nici un nume categorie', 'ca_ES' => 'Catalana', +'changelog_loading' => '', 'change_assignments' => 'Schimbă alocările', 'change_password' => 'Schimbă parola', 'change_password_message' => 'Parola dumneavoastra a fost schimbată.', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 97c152776..70f2de1b0 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Эта категория используется документами', 'category_noname' => 'Введите название категории', 'ca_ES' => 'Catalan', +'changelog_loading' => '', 'change_assignments' => 'Изменить назначения', 'change_password' => 'Изменить пароль', 'change_password_message' => 'Пароль изменён', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 2617b835f..0e446b210 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Táto kategória sa v súčasnosti používa v dokumentoch.', 'category_noname' => 'Nebolo zadané žiadne meno kategórie.', 'ca_ES' => 'Katalánština', +'changelog_loading' => '', 'change_assignments' => 'Zmeniť úlohy', 'change_password' => 'Zmeniť heslo', 'change_password_message' => 'Vaše heslo bolo zmenené.', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index a09006af2..7b38aae8a 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -233,6 +233,7 @@ URL: [url]', 'category_in_use' => 'Denna kategori används av ett dokument.', 'category_noname' => 'Inget kategorinamn angivet', 'ca_ES' => 'Katalonska', +'changelog_loading' => '', 'change_assignments' => 'Ändra uppdrag', 'change_password' => 'Ändra lösenord', 'change_password_message' => 'Ditt lösenord har ändrats.', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index bb419c965..ef31360ab 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -226,6 +226,7 @@ URL: [url]', 'category_in_use' => 'Bu kategoride dokümanlar mevcut.', 'category_noname' => 'Kategori ismi verilmedi.', 'ca_ES' => 'Katalanca', +'changelog_loading' => '', 'change_assignments' => 'Atamaları Değiştir', 'change_password' => 'Parola degiştir', 'change_password_message' => 'Parolanız değişti.', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 2526cf871..aeef777b2 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -232,6 +232,7 @@ URL: [url]', 'category_in_use' => 'Ця категорія використовується для документів', 'category_noname' => 'Введіть назву категорії', 'ca_ES' => 'Catalan', +'changelog_loading' => '', 'change_assignments' => 'Змінити призначення', 'change_password' => 'Змінити пароль', 'change_password_message' => 'Пароль змінено', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 473ae3ece..f3ad1d171 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -224,6 +224,7 @@ URL: [url]', 'category_in_use' => '已有文件使用此分类', 'category_noname' => '类别名称不能为空。', 'ca_ES' => '加泰罗尼亚语', +'changelog_loading' => '', 'change_assignments' => '分配变更', 'change_password' => '修改密码', 'change_password_message' => '您的密码已更新。', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index a4d5899ca..6dc1579cf 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -207,6 +207,7 @@ URL: [url]', 'category_in_use' => '已有檔使用此分類', 'category_noname' => '', 'ca_ES' => '加泰羅尼亞語', +'changelog_loading' => '', 'change_assignments' => '分配變更', 'change_password' => '變更密碼', 'change_password_message' => '變更密碼提示', From 4b402a131ffb21e626e76f34514c0d8df688940b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 17 Feb 2020 10:21:01 +0100 Subject: [PATCH 390/467] update release date --- SeedDMS_Core/package.xml | 4 ++-- SeedDMS_Preview/package.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 9d37b5765..2ff9423fa 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,8 +12,8 @@ uwe@steinmann.cx yes - 2019-12-13 - + 2020-02-17 + 5.1.14 5.1.14 diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml index aa4a3992f..47a068c53 100644 --- a/SeedDMS_Preview/package.xml +++ b/SeedDMS_Preview/package.xml @@ -11,8 +11,8 @@ uwe@steinmann.cx yes - 2020-01-21 - + 2020-02-17 + 1.3.0 1.3.0 From 6bf6a4b58236eebe36b81cb30b40f7f399ab8910 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 17 Feb 2020 12:57:48 +0100 Subject: [PATCH 391/467] start new version 5.1.15 --- CHANGELOG | 4 ++++ SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 23 +++++++++++++++++++---- inc/inc.Version.php | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d21cdff07..360500b92 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.15 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.14 -------------------------------------------------------------------------------- diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 5692511d3..bbaa830bb 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -383,7 +383,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '5.1.13'; + $this->version = '5.1.15'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 2ff9423fa..f1a4e8cbd 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2020-02-17 + 2020-02-18 - 5.1.14 - 5.1.14 + 5.1.15 + 5.1.15 stable @@ -24,7 +24,6 @@ GPL License -- speed up SeedDMS_Core_Folder::getSubFolders() SeedDMS_Core_Folder::getDocuments() by minimizing the number of sql queries. @@ -1712,5 +1711,21 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp() - skip a fileType with just a '.' + + 2020-02-17 + + + 5.1.14 + 5.1.14 + + + stable + stable + + GPL License + +- speed up SeedDMS_Core_Folder::getSubFolders() SeedDMS_Core_Folder::getDocuments() by minimizing the number of sql queries. + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index c4a50edfa..d4e7d8127 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { /* {{{ */ - const _number = "5.1.14"; + const _number = "5.1.15"; const _string = "SeedDMS"; function __construct() { From 037829520844a9e4125eaf3a1c6b9082f2668faa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 18 Feb 2020 09:29:16 +0100 Subject: [PATCH 392/467] forbit index listing --- styles/.htaccess | 1 + 1 file changed, 1 insertion(+) create mode 100644 styles/.htaccess diff --git a/styles/.htaccess b/styles/.htaccess new file mode 100644 index 000000000..5a928f6da --- /dev/null +++ b/styles/.htaccess @@ -0,0 +1 @@ +Options -Indexes From 7ed771dba8ecd37694d67d1dea20edc5e6cffd5c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 18 Feb 2020 09:45:59 +0100 Subject: [PATCH 393/467] some improvements (still unfinished) --- op/op.ImportFS.php | 72 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php index de5f402c9..2e51d36a8 100644 --- a/op/op.ImportFS.php +++ b/op/op.ImportFS.php @@ -48,6 +48,33 @@ if(strpos($dirname, realpath($settings->_dropFolderDir.'/'.$user->getLogin().'/' UI::exitError(getMLText("admin_tools"),getMLText("invalid_dropfolder_folder")); } +function getBaseData($colname, $coldata, $objdata) { /* {{{ */ + $objdata[$colname] = $coldata; + return $objdata; +} /* }}} */ + +function getAttributeData($attrdef, $coldata, $objdata) { /* {{{ */ + $objdata['attributes'][$attrdef->getID()] = $coldata; + return $objdata; +} /* }}} */ + +function getCategoryData($colname, $coldata, $objdata) { /* {{{ */ + global $catids; + $kk = explode(',', $coldata); + foreach($kk as $k) { + if(isset($catids[$k])) + $objdata['category'][] = $catids[$k]; + } + return $objdata; +} /* }}} */ + +function getUserData($colname, $coldata, $objdata) { /* {{{ */ + global $userids; + if(isset($userids[$coldata])) + $objdata['owner'] = $userids[$coldata]; + return $objdata; +} /* }}} */ + $metadata = array(); if(!empty($_GET["dropfolderfileform2"])) { $metadatafile = realpath($settings->_dropFolderDir.'/'.$user->getLogin()."/".$_GET["dropfolderfileform2"]); @@ -58,32 +85,69 @@ if(!empty($_GET["dropfolderfileform2"])) { if($header = fgetcsv($fp, 0, $csvdelim, $csvencl)) { print_r($header); foreach($header as $i=>$colname) { - if(in_array($colname, array('filename', 'category'))) { - $colmap[$colname] = $i; + $colname = trim($colname); + if(in_array($colname, array('category'))) { + $colmap[$i] = array("getCategoryData", $colname); + } elseif(in_array($colname, array('owner'))) { + $colmap[$i] = array("getUserData", $colname); + } elseif(in_array($colname, array('filename', 'category', 'name', 'comment'))) { + $colmap[$i] = array("getBaseData", $colname); + } elseif(substr($colname, 0, 5) == 'attr:') { + $kk = explode(':', $colname, 2); + if(($attrdef = $dms->getAttributeDefinitionByName($kk[1])) || ($attrdef = $dms->getAttributeDefinition((int) $kk[1]))) { + $colmap[$i] = array("getAttributeData", $attrdef); + } } } } + echo "
          ";print_r($colmap);echo "
          "; if(count($colmap) > 1) { $nameprefix = dirname($dirname).'/'; $allcats = $dms->getDocumentCategories(); $catids = array(); foreach($allcats as $cat) $catids[$cat->getName()] = $cat; + $allusers = $dms->getAllUsers(); + $userids = array(); + foreach($allusers as $muser) + $userids[$muser->getLogin()] = $muser; while(!feof($fp)) { if($data = fgetcsv($fp, 0, $csvdelim, $csvencl)) { - $metadata[$nameprefix.$data[$colmap['filename']]] = array('category'=>array()); + $mi = $nameprefix.$data[$colmap['filename']]; + $metadata[$mi] = array('category'=>array()); + $md = array(); + foreach($data as $i=>$coldata) { + if(isset($colmap[$i])) { + $md = call_user_func($colmap[$i][0], $colmap[$i][1], $coldata, $md); + } + } + $metadata[$mi] = $md; + /* if($data[$colmap['category']]) { $kk = explode(',', $data[$colmap['category']]); foreach($kk as $k) { if(isset($catids[$k])) - $metadata[$nameprefix.$data[$colmap['filename']]]['category'][] = $catids[$k]; + $metadata[$mi]['category'][] = $catids[$k]; } } + if($data[$colmap['owner']]) { + if(isset($userids[trim($data[$colmap['owner']])])) + $metadata[$mi]['owner'] = $userids[trim($data[$colmap['owner']])]; + } + if($data[$colmap['name']]) { + $metadata[$mi]['name'] = $data[$colmap['name']]; + } + if($data[$colmap['comment']]) { + $metadata[$mi]['comment'] = $data[$colmap['comment']]; + } + */ } } } } } +echo "
          ";print_r($metadata);echo "
          "; +exit; $setfiledate = false; if(isset($_GET['setfiledate']) && $_GET["setfiledate"]) { From e2ac4047608824efe5962ab30896cbd50d528c3d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 18 Feb 2020 09:46:32 +0100 Subject: [PATCH 394/467] set header X-Content-Type-Options (still commented out) --- views/bootstrap/class.Bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index cf8b5e986..4e0a8cb3b 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -62,6 +62,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { header($csp . ": " . $csp_rules); } } +// header('X-Content-Type-Options: nosniff'); if($httpheader) { foreach($httpheader as $name=>$value) { header($name . ": " . $value); From 453da9ce00f4b99be1ce14b35e239c62e7927ef6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 21 Feb 2020 09:59:58 +0100 Subject: [PATCH 395/467] metadata file may have data for custom attributes --- op/op.ImportFS.php | 50 ++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php index 2e51d36a8..e19389c66 100644 --- a/op/op.ImportFS.php +++ b/op/op.ImportFS.php @@ -83,7 +83,6 @@ if(!empty($_GET["dropfolderfileform2"])) { if($fp = fopen($metadatafile, 'r')) { $colmap = array(); if($header = fgetcsv($fp, 0, $csvdelim, $csvencl)) { - print_r($header); foreach($header as $i=>$colname) { $colname = trim($colname); if(in_array($colname, array('category'))) { @@ -100,7 +99,7 @@ if(!empty($_GET["dropfolderfileform2"])) { } } } - echo "
          ";print_r($colmap);echo "
          "; +// echo "
          ";print_r($colmap);echo "
          "; if(count($colmap) > 1) { $nameprefix = dirname($dirname).'/'; $allcats = $dms->getDocumentCategories(); @@ -114,40 +113,23 @@ if(!empty($_GET["dropfolderfileform2"])) { while(!feof($fp)) { if($data = fgetcsv($fp, 0, $csvdelim, $csvencl)) { $mi = $nameprefix.$data[$colmap['filename']]; - $metadata[$mi] = array('category'=>array()); +// $metadata[$mi] = array('category'=>array()); $md = array(); + $md['attributes'] = array(); foreach($data as $i=>$coldata) { if(isset($colmap[$i])) { $md = call_user_func($colmap[$i][0], $colmap[$i][1], $coldata, $md); } } - $metadata[$mi] = $md; - /* - if($data[$colmap['category']]) { - $kk = explode(',', $data[$colmap['category']]); - foreach($kk as $k) { - if(isset($catids[$k])) - $metadata[$mi]['category'][] = $catids[$k]; - } - } - if($data[$colmap['owner']]) { - if(isset($userids[trim($data[$colmap['owner']])])) - $metadata[$mi]['owner'] = $userids[trim($data[$colmap['owner']])]; - } - if($data[$colmap['name']]) { - $metadata[$mi]['name'] = $data[$colmap['name']]; - } - if($data[$colmap['comment']]) { - $metadata[$mi]['comment'] = $data[$colmap['comment']]; - } - */ + if(!empty($md['filename'])) + $metadata[$nameprefix.$md['filename']] = $md; } } } } } -echo "
          ";print_r($metadata);echo "
          "; -exit; +//echo "
          ";print_r($metadata);echo "
          "; +//exit; $setfiledate = false; if(isset($_GET['setfiledate']) && $_GET["setfiledate"]) { @@ -173,7 +155,6 @@ function import_folder($dirname, $folder, $setfiledate, $setfolderdate, $metadat $reviewers = array(); $approvers = array(); - $comment = ''; $version_comment = ''; $reqversion = 1; $expires = false; @@ -186,11 +167,16 @@ function import_folder($dirname, $folder, $setfiledate, $setfolderdate, $metadat if (is_bool($lastDotIndex) && !$lastDotIndex) $filetype = "."; else $filetype = substr($name, $lastDotIndex); -// echo $mimetype." - ".$filetype." - ".$path."\n"; - if($res = $folder->addDocument($name, $comment, $expires, $user, $keywords, + $docname = !empty($metadata[$path]['name']) ? $metadata[$path]['name'] : $name; + $comment = !empty($metadata[$path]['comment']) ? $metadata[$path]['comment'] : ''; + $owner = !empty($metadata[$path]['owner']) ? $metadata[$path]['owner'] : $user; + + echo $mimetype." - ".$filetype." - ".$path."
          \n"; + if($res = $folder->addDocument($docname, $comment, $expires, $owner, $keywords, $metadata[$path]['category'], $filetmp, $name, $filetype, $mimetype, $sequence, $reviewers, - $approvers, $reqversion, $version_comment)) { + $approvers, $reqversion, $version_comment, + $metadata[$path]['attributes'])) { $doccount++; if($setfiledate) { $newdoc = $res[0]; @@ -199,7 +185,9 @@ function import_folder($dirname, $folder, $setfiledate, $setfolderdate, $metadat $lc->setDate(filemtime($path)); } } else { - return false; + echo "Error importing ".$path."
          "; + echo "
          ".print_r($res, true)."
          "; +// return false; } set_time_limit(30); } elseif(is_dir($path)) { @@ -212,7 +200,7 @@ function import_folder($dirname, $folder, $setfiledate, $setfolderdate, $metadat if(!import_folder($path, $newfolder, $setfiledate, $setfolderdate, $metadata)) return false; } else { - return false; +// return false; } } $sequence++; From a994659f6c37700219c2b517c23819e70739560c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 21 Feb 2020 10:00:45 +0100 Subject: [PATCH 396/467] add changes for 5.1.15 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 360500b92..367b69796 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ -------------------------------------------------------------------------------- Changes in version 5.1.15 -------------------------------------------------------------------------------- +- Improved import from file system +- HTTP Proxy for access on external extension repository can be set -------------------------------------------------------------------------------- Changes in version 5.1.14 From 4675c785dba9cc11823180c792c233a823ae1d9d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 21 Feb 2020 10:01:09 +0100 Subject: [PATCH 397/467] set configuration for http proxy --- inc/inc.ClassSettings.php | 6 ++++++ op/op.Settings.php | 3 +++ views/bootstrap/class.Settings.php | 3 +++ 3 files changed, 12 insertions(+) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index c6d226963..7efe05413 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -96,6 +96,12 @@ class Settings { /* {{{ */ var $_backupDir = null; // Where the repository for extensions is located var $_repositoryUrl = null; + // URL of proxy + var $_proxyUrl = null; + // User of proxy + var $_proxyUser = null; + // Password of proxy + var $_proxyPassword = null; // enable removal of file from dropfolder after success import var $_removeFromDropFolder = false; // Where the stop word file is located diff --git a/op/op.Settings.php b/op/op.Settings.php index be279b10f..fd2ff9a34 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -127,6 +127,9 @@ if ($action == "saveSettings") $settings->_dropFolderDir = addDirSep($_POST["dropFolderDir"]); $settings->_backupDir = addDirSep($_POST["backupDir"]); $settings->_repositoryUrl = addDirSep($_POST["repositoryUrl"]); + $settings->_proxyUrl = addDirSep($_POST["proxyUrl"]); + $settings->_proxyUser = addDirSep($_POST["proxyUser"]); + $settings->_proxyPassword = addDirSep($_POST["proxyPassword"]); $settings->_logFileEnable = getBoolValue("logFileEnable"); $settings->_logFileRotation = $_POST["logFileRotation"]; $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 36eb97863..9d12d62fa 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -348,6 +348,9 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigText('settings_luceneDir', 'luceneDir'); ?> showConfigText('settings_dropFolderDir', 'dropFolderDir'); ?> showConfigText('settings_repositoryUrl', 'repositoryUrl'); ?> +showConfigText('settings_proxyUrl', 'proxyUrl'); ?> +showConfigText('settings_proxyUser', 'proxyUser'); ?> +showConfigText('settings_proxyUPassword', 'proxyPassword', 'password'); ?> showConfigCheckbox('settings_logFileEnable', 'logFileEnable'); ?> showConfigOption('settings_logFileRotation', 'logFileRotation', array('h'=>'hourly', 'd'=>'daily', 'm'=>'monthly'), false, true); ?> showConfigCheckbox('settings_enableLargeFileUpload', 'enableLargeFileUpload'); ?> From 9696187a9ac2f8ab90b1f0519f75f52d73434bb8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 25 Feb 2020 09:52:27 +0100 Subject: [PATCH 398/467] set url after selecting record --- views/bootstrap/class.AttributeMgr.php | 1 + views/bootstrap/class.GroupMgr.php | 1 + views/bootstrap/class.UsrMgr.php | 1 + 3 files changed, 3 insertions(+) diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php index 25b8f95ce..2a9f6d05a 100644 --- a/views/bootstrap/class.AttributeMgr.php +++ b/views/bootstrap/class.AttributeMgr.php @@ -48,6 +48,7 @@ $(document).ready( function() { }); $( "#selector" ).change(function() { $('div.ajax').trigger('update', {attrdefid: $(this).val()}); + window.history.pushState({"html":"","pageTitle":""},"", '../out/out.AttributeMgr.php?attrdefid=' + $(this).val()); }); }); Date: Tue, 25 Feb 2020 17:06:55 +0100 Subject: [PATCH 399/467] callback removePreviews() muss return null --- op/op.RemoveFolder.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php index 86276b8f0..5ca82a13a 100644 --- a/op/op.RemoveFolder.php +++ b/op/op.RemoveFolder.php @@ -61,15 +61,17 @@ if($settings->_enableFullSearch) { $index = null; } +/* function removePreviews($arr, $document) { $previewer = $arr[0]; $previewer->deleteDocumentPreviews($document); - return true; + return null; } require_once("SeedDMS/Preview.php"); $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); $dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer)); + */ /* Get the notify list before removing the folder * Also inform the users/groups of the parent folder From 6bf193aa856f804976c50ff05a48c4349b4a1cfd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 25 Feb 2020 17:08:13 +0100 Subject: [PATCH 400/467] removePreviews() has been moved into controller --- controllers/class.RemoveFolder.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php index eec8f16f9..c7c4e01b0 100644 --- a/controllers/class.RemoveFolder.php +++ b/controllers/class.RemoveFolder.php @@ -58,6 +58,16 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common { if($index) $dms->setCallback('onPreRemoveDocument', 'removeFromIndex', array($index, $indexconf)); + function removePreviews($arr, $document) { + $previewer = $arr[0]; + + $previewer->deleteDocumentPreviews($document); + return null; + } + require_once("SeedDMS/Preview.php"); + $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); + $dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer)); + if (!$folder->remove()) { $this->errormsg = 'error_occured'; return false; From 34487340244d31bdce98dafaafa0d712e687217c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 25 Feb 2020 17:08:38 +0100 Subject: [PATCH 401/467] set callback removePreviews() when removing a folder --- op/op.Ajax.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 52362f4be..64239460c 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -449,6 +449,16 @@ switch($command) { 'groups'=>array_unique(array_merge($fnl['groups'], $pnl['groups']), SORT_REGULAR) ); $foldername = $folder->getName(); + function removePreviews($arr, $document) { + $previewer = $arr[0]; + + $previewer->deleteDocumentPreviews($document); + return null; + } + require_once("SeedDMS/Preview.php"); + $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); + $dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer)); + if($folder->remove()) { if ($notifier) { $subject = "folder_deleted_email_subject"; From 3d33c1d49c72465ff1cefba6e671f19c503e09d6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Feb 2020 20:57:40 +0100 Subject: [PATCH 402/467] get rid of git merge errors --- op/op.ReviewDocument.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index d78d45ecd..60654a9e7 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -175,24 +175,9 @@ if ($newdocstatus['status'] == S_DRAFT_APP) { if ($dastat["status"] == 0) { if ($dastat["type"] == 0) { -<<<<<<< HEAD $approver = $dms->getUser($dastat["required"]); $notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params); } elseif ($dastat["type"] == 1) { -======= - if($notifier) { - $subject = "approval_request_email_subject"; - $message = "approval_request_email_body"; - $params = array(); - $params['name'] = $document->getName(); - $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $version; - $params['username'] = $user->getFullName(); - $params['sitename'] = $settings->_siteName; - $params['http_root'] = $settings->_httpRoot; - $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); - foreach ($docApprovalStatus as $dastat) { ->>>>>>> seeddms-5.1.x $group = $dms->getGroup($dastat["required"]); $notifier->toGroup($document->getOwner(), $group, $subject, $message, $params); From 7761f5d77bf5d927063881ebe689d6510ce0a683 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Feb 2020 20:58:54 +0100 Subject: [PATCH 403/467] get root folder in printTreeNavigationJs() only if partialtree is not set --- views/bootstrap/class.Bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 2811d6ccc..4f9d98ded 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1846,9 +1846,9 @@ $(document).ready(function() { $folder = $this->params['dms']->getFolder($folderid); if(!$partialtree) { $path = $folder->getPath(); + /* Get the first folder (root folder) of path */ + $folder = array_shift($path); } - /* Get the first folder (root folder) of path */ - $folder = array_shift($path); $node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>false, 'is_folder'=>true); if(!$folder->hasSubFolders()) { $node['load_on_demand'] = true; From 9733c44ef3185c25cd84e12d7321156ca3f02933 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Feb 2020 20:59:26 +0100 Subject: [PATCH 404/467] do not access SeedDMD_Document_Content::_version anymore use SeedDMD_Document_Content::getVersion() instead --- op/op.EditComment.php | 6 +++--- op/op.SetRecipients.php | 8 ++++---- op/op.SetRevisors.php | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/op/op.EditComment.php b/op/op.EditComment.php index 7dec214f7..38411ba97 100644 --- a/op/op.EditComment.php +++ b/op/op.EditComment.php @@ -72,14 +72,14 @@ if (($oldcomment = $version->getComment()) != $comment) { $folder = $document->getFolder(); /* - $subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("document_comment_changed_email"); + $subject = "###SITENAME###: ".$document->getName().", v.".$version->getVersion()." - ".getMLText("document_comment_changed_email"); $message = getMLText("document_comment_changed_email")."\r\n"; $message .= getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$version->_version."\r\n". + getMLText("version").": ".$version->getVersion()."\r\n". getMLText("comment").": ".$comment."\r\n". getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->_version."\r\n"; + "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion()."\r\n"; if(isset($document->_notifyList["users"])) { $notifier->toList($user, $document->_notifyList["users"], $subject, $message); diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php index 70e10450e..5ad1bca18 100644 --- a/op/op.SetRecipients.php +++ b/op/op.SetRecipients.php @@ -133,7 +133,7 @@ foreach ($pIndRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["i"][$p]->getFullName(); $params['username'] = $user->getFullName(); @@ -192,7 +192,7 @@ if (count($receiptIndex["i"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["i"][$rx]->getFullName(); $params['username'] = $user->getFullName(); @@ -240,7 +240,7 @@ foreach ($pGrpRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["g"][$p]->getName(); $params['username'] = $user->getFullName(); @@ -295,7 +295,7 @@ if (count($receiptIndex["g"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["g"][$rx]->getName(); $params['username'] = $user->getFullName(); diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php index 3c782d23f..56cff04d6 100644 --- a/op/op.SetRevisors.php +++ b/op/op.SetRevisors.php @@ -131,7 +131,7 @@ foreach ($pIndRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["i"][$p]->getFullName(); $params['username'] = $user->getFullName(); @@ -190,7 +190,7 @@ if (count($revisionIndex["i"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["i"][$rx]->getFullName(); $params['username'] = $user->getFullName(); @@ -238,7 +238,7 @@ foreach ($pGrpRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["g"][$p]->getName(); $params['username'] = $user->getFullName(); @@ -293,7 +293,7 @@ if (count($revisionIndex["g"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["g"][$rx]->getName(); $params['username'] = $user->getFullName(); From f1ad164f446fcea4fbd97fb2404cd40f56f4ef67 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Feb 2020 21:07:48 +0100 Subject: [PATCH 405/467] allow application/x-zip-compressed for extensions --- op/op.ExtensionMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php index 819c2ece3..68537a146 100644 --- a/op/op.ExtensionMgr.php +++ b/op/op.ExtensionMgr.php @@ -78,7 +78,7 @@ elseif ($action == "upload") { /* {{{ */ if($_FILES['userfile']['error']) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } - if($_FILES['userfile']['type'] != 'application/zip') { + if(!in_array($_FILES['userfile']['type'], array('application/zip', 'application/x-zip-compressed'))) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } // $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir); From 41fd2514b623292d15199ea84c6f74182c2224d7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Feb 2020 21:08:03 +0100 Subject: [PATCH 406/467] do not call unzip but use ZipArchive instead --- inc/inc.ClassExtensionMgr.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index 2d000b21c..758215ddb 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -414,8 +414,17 @@ class SeedDMS_Extension_Mgr { $this->errmsgs[] = "Cannot create temp. extension directory"; return false; } - $cmd = "cd ".$newdir."; unzip ".$file; - exec($cmd); + $zip = new ZipArchive; + $res = $zip->open($file); + if ($res === TRUE) { + $zip->extractTo($newdir); + $zip->close(); + } else { + $this->errmsgs[] = "Cannot open extension file"; + return false; + } +// $cmd = "cd ".$newdir."; unzip ".$file; +// exec($cmd); /* Check if extension is complete and fullfills the constraints */ if(!self::checkExtension($newdir)) { From 5f71f51644549ade495edb7f03d1ab07126f80ec Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Feb 2020 21:14:35 +0100 Subject: [PATCH 407/467] add entries for 6.0.8 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 1d123d5d2..73c680e8a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes in version 6.0.8 -------------------------------------------------------------------------------- - merge changes up to 5.1.15 +- fix syntax error in op/op.EditComment.php +- fix use of private variable in op/op.SetRecipients.php and op/op.SetRevisors.php -------------------------------------------------------------------------------- Changes in version 6.0.7 From 3822db8efa693a40389c2cc9ce2c4513500ae8b4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Feb 2020 14:01:37 +0100 Subject: [PATCH 408/467] update changelog for 5.1.15 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 367b69796..246b80e3d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ -------------------------------------------------------------------------------- - Improved import from file system - HTTP Proxy for access on external extension repository can be set +- Do not use unzip in ExtensionMgr anymore -------------------------------------------------------------------------------- Changes in version 5.1.14 From 9e5f005f054c9d407ad3fe85bdfb9288aca1d6a1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Feb 2020 17:45:54 +0100 Subject: [PATCH 409/467] do not check checkboxes by default --- .../class.RemoveUserFromProcesses.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index fa0ef2c53..a7443c3cc 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -134,7 +134,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[review][]', 'value'=>'0', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -151,7 +151,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[approval][]', 'value'=>'1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -168,7 +168,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[approval][]', 'value'=>'-1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -186,7 +186,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[approval][]', 'value'=>'0', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -203,7 +203,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[approval][]', 'value'=>'1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -220,7 +220,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[approval][]', 'value'=>'-1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -238,7 +238,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[receipt][]', 'value'=>'0', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -255,7 +255,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[receipt][]', 'value'=>'1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -272,7 +272,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[receipt][]', 'value'=>'-1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -290,7 +290,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[revision][]', 'value'=>'0', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -307,7 +307,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[revision][]', 'value'=>'-3', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -324,7 +324,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[revision][]', 'value'=>'1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") @@ -341,7 +341,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'type'=>'checkbox', 'name'=>'status[revision][]', 'value'=>'-1', - 'checked'=>true + 'checked'=>false ), array( 'field_wrap' => array('") From ae2b7d4631fc0c51d43729aa84f08ece41681db5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Feb 2020 17:58:31 +0100 Subject: [PATCH 410/467] add debug mode --- inc/inc.ClassSettings.php | 4 ++++ op/op.Settings.php | 1 + views/bootstrap/class.Settings.php | 1 + 3 files changed, 6 insertions(+) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 7efe05413..d511e7d08 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -240,6 +240,8 @@ class Settings { /* {{{ */ var $_maxExecutionTime = null; // command timeout var $_cmdTimeout = 5; + // debug mode + var $_enableDebugMode = false; // Preview image width in lists var $_previewWidthList = 40; // Preview image width in menu lists @@ -697,6 +699,7 @@ class Settings { /* {{{ */ $this->_maxExecutionTime = intval($tab["maxExecutionTime"]); else $this->_maxExecutionTime = ini_get("max_execution_time"); + $this->_enableDebugMode = Settings::boolval($tab["enableDebugMode"]); } // XML Path: /configuration/system/advanced/converters @@ -1011,6 +1014,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "updateNotifyTime", $this->_updateNotifyTime); $this->setXMLAttributValue($node, "maxExecutionTime", $this->_maxExecutionTime); $this->setXMLAttributValue($node, "cmdTimeout", $this->_cmdTimeout); + $this->setXMLAttributValue($node, "enableDebugMode", $this->_enableDebugMode); /* Check if there is still a converters list with a target attribute */ $node = $xml->xpath('/configuration/advanced/converters[count(@*)=0]'); diff --git a/op/op.Settings.php b/op/op.Settings.php index fd2ff9a34..178805c57 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -211,6 +211,7 @@ if ($action == "saveSettings") $settings->_updateNotifyTime = intval($_POST["updateNotifyTime"]); $settings->_maxExecutionTime = intval($_POST["maxExecutionTime"]); $settings->_cmdTimeout = (intval($_POST["cmdTimeout"]) > 0) ?intval($_POST["cmdTimeout"]) : 1; + $settings->_enableDebugMode = getBoolValue("enableDebugMode"); // SETTINGS - ADVANCED - INDEX CMD if(isset($_POST["converters"]["fulltext"])) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 9d12d62fa..d00cd23b9 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -461,6 +461,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigText('settings_updateNotifyTime', 'updateNotifyTime'); ?> showConfigText('settings_maxExecutionTime', 'maxExecutionTime'); ?> showConfigText('settings_cmdTimeout', 'cmdTimeout'); ?> +showConfigCheckbox('settings_enableDebugMode', 'enableDebugMode'); ?> Date: Thu, 27 Feb 2020 17:58:42 +0100 Subject: [PATCH 411/467] show only if debug mode is on --- out/out.Hooks.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/out/out.Hooks.php b/out/out.Hooks.php index db3845254..6c4704227 100644 --- a/out/out.Hooks.php +++ b/out/out.Hooks.php @@ -28,6 +28,9 @@ require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +if (!$settings->_enableDebugMode) { + UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); +} if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } From 925b8d12b40105a1b0a970d70b5c3bcc79c6c251 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 27 Feb 2020 17:59:44 +0100 Subject: [PATCH 412/467] various language updates --- languages/ar_EG/lang.inc | 12 ++++++++--- languages/bg_BG/lang.inc | 12 ++++++++--- languages/ca_ES/lang.inc | 12 ++++++++--- languages/cs_CZ/lang.inc | 19 ++++++++--------- languages/de_DE/lang.inc | 20 +++++++++--------- languages/el_GR/lang.inc | 12 ++++++++--- languages/en_GB/lang.inc | 21 +++++++++---------- languages/es_ES/lang.inc | 20 +++++++++++------- languages/fr_FR/lang.inc | 25 +++++++++++----------- languages/hr_HR/lang.inc | 36 ++++++++++++++++++-------------- languages/hu_HU/lang.inc | 12 ++++++++--- languages/it_IT/lang.inc | 23 ++++++++++---------- languages/ko_KR/lang.inc | 12 ++++++++--- languages/lo_LA/lang.inc | 19 ++++++++--------- languages/nl_NL/lang.inc | 19 ++++++++--------- languages/pl_PL/lang.inc | 28 +++++++++++++++---------- languages/pt_BR/lang.inc | 45 ++++++++++++++++++++-------------------- languages/ro_RO/lang.inc | 12 ++++++++--- languages/ru_RU/lang.inc | 12 ++++++++--- languages/sk_SK/lang.inc | 19 ++++++++--------- languages/sv_SE/lang.inc | 19 ++++++++--------- languages/tr_TR/lang.inc | 12 ++++++++--- languages/uk_UA/lang.inc | 12 ++++++++--- languages/zh_CN/lang.inc | 18 ++++++++-------- languages/zh_TW/lang.inc | 12 ++++++++--- 25 files changed, 269 insertions(+), 194 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 9fa19dde4..63f56d809 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -295,7 +295,6 @@ URL: [url]', 'converter_new_cmd' => 'converter_new_cmd', 'converter_new_mimetype' => 'نوع جديد من الوثائق', 'copied_to_checkout_as' => 'نسخ الى السب مثل', -'create_download_link' => 'إنشاء رابط تنزيل', 'create_fulltext_index' => 'انشاء فهرس للنص الكامل', 'create_fulltext_index_warning' => 'انت على وشك اعادة انشاء فهرس النص الكامل.هذا سيتطلب وقت كافي وسيؤثر بشكل عام على كفاءة النظام. اذا كنت حقا تود اعادة انشاء الفهرس، من فضلك قم بتاكيد العملية.', 'creation_date' => 'انشأ في تاريخ', @@ -416,8 +415,6 @@ URL: [url]', 'download' => 'تنزيل', 'download_extension' => 'تنزيل طويل', 'download_links' => 'تنزيل روابط', -'download_link_email_body' => 'تنزيل رابط محتوى البريد الإلكتروني', -'download_link_email_subject' => 'تنزيل رابط موضوع البريد الإلكتروني', 'do_object_repair' => 'إصلاح كل المستندات والمجلدات.', 'do_object_setchecksum' => 'تحديد فحص اخطاء', 'do_object_setfilesize' => 'تحديد حجم الملف', @@ -1254,6 +1251,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'تمكين الحافظة', 'settings_enableConverting' => 'تمكين التحويل', 'settings_enableConverting_desc' => 'تمكين التحويل', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'تمكين إسقاط قائمة المجلدات', 'settings_enableDropFolderList_desc' => 'تمكين إسقاط قائمة المجلدات', 'settings_enableDropUpload' => 'تمكين التحميل السريع', @@ -1437,6 +1436,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => ':عرض معاينة الصور (جدول القائمة)', 'settings_printDisclaimer' => 'طباعة تنويه', 'settings_printDisclaimer_desc' => 'طباعة تنويه', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'الحد الاقصى', 'settings_quota_desc' => 'الحد الاقصى', 'settings_removeFromDropFolder' => 'إزالة من مجلد الإسقاط', @@ -1736,6 +1741,7 @@ URL: [url]', 'tuesday' => 'الثلاثاء', 'tuesday_abbr' => 'ث', 'type_of_hook' => 'نوع المسار', +'type_to_filter' => '', 'type_to_search' => 'اكتب لتبحث', 'uk_UA' => 'ﺍﻮﻛﺭﺎﻨﻳ', 'under_folder' => 'في المجلد', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 78e7d2123..a6dd6ec83 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -278,7 +278,6 @@ $text = array( 'converter_new_cmd' => '', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => 'Създай пълнотекстов индекс', 'create_fulltext_index_warning' => 'Вие искате да пресъздадете пълнотекстов индекс. Това ще отнеме време и ще понижи производителността. Да продолжа ли?', 'creation_date' => 'Създаден', @@ -369,8 +368,6 @@ $text = array( 'download' => 'Изтегли', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Поправи всички папки и документи', 'do_object_setchecksum' => 'Установи контролна сума', 'do_object_setfilesize' => 'Установи размер на файла', @@ -1117,6 +1114,8 @@ $text = array( 'settings_enableClipboard_desc' => '', 'settings_enableConverting' => 'Включи конвертирането', 'settings_enableConverting_desc' => 'Включване/изключване конвертирането на файлове', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => '', @@ -1300,6 +1299,12 @@ $text = array( 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Показвай дисклаймер', 'settings_printDisclaimer_desc' => 'Ако е включено, то дисклаймер из lang.inc ще се показва под всяка страница', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Квота за потребител', 'settings_quota_desc' => 'Максималният брой байтове, които всеки потребител може да заема на диска. 0 за неограничено използване на диска. Тази стойност може да бъде презаписана за всяко използване на профила.', 'settings_removeFromDropFolder' => '', @@ -1590,6 +1595,7 @@ $text = array( 'tuesday' => 'вторник', 'tuesday_abbr' => '', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Тип за търсене', 'uk_UA' => 'Украински', 'under_folder' => 'В папка', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 6ceb825e4..74a04a389 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -283,7 +283,6 @@ URL: [url]', 'converter_new_cmd' => '', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => 'Crea un índex full-text', 'create_fulltext_index_warning' => '', 'creation_date' => 'Creació', @@ -374,8 +373,6 @@ URL: [url]', 'download' => 'Descarregar', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '', @@ -1122,6 +1119,8 @@ URL: [url]', 'settings_enableClipboard_desc' => '', 'settings_enableConverting' => '', 'settings_enableConverting_desc' => '', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => '', @@ -1305,6 +1304,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => '', 'settings_printDisclaimer_desc' => '', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => '', 'settings_quota_desc' => '', 'settings_removeFromDropFolder' => '', @@ -1595,6 +1600,7 @@ URL: [url]', 'tuesday' => 'Dimarts', 'tuesday_abbr' => '', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Cerca', 'uk_UA' => 'Ucraïnès', 'under_folder' => 'A carpeta', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 12b30b434..bde271cb4 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Příkaz', 'converter_new_mimetype' => 'Nový mimetype', 'copied_to_checkout_as' => 'Soubor zkopírován do kontrolního prostoru jako \'[filename]\' v [date]', -'create_download_link' => 'Vytvořit odkaz ke stažení', 'create_fulltext_index' => 'Vytvořit fulltext index', 'create_fulltext_index_warning' => 'Hodláte znovu vytvořit fulltext index. Může to trvat dlouho a zpomalit běh systému. Pokud víte, co děláte, potvďte operaci.', 'creation_date' => 'Vytvořeno', @@ -440,15 +439,6 @@ URL: [url]', 'download' => 'Stáhnout', 'download_extension' => 'Stáhnout rozšíření jako soubor ZIP', 'download_links' => 'Odkazy ke stažení', -'download_link_email_body' => 'Kliknutím na odkaz níže stáhnete verzi [version] dokumentu -\'[docname]\'. - -[url] - -Odkaz je platný do [valid]. - -[comment]', -'download_link_email_subject' => 'Odkaz ke stažení', 'do_object_repair' => 'Opravit všechny složky a dokumenty.', 'do_object_setchecksum' => 'Nastavit kontrolní součet', 'do_object_setfilesize' => 'Nastavit velikost souboru', @@ -1333,6 +1323,8 @@ Jméno: [username] 'settings_enableClipboard_desc' => 'Povolit/zakázat schránku', 'settings_enableConverting' => 'Povolit konverzi', 'settings_enableConverting_desc' => 'Povolit / zakázat konverzi souborů', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Povolit seznam souborů v drop složce v nabídce', 'settings_enableDropFolderList_desc' => 'Zapnout seznam souborů ve složce drop. Seznam je zobrazen v hlavní nabídce.', 'settings_enableDropUpload' => 'Povolit rychlý upload', @@ -1516,6 +1508,12 @@ Jméno: [username] 'settings_previewWidthMenuList_desc' => 'Šířka obrázků náhledu zobrazených jako položky v nabídce vhazovací složky.', 'settings_printDisclaimer' => 'Tisk vyloučení odpovědnosti', 'settings_printDisclaimer_desc' => 'Pokud je tato možnost povolena, vytiskne se zpráva na vyloučení odpovědnosti na spodní straně každé stránky', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Kvóta uživatele', 'settings_quota_desc' => 'Maximální počet bytů na disku, který může uživatel použít. Nula znamená neomezený prostor. Tato hodnota může být přepsána pro každé použití jeho profilu.', 'settings_removeFromDropFolder' => 'Odebrat soubor z vhazovací složky po úspěšném nahrání', @@ -1815,6 +1813,7 @@ URL: [url]', 'tuesday' => 'Úterý', 'tuesday_abbr' => 'Út', 'type_of_hook' => 'Typ hooku', +'type_to_filter' => '', 'type_to_search' => 'Zadejte hledaný výraz', 'uk_UA' => 'Ukrajinština', 'under_folder' => 'Ve složce', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 2cdcc2d55..dac2d9192 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2740), dgrutsch (22) +// Translators: Admin (2749), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Kommando', 'converter_new_mimetype' => 'Neuer Mime-Type', 'copied_to_checkout_as' => 'Datei am [date] in den Checkout-Space als \'[filename]\' kopiert.', -'create_download_link' => 'Erzeuge Download Link', 'create_fulltext_index' => 'Erzeuge Volltext-Index', 'create_fulltext_index_warning' => 'Sie möchten den Volltext-Index neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.', 'creation_date' => 'Erstellt am', @@ -440,14 +439,6 @@ URL: [url]', 'download' => 'Download', 'download_extension' => 'Erweiterung als zip-Datei herunterladen', 'download_links' => 'Download Links', -'download_link_email_body' => 'Klicken Sie bitte auf den untenstehenden Link, um Version [version] des Dokuments \'[docname]\' herunter zu laden. - -[url] - -Der Link ist bis zum [valid] gültig. - -[comment]', -'download_link_email_subject' => 'Download-Link', 'do_object_repair' => 'Repariere alle Ordner und Dokumente.', 'do_object_setchecksum' => 'Setze Check-Summe', 'do_object_setfilesize' => 'Setze Dateigröße', @@ -1343,6 +1334,8 @@ Name: [username] 'settings_enableClipboard_desc' => 'Schaltet die Zwischenablage auf der \'View Folder\' Seite ein/aus', 'settings_enableConverting' => 'Dokumentenkonvertierung einschalten', 'settings_enableConverting_desc' => 'Ein/Auschalten der automatischen Konvertierung von Dokumenten', +'settings_enableDebugMode' => 'Debug Modus', +'settings_enableDebugMode_desc' => 'Einschalten, um den Debug Modus einzuschalten, der ein weiteres Menu in den Admin-Werkzeugen hinzufügt.', 'settings_enableDropFolderList' => 'Liste der Dateien im Ablageordner im Menü', 'settings_enableDropFolderList_desc' => 'Schaltet einen Liste der im Ablageordner befindlichen Dateien als Eintrag im Menü ein.', 'settings_enableDropUpload' => 'Schnelles Hochladen einschalten', @@ -1526,6 +1519,12 @@ Name: [username] 'settings_previewWidthMenuList_desc' => 'Setzt die Breite der Bilder im Menu der Dateien im Ablageordner.', 'settings_printDisclaimer' => 'Rechtliche Hinweise', 'settings_printDisclaimer_desc' => 'Anwählen, um die rechtlichen Hinweise am Ende jeder Seite anzuzeigen.', +'settings_proxyUPassword' => 'Passwort für Proxy', +'settings_proxyUPassword_desc' => 'Passwort für die Authentifizierung am Proxy', +'settings_proxyUrl' => 'URL des Proxy', +'settings_proxyUrl_desc' => 'URL des Proxy welcher für Zugriffe auf das Extension-Repository verwendet wird.', +'settings_proxyUser' => 'Benutzername für Proxy', +'settings_proxyUser_desc' => 'Benutzername zur Authentifizierung am Proxy', 'settings_quota' => 'User\'s quota', 'settings_quota_desc' => 'Die maximale Anzahl Bytes, die ein Benutzer belegen darf. Setzen Sie diesen Wert auf 0 für unbeschränkten Plattenplatz. Dieser Wert kann individuell in den Benutzereinstellungen überschrieben werden.', 'settings_removeFromDropFolder' => 'Datei aus Ablageordner nach erfolgreichem Hochladen löschen', @@ -1825,6 +1824,7 @@ URL: [url]', 'tuesday' => 'Dienstag', 'tuesday_abbr' => 'Di', 'type_of_hook' => 'Typ', +'type_to_filter' => 'Hier tippen zum Filtern der Liste', 'type_to_search' => 'Hier tippen zum Suchen', 'uk_UA' => 'Ukrainisch', 'under_folder' => 'In Ordner', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 715309939..20806504c 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -278,7 +278,6 @@ $text = array( 'converter_new_cmd' => '', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => '', 'create_fulltext_index_warning' => '', 'creation_date' => 'Δημιουργήθηκε', @@ -369,8 +368,6 @@ $text = array( 'download' => '', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '', @@ -1128,6 +1125,8 @@ URL: [url]', 'settings_enableClipboard_desc' => '', 'settings_enableConverting' => '', 'settings_enableConverting_desc' => '', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => '', @@ -1311,6 +1310,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => '', 'settings_printDisclaimer_desc' => '', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => '', 'settings_quota_desc' => '', 'settings_removeFromDropFolder' => '', @@ -1601,6 +1606,7 @@ URL: [url]', 'tuesday' => 'Τρίτη', 'tuesday_abbr' => '', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => '', 'uk_UA' => 'Ουκρανικά', 'under_folder' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 118ecd4f5..8e5dc8f40 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1839), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1848), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Command', 'converter_new_mimetype' => 'New mimetype', 'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\' on [date]', -'create_download_link' => 'Create download link', 'create_fulltext_index' => 'Create fulltext index', 'create_fulltext_index_warning' => 'You are about to recreate the fulltext index. This can take a considerable amount of time and reduce your overall system performance. If you really want to recreate the index, please confirm your operation.', 'creation_date' => 'Created', @@ -440,15 +439,6 @@ URL: [url]', 'download' => 'Download', 'download_extension' => 'Download extension as zip file', 'download_links' => 'Download links', -'download_link_email_body' => 'Click on the link below to download the version [version] of document -\'[docname]\'. - -[url] - -The link is valid until [valid]. - -[comment]', -'download_link_email_subject' => 'Download link', 'do_object_repair' => 'Repair all folders and documents.', 'do_object_setchecksum' => 'Set checksum', 'do_object_setfilesize' => 'Set file size', @@ -1338,6 +1328,8 @@ Name: [username] 'settings_enableClipboard_desc' => 'Enable/disable the clipboard on the \'View Folder\' page', 'settings_enableConverting' => 'Enable Converting', 'settings_enableConverting_desc' => 'Enable/disable converting of files', +'settings_enableDebugMode' => 'Debug mode', +'settings_enableDebugMode_desc' => 'Enable this to turn on debug mode which adds a new menu in the admin tools', 'settings_enableDropFolderList' => 'Enable list of files in drop folder in menu', 'settings_enableDropFolderList_desc' => 'Turn on a list of files in the drop folder. The list is shown in the main menu.', 'settings_enableDropUpload' => 'Enable Fast Upload', @@ -1521,6 +1513,12 @@ Name: [username] 'settings_previewWidthMenuList_desc' => 'Width of preview images shown as items in drop folder menu.', 'settings_printDisclaimer' => 'Print Disclaimer', 'settings_printDisclaimer_desc' => 'If enabled, the disclaimer message will be printed on the bottom of every page', +'settings_proxyUPassword' => 'Password for proxy', +'settings_proxyUPassword_desc' => 'Password for authentication at the proxy', +'settings_proxyUrl' => 'URL of proxy', +'settings_proxyUrl_desc' => 'URL of proxy used for accessing the extension repository.', +'settings_proxyUser' => 'User name used for proxy', +'settings_proxyUser_desc' => 'User name used for authentication with the proxy', 'settings_quota' => 'User\'s quota', 'settings_quota_desc' => 'The maximum number of bytes a user may use on disk. Set this to 0 for unlimited disk space. This value can be overridden for each user in his profile.', 'settings_removeFromDropFolder' => 'Remove file from drop folder after successful upload', @@ -1820,6 +1818,7 @@ URL: [url]', 'tuesday' => 'Tuesday', 'tuesday_abbr' => 'Tu', 'type_of_hook' => 'Type', +'type_to_filter' => 'Type to filter list', 'type_to_search' => 'Type to search', 'uk_UA' => 'Ukrainian', 'under_folder' => 'In Folder', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 6fcfee4d7..1884d2f26 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,14 +19,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (1130), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (1133), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', '2_factor_auth_info' => '', '2_fact_auth_secret' => '', 'accept' => 'Aceptar', -'access_control' => '', +'access_control' => 'Control de acceso', 'access_control_is_off' => '', 'access_denied' => 'Acceso denegado', 'access_inheritance' => 'Acceso heredado', @@ -302,7 +302,6 @@ URL: [url]', 'converter_new_cmd' => 'Comando', 'converter_new_mimetype' => 'Nuevo mime type', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => 'Crear índice de texto completo', 'create_fulltext_index_warning' => 'Usted va a regenerar el índice te texto completo. Esto puede tardar un tiempo considerable y consumir capacidad de su equipo. Si realmente quiere regenerar el índice, por favor confirme la operación.', 'creation_date' => 'Creación', @@ -315,7 +314,7 @@ URL: [url]', 'databasesearch' => 'Búsqueda en base de datos', 'date' => 'Fecha', 'days' => 'días', -'debug' => '', +'debug' => 'Depuración', 'december' => 'Diciembre', 'default_access' => 'Modo de acceso por defecto', 'default_keywords' => 'Palabras clave disponibles', @@ -423,8 +422,6 @@ URL: [url]', 'download' => 'Descargar', 'download_extension' => 'Descargar como archivo zip', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Reparar todas las carpetas y documentos.', 'do_object_setchecksum' => 'Set checksum', 'do_object_setfilesize' => 'Asignar tamaño de fichero', @@ -1097,7 +1094,7 @@ URL: [url]', 'role_admin' => 'Administrador', 'role_guest' => 'Invitado', 'role_info' => '', -'role_management' => '', +'role_management' => 'Administración de roles', 'role_name' => '', 'role_type' => '', 'role_user' => 'Usuario', @@ -1269,6 +1266,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Habilitar/deshabilitar el portapapeles', 'settings_enableConverting' => 'Habilitar conversión', 'settings_enableConverting_desc' => 'Habilitar/Deshabilitar conversión de ficheros', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Habilitar lista de archivos en la carpeta de subida en el menú', 'settings_enableDropFolderList_desc' => 'Habilita una lista de archivos en la carpeta desplegable. Lista mostrada en menú principal.', 'settings_enableDropUpload' => 'Habilitar Subida Rapida', @@ -1452,6 +1451,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => 'Ancho de las imágenes mostradas en vista previa dell menú desplegable.', 'settings_printDisclaimer' => 'Mostrar renuncia', 'settings_printDisclaimer_desc' => 'Si es Verdadero el mensaje de renuncia de los ficheros lang.inc se mostratá al final de la página', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Cuota de usuario', 'settings_quota_desc' => 'El número máximo de bytes que el usuario puede ocupar en disco. Asignar 0 para no limitar el espacio de disco. Este valor puede ser sobreescrito por cada uso en su perfil.', 'settings_removeFromDropFolder' => 'Elimina el archivo de la carpeta de subida despues de una subida exitosa', @@ -1751,6 +1756,7 @@ URL: [url]', 'tuesday' => 'Martes', 'tuesday_abbr' => 'M', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Tipo de búsqueda', 'uk_UA' => 'Ucraniano', 'under_folder' => 'En carpeta', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 05c46e55c..ce5b6de07 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1099), jeromerobert (50), lonnnew (9), Oudiceval (767) +// Translators: Admin (1101), jeromerobert (50), lonnnew (9), Oudiceval (767) $text = array( '2_factor_auth' => 'Authentification forte', @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Commande', 'converter_new_mimetype' => 'Nouveau type MIME', 'copied_to_checkout_as' => 'Fichier copié dans l’espace de blocage en tant que « [filename] » ([date])', -'create_download_link' => 'Créer un lien de téléchargement', 'create_fulltext_index' => 'Créer un index de recherche plein texte', 'create_fulltext_index_warning' => 'Vous allez recréer l\'index de recherche plein texte. Cela peut prendre un temps considérable et réduire les performances de votre système dans son ensemble. Si vous voulez vraiment recréer l\'index, merci de confirmer votre opération.', 'creation_date' => 'Créé le', @@ -440,15 +439,6 @@ URL: [url]', 'download' => 'Téléchargement', 'download_extension' => 'Télécharger l’extension en tant que fichier zip', 'download_links' => 'Liens de téléchargement', -'download_link_email_body' => 'Cliquez sur le lien suivant pour télécharger la version [version] du document -« [docname] ». - -[url] - -Le lien est valide jusqu’au [valid]. - -[comment]', -'download_link_email_subject' => 'Lien de téléchargement', 'do_object_repair' => 'Réparer tous les dossiers et documents.', 'do_object_setchecksum' => 'Définir checksum', 'do_object_setfilesize' => 'Définir la taille du fichier', @@ -755,7 +745,7 @@ URL: [url]', 'link_to_version' => 'Version', 'list_access_rights' => 'Liste des droits d’accès…', 'list_contains_no_access_docs' => 'La liste contient des documents auxquels vous n’avez pas accès et qui ne sont donc pas affichés.', -'list_hooks' => '', +'list_hooks' => 'Liste livre', 'list_tasks' => '', 'local_file' => 'Fichier local', 'locked_by' => 'Verrouillé par', @@ -1322,6 +1312,8 @@ Nom : [username] 'settings_enableClipboard_desc' => 'Active/désactive le presse-papier', 'settings_enableConverting' => 'Activer conversion des fichiers', 'settings_enableConverting_desc' => 'Active/désactive la conversion des fichiers', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Activer la liste des fichiers du dossier de dépôt', 'settings_enableDropFolderList_desc' => 'Affiche un menu avec la liste des fichiers qui se trouvent dans le dossier de dépôt.', 'settings_enableDropUpload' => 'Activer la publication rapide de documents', @@ -1505,6 +1497,12 @@ Nom : [username] 'settings_previewWidthMenuList_desc' => 'Largeur des vignettes affichées dans le menu déroulant « Dossier de dépôt ».', 'settings_printDisclaimer' => 'Afficher la clause de non-responsabilité', 'settings_printDisclaimer_desc' => 'Si activé, le message d’avertissement sera affiché en bas de chaque page.', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Quota de l\'utilisateur', 'settings_quota_desc' => 'Espace maximum (en octets) qu’un utilisateur peut occuper sur le disque. Définir à 0 pour un espace illimité. Une valeur spécifique peut être définie par utilisateur depuis son profil.', 'settings_removeFromDropFolder' => 'Supprimer le fichier du dossier de dépôt après un chargement réussi', @@ -1588,7 +1586,7 @@ Nom : [username] 'settings_workflowMode' => 'Mode workflow', 'settings_workflowMode_desc' => 'Le workflow avancé permet de définir son propre workflow de parution pour les versions de documents.', 'settings_workflowMode_valadvanced' => 'avancé', -'settings_workflowMode_valnone' => '', +'settings_workflowMode_valnone' => 'aucun', 'settings_workflowMode_valtraditional' => 'traditionnel', 'settings_workflowMode_valtraditional_only_approval' => 'traditionnel (sans revue)', 'settings_zendframework' => 'Zend Framework', @@ -1804,6 +1802,7 @@ URL : [url]', 'tuesday' => 'Mardi', 'tuesday_abbr' => 'Mar.', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Effectuer une recherche', 'uk_UA' => 'Ukrénien', 'under_folder' => 'Dans le dossier', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index a22baf794..9afd1a84b 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,14 +19,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1225), marbanas (16) +// Translators: Admin (1236), marbanas (16) $text = array( '2_factor_auth' => '', '2_factor_auth_info' => '', '2_fact_auth_secret' => '', 'accept' => 'Prihvati', -'access_control' => '', +'access_control' => 'Kontrola pristupa', 'access_control_is_off' => '', 'access_denied' => 'Odbijen pristup.', 'access_inheritance' => 'Nasljedivost razine pristupa', @@ -232,7 +232,7 @@ Internet poveznica: [url]', 'category_in_use' => 'Ovu kategoriju trenutno koriste dokumenti.', 'category_noname' => 'Nije dan naziv kategoriji.', 'ca_ES' => 'Katalonski', -'changelog_loading' => '', +'changelog_loading' => 'Molim pričekajte dok se promjena učita …', 'change_assignments' => 'Promjena zadataka', 'change_password' => 'Promjeni lozinku', 'change_password_message' => 'Vaša lozinka je promijenjena.', @@ -307,7 +307,6 @@ Internet poveznica: [url]', 'converter_new_cmd' => 'Komanda', 'converter_new_mimetype' => 'Novi tip datoteke', 'copied_to_checkout_as' => 'Datoteka je kopirana u prostor odjave kao \'[filename]\'', -'create_download_link' => '', 'create_fulltext_index' => 'Indeksiraj cijeli tekst', 'create_fulltext_index_warning' => 'Želite ponovo indeksirati cijeli tekst. To može duže potrajati i smanjiti sveukupne performanse sustava. Ako zaista želite ponovno indeksirati, molimo potvrdite vašu radnju.', 'creation_date' => 'Izrađeno', @@ -320,7 +319,7 @@ Internet poveznica: [url]', 'databasesearch' => 'Pretraživanje baze podataka', 'date' => 'Datum', 'days' => 'dani', -'debug' => '', +'debug' => 'Ispravljanje', 'december' => 'Prosinac', 'default_access' => 'Zadani način pristupa', 'default_keywords' => 'Dostupne ključne riječi', @@ -428,8 +427,6 @@ Internet poveznica: [url]', 'download' => 'Preuzimanje', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Popravi sve mape i dokumente.', 'do_object_setchecksum' => 'Postavi kontrolnu sumu', 'do_object_setfilesize' => 'Postavi veličinu datoteke', @@ -533,13 +530,13 @@ Internet poveznica: [url]', 'expiry_changed_email_subject' => '[sitename]: [name] - Promijenjen datum isteka', 'export' => 'Izvoz', 'extension_archive' => '', -'extension_changelog' => '', -'extension_loading' => '', +'extension_changelog' => 'Popis promjena', +'extension_loading' => 'Učitavanje dodataka…', 'extension_manager' => 'Upravljanje ekstenzijama', 'extension_mgr_installed' => '', -'extension_mgr_no_upload' => '', -'extension_mgr_repository' => '', -'extension_version_list' => '', +'extension_mgr_no_upload' => 'Upload novih ekstenzija nije moguć pošto mapa ekstenzija nema dozvolu pisanja', +'extension_mgr_repository' => 'Dostupno', +'extension_version_list' => 'Inačice', 'february' => 'Veljača', 'file' => 'Datoteka', 'files' => 'Datoteke', @@ -729,7 +726,7 @@ Internet poveznica: [url]', 'link_to_version' => '', 'list_access_rights' => 'Izlistaj sve dozvole pristupa', 'list_contains_no_access_docs' => '', -'list_hooks' => '', +'list_hooks' => 'Kuke za popise', 'list_tasks' => '', 'local_file' => 'Lokalna datoteka', 'locked_by' => 'Zaključao', @@ -1118,7 +1115,7 @@ Internet poveznica: [url]', 'role_admin' => 'Administrator', 'role_guest' => 'Gost', 'role_info' => '', -'role_management' => '', +'role_management' => 'Upravljanje ulogama', 'role_name' => '', 'role_type' => '', 'role_user' => 'Korisnik', @@ -1141,7 +1138,7 @@ Internet poveznica: [url]', 'scheduler_class_description' => '', 'scheduler_class_parameter' => '', 'scheduler_class_tasks' => '', -'scheduler_task_mgr' => '', +'scheduler_task_mgr' => 'Rokovnik', 'search' => 'Traži', 'search_fulltext' => 'Traži u cijelom tekstu', 'search_in' => 'Traži u', @@ -1290,6 +1287,8 @@ Internet poveznica: [url]', 'settings_enableClipboard_desc' => 'Omogući/onemogući međuspremnik na \'Vidi mapu\' stranici', 'settings_enableConverting' => 'Omogući pretvaranje', 'settings_enableConverting_desc' => 'Omogući/onemogući pretvaranje datoteka', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => 'Omogući brzo učitavanje', @@ -1473,6 +1472,12 @@ Internet poveznica: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Ispiši odricanje od odgovornosti', 'settings_printDisclaimer_desc' => 'Ako je omogućeno, poruka odricanja od odgovornosti će se ispisati na dnu svake stranice', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Korisnička kvota', 'settings_quota_desc' => 'Maksimalni broj bajtova na disku koji korisnik može koristiti. Postavite na 0 za neograničeni prostor na disku. Ova vrijednost može biti postavljena svakom korisniku u njegovom profilu.', 'settings_removeFromDropFolder' => '', @@ -1772,6 +1777,7 @@ Internet poveznica: [url]', 'tuesday' => 'Utorak', 'tuesday_abbr' => 'Ut', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Unesi za pretragu', 'uk_UA' => 'Ukrajinski', 'under_folder' => 'U mapi', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 46dd35452..e1adaf639 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -302,7 +302,6 @@ URL: [url]', 'converter_new_cmd' => '', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => 'Teljes szöveg index létrehozása', 'create_fulltext_index_warning' => 'Ön a teljes szöveg index újraépítését kezdeményezte. Ez a művelet hosszú ideig eltarthat és jelentősen csökkentheti az egész rendszer teljesítményét. Ha biztosan újra kívánja építeni az indexet, kérjük erősítse meg a műveletet.', 'creation_date' => 'Létrehozva', @@ -423,8 +422,6 @@ URL: [url]', 'download' => 'Letöltés', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Valamennyi mappa és dokumentum helyreállítása.', 'do_object_setchecksum' => 'Ellenőrző összeg beállítása', 'do_object_setfilesize' => 'Állomány méret beállítása', @@ -1268,6 +1265,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Vágólap engedélyezés/tiltás', 'settings_enableConverting' => 'Konvertálás engedélyezése', 'settings_enableConverting_desc' => 'Engedélyezi/tiltja az állományok konverzióját', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => 'Gyorsfeltöltés engedélyezése', @@ -1451,6 +1450,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Nyilatkozat nyomtatása', 'settings_printDisclaimer_desc' => 'Ha igaz a nyilatkozat üzenet a lang.inc állományok lesznek kiíratva a lap alján', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Felhasználói kvóta', 'settings_quota_desc' => 'A felhasználó által a lemezen használható bájtok legnagyobb száma. Állítsa 0-ra a korlátlan lemezterülethez. Ez az érték felülírható valamennyi felhasználó saját profiljában.', 'settings_removeFromDropFolder' => '', @@ -1750,6 +1755,7 @@ URL: [url]', 'tuesday' => 'Kedd', 'tuesday_abbr' => 'Ke', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Adja meg a keresendő kifejezést', 'uk_UA' => 'Ukrán', 'under_folder' => 'Mappában', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index d7771c38b..c497531c8 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2018), rickr (144), s.pnt (26) +// Translators: Admin (2019), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Comando', 'converter_new_mimetype' => 'Nuovo mimetype', 'copied_to_checkout_as' => 'File copiato come \'[filename]\'', -'create_download_link' => 'Crea collegamento di scaricamento', 'create_fulltext_index' => 'Crea indice fulltext', 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.', 'creation_date' => 'Data creazione', @@ -433,15 +432,6 @@ URL: [url]', 'download' => 'Scarica', 'download_extension' => 'Scarica estensione come file zip', 'download_links' => 'Collegamenti di scaricamento', -'download_link_email_body' => 'Fare clic sul collegamento sottostante per scaricare la versione [version] del documento -\'[docname]\'. - -[url] - -Il collegamento The link è ancora valido fino a [valid]. - -[comment]', -'download_link_email_subject' => 'Collegamento di scaricamento', 'do_object_repair' => 'Ripara tutte le cartelle e i documenti.', 'do_object_setchecksum' => 'Imposta il checksum', 'do_object_setfilesize' => 'Imposta la dimensione del file', @@ -1324,6 +1314,8 @@ Name: [username] 'settings_enableClipboard_desc' => 'Abilita/disabilita la clipboard sulla pagina \'Vista cartella\'', 'settings_enableConverting' => 'Abilita conversione', 'settings_enableConverting_desc' => 'Abilita/disabilita la conversione dei files', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Abilita lista dei file nella cartella di pubblicazione', 'settings_enableDropFolderList_desc' => 'Abilita la lista dei file nella cartella di pubblicazione. La lista viene mostrata nel menù principale.', 'settings_enableDropUpload' => 'Abilita caricamento veloce', @@ -1372,7 +1364,7 @@ Name: [username] 'settings_enableReceiptWorkflow_desc' => 'Abilitare per attivare le ricevute di notifica nel flusso di lavoro.', 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle', 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.', -'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject' => 'Respinto da un revisore', 'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => 'Rifiutato da un revisore', 'settings_enableRevisionOnVoteReject_desc' => 'Se impostato, il documento verrà rifiutato se un revisore rifiuta il documento.', @@ -1507,6 +1499,12 @@ Name: [username] 'settings_previewWidthMenuList_desc' => 'Larghezza immagine di anteprima mostrata come articolo nel menu cartella di pubblicazione.', 'settings_printDisclaimer' => 'Mostra disclaimer', 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Quota utente', 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.', 'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il caricamento', @@ -1806,6 +1804,7 @@ URL: [url]', 'tuesday' => 'Martedì', 'tuesday_abbr' => 'Mar', 'type_of_hook' => 'Tipo', +'type_to_filter' => '', 'type_to_search' => 'Digitare per cercare', 'uk_UA' => 'Ucraino', 'under_folder' => 'Nella cartella', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 303a1cc14..c3c4d3608 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -310,7 +310,6 @@ URL: [url]', 'converter_new_cmd' => '명령', 'converter_new_mimetype' => '새 MIME 형태', 'copied_to_checkout_as' => '체크아웃으로 파일(\'[filename]\')이 파일 복사됨', -'create_download_link' => '내려받기 연결 만들기', 'create_fulltext_index' => '전체 텍스트 인덱스 만들기', 'create_fulltext_index_warning' => '전체 자료의 텍스트 인덱스를 다시 만들 수 있습니다. 이것은 상당한 시간을 요구하며 진행되는 동안 시스템 성능을 감소시킬 수 있습니다. 인덱스를 재 생성하려면, 확인하시기 바랍니다.', 'creation_date' => '생성일', @@ -429,8 +428,6 @@ URL: [url]', 'download' => '내려받기', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => '모든 폴더와 문서를 복구', 'do_object_setchecksum' => '오류 검사', 'do_object_setfilesize' => '파일 크기 설정', @@ -1284,6 +1281,8 @@ URL : [url]', 'settings_enableClipboard_desc' => '\'View Folder\'의 클립 보드 활성화/비활성화', 'settings_enableConverting' => '변환 사용', 'settings_enableConverting_desc' => '활성화 / 비활성화 파일로 변환', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => '빠른 업로드 허용', @@ -1467,6 +1466,12 @@ URL : [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => '인쇄 면책 조항', 'settings_printDisclaimer_desc' => '활성인 경우 메시지 내역이 모든 페이지의 하단에 출력됩니다', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => '사용자의 할당량', 'settings_quota_desc' => '사용자가 디스크를 사용할 수 있습니다 최대 바이트 수. 무제한 디스크 공간 사용시 0으로 설정합니다. 각각 자신의 프로필에 사용을 위해이 값은 변경 할 수 있습니다.', 'settings_removeFromDropFolder' => '', @@ -1766,6 +1771,7 @@ URL : [url]', 'tuesday' => '화요일', 'tuesday_abbr' => '화', 'type_of_hook' => '유형', +'type_to_filter' => '', 'type_to_search' => '유형 검색', 'uk_UA' => '우크라이나어', 'under_folder' => '폴더', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 8c396a6b3..ea2a2072f 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -305,7 +305,6 @@ URL: [url]', 'converter_new_cmd' => 'ຄຳສັ່ງ', 'converter_new_mimetype' => 'ລະຄອນໃບຊະນິດຫນືື່ງ', 'copied_to_checkout_as' => 'ກັອບປີໄຟລໄປຍັງພື້ນທີ່ເຊັກເອົາເປັນ "[filename] " ໃນ [date]', -'create_download_link' => 'ສ້າງລີ້ງດາວໂຫລດ', 'create_fulltext_index' => 'ສ້າງດັດສະນີແບບເຕັມຮູບແບບ', 'create_fulltext_index_warning' => 'ເຈົ້າກຳລັງສ້າງດັດຊະນີຂໍ້ຄວາມເຕັມໄຫມ່ ອາດໄຊ້ເວລາເປັນຈຳນວນຫຼາຍແລະລົດປະສິດທິພາບໂດຍລວມຂອງລະບົບເຈົ້າ ຖ້າຫາກວ່າຕ້ອງການສ້າງດັດຊະນີໄຫມ່ກະລຸນາຢືນຢັນການດຳເນີນການຂອງເຈົ້າ', 'creation_date' => 'ສ້າງໄວ້', @@ -426,15 +425,6 @@ URL: [url]', 'download' => 'ດາວໂຫລດ', 'download_extension' => '', 'download_links' => 'ດາວໂຫລດລິ້ງ', -'download_link_email_body' => 'ຄິກທິລີ້ງດ້ານລຸ່ມ ເພື່ອດາວໂຫລດເວີຊັນ [version] ເອກະສານ -"[docname]". - -[url] - -ລິງນີ້ໄຊ້ໄດ້ຈົນເຖິງ [valid] - -[comment]', -'download_link_email_subject' => 'ລິ້ງດາວໂຫລດ', 'do_object_repair' => 'ສ້ອມແຊມໂຟລເດີ ແລະເອກະສານທັງໝົດ', 'do_object_setchecksum' => 'ຕັ້ງຄ່າການກວດສອບ', 'do_object_setfilesize' => 'ຕັ້ງຂະໜາດຟາຍ', @@ -1317,6 +1307,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'ເປີດ/ ປິດການໄຊ້ຄິບບອສໃນໜ້າຕ່າງ ວິວໂຟລເດີ', 'settings_enableConverting' => 'ເປີດໄຊ້ງານການແປງ', 'settings_enableConverting_desc' => 'ເປີດ/ ປິດການແປງຟາຍ', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'ເປີດໄຊ້ງານລາຍການໄຟລໃນໂຟລເດີໂດຍມີແບບແຖບເມນູແບບເລື່ອນລົງ', 'settings_enableDropFolderList_desc' => 'ເປີດລາຍການໄຟລໃນໂຟລເດີແບບເລື່ອນລົງ, ໃນລາຍການການຈະສະແດງໃນໜ້າຕ່າງຫຼັກ', 'settings_enableDropUpload' => 'ເປີດການໄຊ້ງານອັບໂຫລດຢ່າງວ່ອງໄວ', @@ -1500,6 +1492,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => 'ຄວາມກ້ວາງຂອງພາບຕົວຢ່າງທີ່ສະແດງເປັນລາຍການໃນເມນູໂຟເດີເດີແບບເລືອນລົງ', 'settings_printDisclaimer' => 'Print Disclaimer', 'settings_printDisclaimer_desc' => 'ຫາກເປີດໄຊ້ງານລະບົບຈະພິມຂໍ້ຄວາມປະຕິເສດຄວາມຮັບຜິດຊອບທີ່ດ້ານລຸ່ມຂອງທຸ', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'User ໂຄຣຕ້າຂອງຜູ້ໄຊ້', 'settings_quota_desc' => 'จำนวนไบต์สูงสุดที่ผู้ใช้อาจใช้บนดิสก์ ตั้งค่าเป็น 0 สำหรับพื้นที่ดิสก์ไม่ จำกัด ค่านี้สามารถแทนที่ได้สำหรับผู้ใช้แต่ละรายในโปรไฟล์ของเขา.', 'settings_removeFromDropFolder' => 'ຍ້າຍໄຟລອອກຈາກໂຟລເດີແບບເລື່ອນລົງຫຼັງຈາກອັບໂຫລດສຳເລັດແລ້ວ', @@ -1799,6 +1797,7 @@ URL: [url]', 'tuesday' => 'ວັນອັງຄານ', 'tuesday_abbr' => 'ວັນອັງຄານ', 'type_of_hook' => 'ຊະນິດ', +'type_to_filter' => '', 'type_to_search' => 'ພິມເພື່ອຄົ້ນຫາ', 'uk_UA' => 'ຢູເຄຣນ', 'under_folder' => 'ໃນໂຟລເດີ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 882d911b2..b0c99387e 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -300,7 +300,6 @@ URL: [url]', 'converter_new_cmd' => 'Wijziging: nieuw commando', 'converter_new_mimetype' => 'Wijziging: nieuw mimetype', 'copied_to_checkout_as' => 'Gekopieerd naar checkout als:', -'create_download_link' => 'Maak een download-link', 'create_fulltext_index' => 'Creeer volledige tekst index', 'create_fulltext_index_warning' => 'U staat op het punt de volledigetekst opnieuw te indexeren. Dit kan behoorlijk veel tijd en snelheid vergen van het systeem. Als u zeker bent om opnieuw te indexeren, bevestig deze actie.', 'creation_date' => 'Aangemaakt', @@ -421,15 +420,6 @@ URL: [url]', 'download' => 'Download', 'download_extension' => 'Download extensie als zip file', 'download_links' => 'Download-links', -'download_link_email_body' => 'Klik op de link hieronder, dan begint de download vanvversie [version] van het document -\'[docname]\'. - -[url] - -De link is geldig tot [valid]. - -[comment]', -'download_link_email_subject' => 'Onderwerp', 'do_object_repair' => 'Repareer alle mappen en documenten.', 'do_object_setchecksum' => 'Set checksum', 'do_object_setfilesize' => 'Voer bestandgrootte in', @@ -1314,6 +1304,8 @@ Name: [username] 'settings_enableClipboard_desc' => 'Activeer/ blokkeer het klembord', 'settings_enableConverting' => 'Documenten converteren', 'settings_enableConverting_desc' => 'Inschakelen/uitschakelen conversie van bestanden naar PDF', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Inschakelen van de lijst van files in dropfolder.', 'settings_enableDropFolderList_desc' => 'De lijst van files in Dropfolder zichtbaar maken in het menu', 'settings_enableDropUpload' => 'Inschakelen Snelle Upload', @@ -1497,6 +1489,12 @@ Name: [username] 'settings_previewWidthMenuList_desc' => 'Breedte van het voorbeeld als dropfolder', 'settings_printDisclaimer' => 'Vrijwaring afdrukken', 'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwaringsbericht bestanden worden getoond onderaan de pagina', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Gebruikersquotum', 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.', 'settings_removeFromDropFolder' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload', @@ -1796,6 +1794,7 @@ URL: [url]', 'tuesday' => 'dinsdag', 'tuesday_abbr' => 'di', 'type_of_hook' => 'Soort hook', +'type_to_filter' => '', 'type_to_search' => 'zoeken naar', 'uk_UA' => 'Oekraïens', 'under_folder' => 'In map', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index ee1cd8898..11c78c7a7 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (854), netixw (84), romi (93), uGn (112) +// Translators: Admin (861), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -129,7 +129,7 @@ URL: [url]', 'archive_creation_warning' => 'Ta operacja utworzy archiwum zawierające pliki z całego repozytorium. Po utworzeniu archiwum będzie zapisane w folderze na serwerze.
          UWAGA: archiwum utworzone jako czytelne dla ludzi będzie bezużyteczne jako kopia serwera.', 'ar_EG' => 'Arabski', 'assign_approvers' => 'Przypisz osoby akceptujące', -'assign_recipients' => '', +'assign_recipients' => 'Przypisz Odbiorców', 'assign_reviewers' => 'Przypisz recenzentów', 'assign_user_property_to' => 'Przypisz właściwości użytkownika do', 'assumed_released' => 'Assumed released', @@ -295,7 +295,6 @@ URL: [url]', 'converter_new_cmd' => 'Komenda', 'converter_new_mimetype' => 'Nowy typ MIME', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => 'Utwórz indeks pełnotekstowy', 'create_fulltext_index_warning' => 'Zamierzasz ponownie utworzyć indeks pełnotekstowy. To może zająć sporo czasu i ograniczyć ogólną wydajność systemu. Jeśli faktycznie chcesz to zrobić, proszę potwierdź tę operację.', 'creation_date' => 'Utworzony', @@ -416,8 +415,6 @@ URL: [url]', 'download' => 'Pobierz', 'download_extension' => 'Pobierz rozszerzenie w pliku zip', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Napraw wszystkie katalogi i pliki.', 'do_object_setchecksum' => 'Ustaw sumę kontrolną', 'do_object_setfilesize' => 'Podaj rozmiar pliku', @@ -637,7 +634,7 @@ URL: [url]', 'index_pending' => '', 'index_waiting' => 'Oczekiwanie', 'individuals' => 'Indywidualni', -'individuals_in_groups' => '', +'individuals_in_groups' => 'Członkowie grupy', 'info_recipients_tab_not_released' => '', 'inherited' => 'dziedziczony', 'inherits_access_copy_msg' => 'Kopiuj odziedziczoną listę dostępu', @@ -1124,18 +1121,18 @@ URL: [url]', 'select_group' => 'Wybierz grupę', 'select_groups' => 'Kliknij by wybrać grupy', 'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą', -'select_grp_ind_approvers' => '', +'select_grp_ind_approvers' => 'Kliknij by wybrać grupę', 'select_grp_ind_notification' => '', -'select_grp_ind_recipients' => '', -'select_grp_ind_reviewers' => '', +'select_grp_ind_recipients' => 'Kliknij by wybrać grupę', +'select_grp_ind_reviewers' => 'Kliknij by wybrać grupę', 'select_grp_ind_revisors' => '', 'select_grp_notification' => 'Kliknij, aby wybrać grupowe powiadomienia', -'select_grp_recipients' => '', +'select_grp_recipients' => 'Kliknij by wybrać grupę odbiorców', 'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów', 'select_grp_revisors' => '', 'select_ind_approvers' => 'Kliknij by wybrać zatwierdzającego', 'select_ind_notification' => 'Kliknij, aby wybrać indywidualne powiadomienia', -'select_ind_recipients' => '', +'select_ind_recipients' => 'Kliknij by wybrać indywidualnych odbiorców', 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta', 'select_ind_revisors' => '', 'select_one' => 'Wybierz', @@ -1248,6 +1245,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Włącz/wyłącz schowek', 'settings_enableConverting' => 'Włącz konwertowanie', 'settings_enableConverting_desc' => 'Włącz/Wyłącz konwertowanie plików', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => '', @@ -1431,6 +1430,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Wyświetlaj Zrzeczenie się', 'settings_printDisclaimer_desc' => 'Zaznaczenie tej opcji spowoduje, że na dole strony będzie wyświetlany komunikat zrzeczenia się zawarty w pliku lang.inc.', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Przydział dysku użytkownika', 'settings_quota_desc' => 'Maksymalna liczba bajtów jaką użytkownik może wykorzystać na dysku. Ustaw na 0 dla nieograniczonej przestrzeni dyskowej. Wartość ta może być zastąpiona dla każdego zastosowania w swoim profilu.', 'settings_removeFromDropFolder' => '', @@ -1730,6 +1735,7 @@ URL: [url]', 'tuesday' => 'Wtorek', 'tuesday_abbr' => 'Wt', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Wpisz wyszukiwane', 'uk_UA' => 'Ukrainski', 'under_folder' => 'W folderze', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index b158e678e..58d506f17 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1721), flaviove (627), lfcristofoli (352) +// Translators: Admin (1733), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => 'Autenticação de dois fatores', @@ -232,7 +232,7 @@ URL: [url]', 'category_in_use' => 'Esta categoria é usada atualmente por documentos.', 'category_noname' => 'Nenhum nome de categoria foi fornecido.', 'ca_ES' => 'Catalão', -'changelog_loading' => '', +'changelog_loading' => 'Favor aguardar até que o registro de modificações seja carregado …', 'change_assignments' => 'Definir revisor / aprovador', 'change_password' => 'Modificar senha', 'change_password_message' => 'Sua senha foi modificada.', @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Comando', 'converter_new_mimetype' => 'Novo mimetype', 'copied_to_checkout_as' => 'Arquivo copiado para o espaço de retirada como \'[nome do arquivo]\' em [date]', -'create_download_link' => 'Criar link de download', 'create_fulltext_index' => 'Criar índice de texto completo', 'create_fulltext_index_warning' => 'Você está para recriar o índice de texto completo. Isso pode levar uma quantidade considerável de tempo e reduzir o desempenho geral do sistema. Se você realmente deseja recriar o índice, por favor confirme a operação.', 'creation_date' => 'Criado', @@ -440,15 +439,6 @@ URL: [url]', 'download' => 'Download', 'download_extension' => 'Baixar extensão como arquivo zip', 'download_links' => 'Links para download', -'download_link_email_body' => 'Clique no link abaixo para baixar a versão [version] do documento -\'[docname]\'. - -[url] - -O link é válido até [valid]. - -[comment]', -'download_link_email_subject' => 'Link de download', 'do_object_repair' => 'Reparar todas as pastas e documentos.', 'do_object_setchecksum' => 'Defina soma de verificação', 'do_object_setfilesize' => 'Defina o tamanho do arquivo', @@ -852,7 +842,7 @@ URL: [url]', 'next_state' => 'Novo estado', 'nl_NL' => 'Holandês', 'no' => 'Não', -'notification' => '', +'notification' => 'Notificação', 'notify_added_email' => 'Você foi adicionado a lista de notificação', 'notify_added_email_body' => 'Adicionado a lista de notificação Nome: [name] @@ -872,7 +862,7 @@ URL: [url]', 'no_action' => 'Nenhuma ação é requerida', 'no_approval_needed' => 'Nenhuma aprovação pendente.', 'no_attached_files' => 'Não há arquivos anexados', -'no_backup_dir' => '', +'no_backup_dir' => 'Diretório de backup não foi configurado.', 'no_current_version' => 'Você está executando uma versão antiga do SeedDMS. A última versão disponível é [latestversion].', 'no_default_keywords' => 'não há palavras-chave disponíveis', 'no_docs_checked_out' => 'Nenhum documento retirado', @@ -1336,14 +1326,16 @@ Nome: [username] 'settings_enableClipboard_desc' => 'Habilitar/Desabilitar a área de transferência', 'settings_enableConverting' => 'Ativar conversão', 'settings_enableConverting_desc' => 'Ativar/desativar conversão de arquivos', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Ativar lista de arquivos na pasta suspensa no menu', 'settings_enableDropFolderList_desc' => 'Ativar uma lista de arquivos na pasta suspensa. A lista é mostrada no menu principal.', 'settings_enableDropUpload' => 'Habilitar Upload Rápido', 'settings_enableDropUpload_desc' => 'Habilitar / Desabilitar a área na página \'Vista de Pastas\' para upload de arquivos por Arrastar e Soltar.', 'settings_enableDuplicateDocNames' => 'Permitir nomes duplicados de documento', 'settings_enableDuplicateDocNames_desc' => 'Permite ter nomes de documentos duplicados em uma pasta.', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Permitir subpastas com nomes duplicados', +'settings_enableDuplicateSubFolderNames_desc' => 'Permitir ocorrência de subpastas com nomes duplicados em uma pasta.', 'settings_enableEmail' => 'Ativar E-mail', 'settings_enableEmail_desc' => 'Ativar/desativar a notificação de e-mail automático', 'settings_enableFilterReceipt' => 'Filtrar dono, revisor, ... da lista de recepção', @@ -1385,7 +1377,7 @@ Nome: [username] 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva', 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva proceáando as pastas e contando eáes documentos e pastas que o usuário tem permissão de acesso.', 'settings_enableRevisionOneVoteReject' => 'Rejeitar por um revisor', -'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOneVoteReject_desc' => 'Se habilitado, o status do documento vai ser configurado como \'precisa de correção\' até que o primeiro revisor rejeite o documento. se desabilitado, o status do documento não vai ser alterado até que todos os revisores terminem suas revisões.', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Habilitar revisão de documentos', @@ -1478,14 +1470,14 @@ Nome: [username] 'settings_maxUploadSize' => 'Tamanho máximo para arquivos enviados.', 'settings_maxUploadSize_desc' => 'Esse é o tamanho máximo dos arquivos enviados. Ele terá efeito para versões de documentos e anexos.', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', -'settings_noDocumentFormFields' => '', -'settings_noDocumentFormFields_desc' => '', +'settings_noDocumentFormFields' => 'Ocultar estes campos', +'settings_noDocumentFormFields_desc' => 'Estes campo não serão mostrados quando adicionar ou editar um documento.Valores pré-existentes serão mantidos.', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', 'settings_no_content_dir' => 'Diretório de conteúdo', -'settings_onePageMode' => '', -'settings_onePageMode_desc' => '', +'settings_onePageMode' => 'Modo de página única', +'settings_onePageMode_desc' => 'O modo de página única vai habilitar um código javascript que vai atualizar a lista de pastas/documentos, navegação, etc. quando clicar em uma pasta ou alterar algum parâmetro de ordenação.', 'settings_overrideMimeType' => 'Substituir MimeType', 'settings_overrideMimeType_desc' => 'Substitua o MimeType entregue pelo navegador, se um arquivo for carregado. O novo MimeType é determinado pelo próprio SeedDMS.', 'settings_partitionSize' => 'Tamanho de arquivo parcial', @@ -1519,6 +1511,12 @@ Nome: [username] 'settings_previewWidthMenuList_desc' => 'Largura das imagens de visualização mostradas como itens no menu da pasta suspensa.', 'settings_printDisclaimer' => 'Imprimir Responsabilidade', 'settings_printDisclaimer_desc' => 'Se ativado, a mensagem de aviso de responsabilidade será mostrada na parte inferior de todas as páginas.', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Quota do Usuário', 'settings_quota_desc' => 'O número máximo de bytes que um utilizador pode usar no disco. Defina para 0 para o espaço em disco ilimitado. Este valor pode ser substituído para cada usuário em seu perfil.', 'settings_removeFromDropFolder' => 'Remover arquivo da pasta suspensa após o upload bem-sucedido', @@ -1602,7 +1600,7 @@ Nome: [username] 'settings_workflowMode' => 'Modo de fluxo de trabalho', 'settings_workflowMode_desc' => 'O fluxo de trabalho avançado permite especificar seu próprio fluxo de trabalho de liberação de versões de documentos.', 'settings_workflowMode_valadvanced' => 'avançado', -'settings_workflowMode_valnone' => '', +'settings_workflowMode_valnone' => 'Nenhum', 'settings_workflowMode_valtraditional' => 'tradicional', 'settings_workflowMode_valtraditional_only_approval' => 'tradicional (sem revisão)', 'settings_zendframework' => 'Zend Framework', @@ -1818,6 +1816,7 @@ URL: [url]', 'tuesday' => 'Terça-feira', 'tuesday_abbr' => 'Te', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Tipo de pesquisa', 'uk_UA' => 'Ucraniano', 'under_folder' => 'Na pasta', @@ -1874,7 +1873,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Com esta operação, você pode criar um arquivo contendo as informações de versão de uma pasta DMS inteira. Após a criação, todos os arquivos serão salvos dentro da pasta do documento.', 'versioning_info' => 'Informação de versionamento', 'versiontolow' => 'Versão para baixo', -'version_comment' => '', +'version_comment' => 'Comentários da versão', 'version_deleted_email' => 'Versão eliminado', 'version_deleted_email_body' => 'Versão apagada Documento: [name] diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 8806b4383..398c6bfae 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => '', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => 'Creați indexul pentru tot textul', 'create_fulltext_index_warning' => 'Sunteți pe cale sa recreați indexul pentru tot textul. Acest lucru poate dura o perioadă considerabilă de timp și poate reduce performanța sistemului în ansamblu. Dacă doriți cu adevărat să recreati indexul pentru tot textul, vă rugăm să confirmați operațiunea.', 'creation_date' => 'Creat', @@ -428,8 +427,6 @@ URL: [url]', 'download' => 'Descarca', 'download_extension' => 'Descarca extensia ca fisier zip', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Repară toate folderele și documentele.', 'do_object_setchecksum' => 'Setare sumă de control(checksum)', 'do_object_setfilesize' => 'Setare dimensiune fișier', @@ -1291,6 +1288,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Activare/dezactivare clipboard în pagina \'Vizualizare Folder\'', 'settings_enableConverting' => 'Activare Conversie', 'settings_enableConverting_desc' => 'Activare/dezactivare conversia fișierelor', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => 'Activare Încărcare rapidă', @@ -1474,6 +1473,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Print Disclaimer', 'settings_printDisclaimer_desc' => 'Dacă este setat, mesajul de Disclaimer din fișierele lang.inc va fi printat în partea de jos a paginii', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Spatiu alocat utilizator', 'settings_quota_desc' => 'Numărul maxim de bytes pe care un utilizator îi poate folosi pe disc. Setați această opțiune pe 0 pentru spatiu pe disc nelimitat. Această valoare poate fi suprascrisă în profilul fiecărui utilizăr.', 'settings_removeFromDropFolder' => '', @@ -1773,6 +1778,7 @@ URL: [url]', 'tuesday' => 'Marți', 'tuesday_abbr' => 'Ma', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Tastați pentru a căuta', 'uk_UA' => 'Ucraineană', 'under_folder' => 'In Folder', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 70f2de1b0..997dd8b0d 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Команда', 'converter_new_mimetype' => 'Новый mime тип', 'copied_to_checkout_as' => 'Файл скопирован в среду загрузки как \'[filename]\' на [date]', -'create_download_link' => '', 'create_fulltext_index' => 'Создать полнотекстовый индекс', 'create_fulltext_index_warning' => 'Вы хотите пересоздать полнотекстовый индекс. Это займёт какое-то время и снизит производительность. Продолжить?', 'creation_date' => 'Создан', @@ -428,8 +427,6 @@ URL: [url]', 'download' => 'Загрузить', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Исправить все каталоги и документы', 'do_object_setchecksum' => 'Установить контрольную сумму', 'do_object_setfilesize' => 'Установить размер файла', @@ -1298,6 +1295,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Включить/отключить буфер обмена.', 'settings_enableConverting' => 'Включить преобразование', 'settings_enableConverting_desc' => 'Включить/отключить преобразование файлов.', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => 'Включить быструю загрузку', @@ -1481,6 +1480,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Выводить предупреждение', 'settings_printDisclaimer_desc' => 'Если включено, то предупреждение из lang.inc будет выводится внизу каждой страницы.', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Квота пользователя', 'settings_quota_desc' => 'Максимально количество байт, которые пользователь может использовать на дисковом пространстве. Значение 0 снимает ограничение на используемое дисковое пространство. Это значение может быть указано отдельно для каждого пользователя в его профиле.', 'settings_removeFromDropFolder' => 'Удалить из проходного каталога', @@ -1780,6 +1785,7 @@ URL: [url]', 'tuesday' => 'Вторник', 'tuesday_abbr' => 'Вт', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Введите запрос', 'uk_UA' => 'Украинский', 'under_folder' => 'В каталоге', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 0e446b210..9ced5063f 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Príkaz', 'converter_new_mimetype' => 'Nový mime-type', 'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\' on [date]', -'create_download_link' => 'Vytvoriť odkaz na stiahnutie', 'create_fulltext_index' => 'Vytvoriť fulltext index', 'create_fulltext_index_warning' => 'Chystáte sa obnoviť fulltext index, čo môže dlho trvať a môže znížiť výkon systému. Ak chcete pokračovať, potvrďte svoju voľbu.', 'creation_date' => 'Vytvorené', @@ -440,15 +439,6 @@ URL: [url]', 'download' => 'Stiahnuť', 'download_extension' => 'Download extension as zip file', 'download_links' => 'Odkazy na stiahnutie', -'download_link_email_body' => 'Kliknite na doleuvedený odkaz a stiahnite verziu [version] dokumentu -\'[docname]\'. - -[url] - -Odkaz je platný do [valid]. - -[comment]', -'download_link_email_subject' => 'Odkaz na stiahnutie', 'do_object_repair' => 'Opraviť všetky zložky a dokumenty.', 'do_object_setchecksum' => 'Nastaviť kontrolný súčet', 'do_object_setfilesize' => 'Nastaviť veľkosť súboru', @@ -1338,6 +1328,8 @@ Meno: [username] 'settings_enableClipboard_desc' => 'Enable/disable the clipboard on the \'View Folder\' page', 'settings_enableConverting' => 'Povoliť konverziu', 'settings_enableConverting_desc' => 'Povoliť/zakázať konvertovať súbory', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Enable list of files in drop folder in menu', 'settings_enableDropFolderList_desc' => 'Turn on a list of files in the drop folder. The list is shown in the main menu.', 'settings_enableDropUpload' => 'Zapnúť rýchle nahratie', @@ -1521,6 +1513,12 @@ Meno: [username] 'settings_previewWidthMenuList_desc' => 'Šírka náhľadu obrázkov zobrazených ako položky v ponuke drop zložky.', 'settings_printDisclaimer' => 'Print Disclaimer', 'settings_printDisclaimer_desc' => 'If enabled, the disclaimer message will be printed on the bottom of every page', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Kvóta používateľa', 'settings_quota_desc' => 'The maximum number of bytes a user may use on disk. Set this to 0 for unlimited disk space. This value can be overridden for each user in his profile.', 'settings_removeFromDropFolder' => 'Remove file from drop folder after successful upload', @@ -1820,6 +1818,7 @@ URL: [url]', 'tuesday' => 'Utorok', 'tuesday_abbr' => 'Ut', 'type_of_hook' => 'Zadajte', +'type_to_filter' => '', 'type_to_search' => 'Zadajte na vyhľadanie', 'uk_UA' => 'Ukrajinsky', 'under_folder' => 'V zložke', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 7b38aae8a..210ff3508 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -308,7 +308,6 @@ URL: [url]', 'converter_new_cmd' => 'Kommando', 'converter_new_mimetype' => 'Ny MIME-typ', 'copied_to_checkout_as' => 'Filen har kopierats till utcheckningmappen som \'[filename]\' per [date]', -'create_download_link' => 'Skapa länk för nedladdning', 'create_fulltext_index' => 'Skapa fulltext-sökindex', 'create_fulltext_index_warning' => 'Du håller på att skapa fulltext-sökindex. Detta kan ta mycket lång tid och sakta ner den allmänna systemprestandan. Om du verkligen vill skapa indexet, bekräfta åtgärden.', 'creation_date' => 'Skapat', @@ -434,15 +433,6 @@ URL: [url]', 'download' => 'Ladda ner', 'download_extension' => '', 'download_links' => 'Nedladdningslänkar', -'download_link_email_body' => 'Klicka på länken nedan för nedladdning av version [version] av dokumentet -\'[docname]\'. - -[url] - -Länken är giltig t o m [valid]. - -[comment]', -'download_link_email_subject' => 'Nedladdningslänk', 'do_object_repair' => 'Reparera alla kataloger och dokument.', 'do_object_setchecksum' => 'Lägg till checksumma', 'do_object_setfilesize' => 'Ange filstorlek', @@ -1311,6 +1301,8 @@ Kommentar: [comment]', 'settings_enableClipboard_desc' => 'Aktivera/Inaktivera urklipp funktionen.', 'settings_enableConverting' => 'Aktivera filkonvertering', 'settings_enableConverting_desc' => 'Aktivera/Inaktivera konvertering av filer', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => 'Aktivera fillista för snabbuppladdade filer.', 'settings_enableDropFolderList_desc' => 'Aktiverar fillista för snabbuppladdade filer i menyfältet.', 'settings_enableDropUpload' => 'Aktivera snabb uppladdning', @@ -1494,6 +1486,12 @@ Kommentar: [comment]', 'settings_previewWidthMenuList_desc' => 'Bildbredd vid förhandsgranskning av dokument i snabbuppladdningsmenyn.', 'settings_printDisclaimer' => 'Visa disclaimer-meddelande', 'settings_printDisclaimer_desc' => 'Om denna inställning sätts till ja, används meddelande som finns i lang.inc-filen och skrivs ut på slutet av sidan', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Användarens kvot', 'settings_quota_desc' => 'Maximala storlek av lagringsutrymme i bytes som en användare har tillgång till. Storlek 0 bytes betyder obegränsad lagring. Detta värde kan sättas individuellt för varje användare i dess profil. 1 GB = ca 1 000 000 000 bytes.', 'settings_removeFromDropFolder' => 'Ta bort filen från snabbuppladdningslistan efter slutförd uppladdning', @@ -1793,6 +1791,7 @@ URL: [url]', 'tuesday' => 'Tisdag', 'tuesday_abbr' => 'Ti', 'type_of_hook' => 'Typ', +'type_to_filter' => '', 'type_to_search' => 'Skriv för att söka', 'uk_UA' => 'Ukrainska', 'under_folder' => 'I katalogen', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index ef31360ab..c63eecdd5 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -301,7 +301,6 @@ URL: [url]', 'converter_new_cmd' => 'Komut', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => 'Tam metin indeksi oluştur', 'create_fulltext_index_warning' => 'Tam metin indeksi yeniden oluşturmak üzeresiniz. Bu işlem bir hayli uzun sürebilir ve sistem performansını olumsuz etkileyebilir. Buna rağmen indeksi oluşturmak istiyorsanız lütfen bu işlemi onaylayın.', 'creation_date' => 'Oluşturma tarihi', @@ -422,8 +421,6 @@ URL: [url]', 'download' => 'İndir', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Tüm klasörleri ve dokümanları onar.', 'do_object_setchecksum' => 'Sağlama (checksum) ayarla', 'do_object_setfilesize' => 'Dosya boyutu ayarla', @@ -1270,6 +1267,8 @@ URL: [url]', 'settings_enableClipboard_desc' => '\'Klasör Görüntüle\' sayfasında panoyu etkinleştir/devredışı bırak', 'settings_enableConverting' => 'Dönüştürmeyi etkinleştir', 'settings_enableConverting_desc' => 'Dosyaları dönüştürmeyi etkinleştir/devredışı bırak', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => 'Hızlı Yüklemeyi Etkinleştir', @@ -1453,6 +1452,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Gizlilik Notu Yazdır', 'settings_printDisclaimer_desc' => 'Seçildiğinde sayfanın en altında lang.inc dosyasındaki gizlilik notu yazılacak', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Kullanıcı kotası', 'settings_quota_desc' => 'Kullanıcının yükleyebileceği maksimum dosya boyutu (byte cinsinden). Sınırsız kota için 0 girilir.', 'settings_removeFromDropFolder' => '', @@ -1752,6 +1757,7 @@ URL: [url]', 'tuesday' => 'Salı', 'tuesday_abbr' => 'Sa', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Aranacak sözcük yazınız', 'uk_UA' => 'Ukraynaca', 'under_folder' => 'Klasörde', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index aeef777b2..504dbde20 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -307,7 +307,6 @@ URL: [url]', 'converter_new_cmd' => 'Команда', 'converter_new_mimetype' => 'Новий mime тип', 'copied_to_checkout_as' => 'Файл скопійовано в середовище скачування як', -'create_download_link' => '', 'create_fulltext_index' => 'Створити повнотекстовий індекс', 'create_fulltext_index_warning' => 'Ви хочете перестворити повнотекстовий індекс. Це займе деякий час і знизить продуктивність. Продовжити?', 'creation_date' => 'Створено', @@ -428,8 +427,6 @@ URL: [url]', 'download' => 'Завантажити', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => 'Виправити всі каталоги і документи', 'do_object_setchecksum' => 'Встановити контрольну суму', 'do_object_setfilesize' => 'Встановити розмір файлу', @@ -1291,6 +1288,8 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Увімкнути/вимкнути буфер обміну.', 'settings_enableConverting' => 'Увімкнути перетворення', 'settings_enableConverting_desc' => 'Увімкнути/вимкнути перетворення файлів.', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => 'Увімкнути швидке завантаження', @@ -1474,6 +1473,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => 'Виводити попередження', 'settings_printDisclaimer_desc' => 'Якщо увімкнено, то попередження з lang.inc буде виводитися внизу кожної сторінки.', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => 'Квота користувача', 'settings_quota_desc' => 'Максимальна кількість байт, Які користувач може використовувати на дисковому просторі. Значення 0 знімає обмеження на дисковий простір. Це значення може бути вказано окремо для кожного користувача в його профілі.', 'settings_removeFromDropFolder' => '', @@ -1773,6 +1778,7 @@ URL: [url]', 'tuesday' => 'Вівторок', 'tuesday_abbr' => 'Вв', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => 'Введіть запит', 'uk_UA' => 'Українська', 'under_folder' => 'В каталозі', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index f3ad1d171..0a25764ae 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -299,7 +299,6 @@ URL: [url]', 'converter_new_cmd' => '', 'converter_new_mimetype' => '新建 MIME 类型', 'copied_to_checkout_as' => '', -'create_download_link' => '添加下载链接', 'create_fulltext_index' => '创建全文索引', 'create_fulltext_index_warning' => '你将重新创建全 文索引。这将花费一定的时间但是会提升系统的整体表现。如果你想要重新创建索引，请确 @@ -422,14 +421,6 @@ URL: [url]', 'download' => '下载', 'download_extension' => '以ZIP格式下载扩展', 'download_links' => '下载链接', -'download_link_email_body' => '点击以下链接下载文档 \'[docname]\' 的 [version] 版本。 - -[url] - -该链接有效性：[valid] - -[comment]', -'download_link_email_subject' => '下载链接', 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '设置文件大小', @@ -1272,6 +1263,8 @@ URL: [url]', 'settings_enableClipboard_desc' => '在【查看文件夹】页，启用/禁用粘贴板', 'settings_enableConverting' => '打开转换', 'settings_enableConverting_desc' => '打开/关闭文件转换', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '在菜单的拖拽文件夹中启用文件列表', 'settings_enableDropFolderList_desc' => '打开拖拽文件夹中的文件列表。该列表将在主菜单中显示。', 'settings_enableDropUpload' => '允许快速上传', @@ -1455,6 +1448,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '预览图像的宽度显示为丢弃文件夹菜单中的项目', 'settings_printDisclaimer' => '显示免责声明', 'settings_printDisclaimer_desc' => '如果开启，这个免责声明信息将在每个页面的底部显示', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => '设置磁盘配额', 'settings_quota_desc' => '', 'settings_removeFromDropFolder' => '', @@ -1745,6 +1744,7 @@ URL: [url]', 'tuesday' => 'Tuesday', 'tuesday_abbr' => '', 'type_of_hook' => '钩子类型', +'type_to_filter' => '', 'type_to_search' => '搜索类型', 'uk_UA' => '乌克兰语', 'under_folder' => '文件夹内', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 6dc1579cf..fb29f0bed 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -282,7 +282,6 @@ URL: [url]', 'converter_new_cmd' => '', 'converter_new_mimetype' => '', 'copied_to_checkout_as' => '', -'create_download_link' => '', 'create_fulltext_index' => '創建全文索引', 'create_fulltext_index_warning' => '', 'creation_date' => '創建日期', @@ -373,8 +372,6 @@ URL: [url]', 'download' => '下載', 'download_extension' => '', 'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', 'do_object_repair' => '', 'do_object_setchecksum' => '', 'do_object_setfilesize' => '設定檔案大小', @@ -1121,6 +1118,8 @@ URL: [url]', 'settings_enableClipboard_desc' => '', 'settings_enableConverting' => '', 'settings_enableConverting_desc' => '', +'settings_enableDebugMode' => '', +'settings_enableDebugMode_desc' => '', 'settings_enableDropFolderList' => '', 'settings_enableDropFolderList_desc' => '', 'settings_enableDropUpload' => '', @@ -1304,6 +1303,12 @@ URL: [url]', 'settings_previewWidthMenuList_desc' => '', 'settings_printDisclaimer' => '', 'settings_printDisclaimer_desc' => '', +'settings_proxyUPassword' => '', +'settings_proxyUPassword_desc' => '', +'settings_proxyUrl' => '', +'settings_proxyUrl_desc' => '', +'settings_proxyUser' => '', +'settings_proxyUser_desc' => '', 'settings_quota' => '', 'settings_quota_desc' => '', 'settings_removeFromDropFolder' => '', @@ -1594,6 +1599,7 @@ URL: [url]', 'tuesday' => 'Tuesday', 'tuesday_abbr' => '', 'type_of_hook' => '', +'type_to_filter' => '', 'type_to_search' => '搜索類型', 'uk_UA' => '烏克蘭語', 'under_folder' => '資料夾內', From a42426851405d0691db9ece596245c53aba5ff43 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Feb 2020 08:28:58 +0100 Subject: [PATCH 413/467] click on related documents works in onepage mode --- out/out.ViewDocument.php | 1 + views/bootstrap/class.ViewDocument.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php index af38db22a..37b64fe04 100644 --- a/out/out.ViewDocument.php +++ b/out/out.ViewDocument.php @@ -82,6 +82,7 @@ if($view) { $view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : ""); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index e5fa08219..cc9b527a2 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -183,6 +183,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $document = $this->params['document']; + $onepage = $this->params['onepage']; header('Content-Type: application/javascript'); if($user->isAdmin()) { @@ -193,6 +194,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } $this->printDocumentChooserJs("form1"); $this->printDeleteDocumentButtonJs(); + if($onepage) { + $this->printClickDocumentJs(); + } } /* }}} */ function documentInfos() { /* {{{ */ From b11aed0d183e1a94b8f35bf085cbf405fffec47b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Feb 2020 09:47:23 +0100 Subject: [PATCH 414/467] fix comparision of versions --- views/bootstrap/class.Info.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php index 57b88eda1..1bc7d8637 100644 --- a/views/bootstrap/class.Info.php +++ b/views/bootstrap/class.Info.php @@ -47,7 +47,7 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style { if($availversion[0] == 'stable') $newversion = $availversion[1]; } - if($newversion > $version->_number) { + if($newversion > $version->version()) { $this->warningMsg(getMLText('no_current_version', array('latestversion'=>$newversion))); } } else { @@ -63,4 +63,3 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style { $this->htmlEndPage(); } /* }}} */ } -?> From 975c6cb147a0f69caf11c008fd2fc1eac0de66d8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Feb 2020 09:47:58 +0100 Subject: [PATCH 415/467] add js code for catching clicks on folder rows in one page mode --- views/bootstrap/class.Bootstrap.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 4e0a8cb3b..f1dcb76b4 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2262,6 +2262,27 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e } } /* }}} */ + /** + * Print js code which catches clicks on folder rows + * + * This method will catch a click on a folder row and changes the + * window.location to the out.ViewFolder.php page + * This code is not needed on the out.ViewFolder.php page itself, because + * a click will just reload the list of folders and documents. + */ + function printClickFolderJs() { /* {{{ */ + $onepage = $this->params['onepage']; + if($onepage) { +?> +/* catch click on a document row in the list folders and documents */ +$('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) { + attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; + window.location = '../out/out.ViewFolder.php?folderid=' + attr_id; +}); + Date: Fri, 28 Feb 2020 09:48:43 +0100 Subject: [PATCH 416/467] support one page mode on search page --- out/out.Search.php | 2 +- views/bootstrap/class.Search.php | 3 +++ views/bootstrap/class.ViewDocument.php | 6 ++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/out/out.Search.php b/out/out.Search.php index 1a47098bf..5dc5b6b4c 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -438,7 +438,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) { $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'query'=>$query, 'searchhits'=>$entries, 'totalpages'=>$totalPages, 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'cachedir'=>$settings->_cacheDir)); if($view) { $view->setParam('accessobject', $accessop); - $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view->setParam('showtree', showtree()); $view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount); $view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount); diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 27ae82db7..0df46af47 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -60,6 +60,9 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $this->printFolderChooserJs("form1"); $this->printDeleteFolderButtonJs(); $this->printDeleteDocumentButtonJs(); + /* Add js for catching click on document in one page mode */ + $this->printClickDocumentJs(); + $this->printClickFolderJs(); } /* }}} */ function show() { /* {{{ */ diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index cc9b527a2..654796b20 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -183,7 +183,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $document = $this->params['document']; - $onepage = $this->params['onepage']; header('Content-Type: application/javascript'); if($user->isAdmin()) { @@ -194,9 +193,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } $this->printDocumentChooserJs("form1"); $this->printDeleteDocumentButtonJs(); - if($onepage) { - $this->printClickDocumentJs(); - } + /* Add js for catching click on document in one page mode */ + $this->printClickDocumentJs(); } /* }}} */ function documentInfos() { /* {{{ */ From 176a2becb033381a877f5ed2e5bbd6fa84b134a1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Feb 2020 11:00:40 +0100 Subject: [PATCH 417/467] add changes for 5.1.15 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 246b80e3d..aeba5ca4e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,8 @@ - Improved import from file system - HTTP Proxy for access on external extension repository can be set - Do not use unzip in ExtensionMgr anymore +- fix version compare on info page +- allow one page mode on search page -------------------------------------------------------------------------------- Changes in version 5.1.14 From 3b79e0903356f170691bb58cd565e293ddb3970c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Feb 2020 17:42:45 +0100 Subject: [PATCH 418/467] new cytoscape version 3.13.1 --- styles/bootstrap/cytoscape/cytoscape.js | 29941 ------------------ styles/bootstrap/cytoscape/cytoscape.min.js | 4 +- 2 files changed, 2 insertions(+), 29943 deletions(-) delete mode 100644 styles/bootstrap/cytoscape/cytoscape.js diff --git a/styles/bootstrap/cytoscape/cytoscape.js b/styles/bootstrap/cytoscape/cytoscape.js deleted file mode 100644 index 1ba74803c..000000000 --- a/styles/bootstrap/cytoscape/cytoscape.js +++ /dev/null @@ -1,29941 +0,0 @@ -(function webpackUniversalModuleDefinition(root, factory) { - if(typeof exports === 'object' && typeof module === 'object') - module.exports = factory(); - else if(typeof define === 'function' && define.amd) - define([], factory); - else if(typeof exports === 'object') - exports["cytoscape"] = factory(); - else - root["cytoscape"] = factory(); -})(typeof self !== 'undefined' ? self : this, function() { -return /******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) { -/******/ return installedModules[moduleId].exports; -/******/ } -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 20); -/******/ }) -/************************************************************************/ -/******/ ([ -/* 0 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; - -/*global HTMLElement DocumentTouch */ - -var window = __webpack_require__(3); -var navigator = window ? window.navigator : null; -var document = window ? window.document : null; - -var typeofstr = _typeof(''); -var typeofobj = _typeof({}); -var typeoffn = _typeof(function () {}); -var typeofhtmlele = typeof HTMLElement === 'undefined' ? 'undefined' : _typeof(HTMLElement); - -var instanceStr = function instanceStr(obj) { - return obj && obj.instanceString && is.fn(obj.instanceString) ? obj.instanceString() : null; -}; - -var is = { - defined: function defined(obj) { - return obj != null; // not undefined or null - }, - - string: function string(obj) { - return obj != null && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) == typeofstr; - }, - - fn: function fn(obj) { - return obj != null && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) === typeoffn; - }, - - array: function array(obj) { - return Array.isArray ? Array.isArray(obj) : obj != null && obj instanceof Array; - }, - - plainObject: function plainObject(obj) { - return obj != null && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) === typeofobj && !is.array(obj) && obj.constructor === Object; - }, - - object: function object(obj) { - return obj != null && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) === typeofobj; - }, - - number: function number(obj) { - return obj != null && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) === _typeof(1) && !isNaN(obj); - }, - - integer: function integer(obj) { - return is.number(obj) && Math.floor(obj) === obj; - }, - - bool: function bool(obj) { - return obj != null && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) === _typeof(true); - }, - - htmlElement: function htmlElement(obj) { - if ('undefined' === typeofhtmlele) { - return undefined; - } else { - return null != obj && obj instanceof HTMLElement; - } - }, - - elementOrCollection: function elementOrCollection(obj) { - return is.element(obj) || is.collection(obj); - }, - - element: function element(obj) { - return instanceStr(obj) === 'collection' && obj._private.single; - }, - - collection: function collection(obj) { - return instanceStr(obj) === 'collection' && !obj._private.single; - }, - - core: function core(obj) { - return instanceStr(obj) === 'core'; - }, - - style: function style(obj) { - return instanceStr(obj) === 'style'; - }, - - stylesheet: function stylesheet(obj) { - return instanceStr(obj) === 'stylesheet'; - }, - - event: function event(obj) { - return instanceStr(obj) === 'event'; - }, - - thread: function thread(obj) { - return instanceStr(obj) === 'thread'; - }, - - fabric: function fabric(obj) { - return instanceStr(obj) === 'fabric'; - }, - - emptyString: function emptyString(obj) { - if (obj === undefined || obj === null) { - // null is empty - return true; - } else if (obj === '' || obj.match(/^\s+$/)) { - return true; // empty string is empty - } - - return false; // otherwise, we don't know what we've got - }, - - nonemptyString: function nonemptyString(obj) { - if (obj && is.string(obj) && obj !== '' && !obj.match(/^\s+$/)) { - return true; - } - - return false; - }, - - domElement: function domElement(obj) { - if (typeof HTMLElement === 'undefined') { - return false; // we're not in a browser so it doesn't matter - } else { - return obj instanceof HTMLElement; - } - }, - - boundingBox: function boundingBox(obj) { - return is.plainObject(obj) && is.number(obj.x1) && is.number(obj.x2) && is.number(obj.y1) && is.number(obj.y2); - }, - - promise: function promise(obj) { - return is.object(obj) && is.fn(obj.then); - }, - - touch: function touch() { - return window && ('ontouchstart' in window || window.DocumentTouch && document instanceof DocumentTouch); - }, - - gecko: function gecko() { - return window && (typeof InstallTrigger !== 'undefined' || 'MozAppearance' in document.documentElement.style); - }, - - webkit: function webkit() { - return window && (typeof webkitURL !== 'undefined' || 'WebkitAppearance' in document.documentElement.style); - }, - - chromium: function chromium() { - return window && typeof chrome !== 'undefined'; - }, - - khtml: function khtml() { - return navigator && navigator.vendor.match(/kde/i); // probably a better way to detect this... - }, - - khtmlEtc: function khtmlEtc() { - return is.khtml() || is.webkit() || is.chromium(); - }, - - ms: function ms() { - return navigator && navigator.userAgent.match(/msie|trident|edge/i); // probably a better way to detect this... - }, - - windows: function windows() { - return navigator && navigator.appVersion.match(/Win/i); - }, - - mac: function mac() { - return navigator && navigator.appVersion.match(/Mac/i); - }, - - linux: function linux() { - return navigator && navigator.appVersion.match(/Linux/i); - }, - - unix: function unix() { - return navigator && navigator.appVersion.match(/X11/i); - } -}; - -module.exports = is; - -/***/ }), -/* 1 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/*global console */ - -var is = __webpack_require__(0); -var math = __webpack_require__(2); - -var util = { - - MAX_INT: Number.MAX_SAFE_INTEGER || 9007199254740991, - - trueify: function trueify() { - return true; - }, - - falsify: function falsify() { - return false; - }, - - zeroify: function zeroify() { - return 0; - }, - - noop: function noop() {}, - - error: function error(msg) { - /* eslint-disable */ - if (console.error) { - console.error.apply(console, arguments); - - if (console.trace) { - console.trace(); - } - } else { - console.log.apply(console, arguments); - - if (console.trace) { - console.trace(); - } - } - /* eslint-enable */ - }, - - clone: function clone(obj) { - return this.extend({}, obj); - }, - - // gets a shallow copy of the argument - copy: function copy(obj) { - if (obj == null) { - return obj; - }if (is.array(obj)) { - return obj.slice(); - } else if (is.plainObject(obj)) { - return this.clone(obj); - } else { - return obj; - } - }, - - copyArray: function copyArray(arr) { - return arr.slice(); - }, - - clonePosition: function clonePosition(pos) { - return { x: pos.x, y: pos.y }; - }, - - uuid: function uuid(a, b // placeholders - ) { - for ( // loop :) - b = a = ''; // b - result , a - numeric letiable - a++ < 36; // - b += a * 51 & 52 // if "a" is not 9 or 14 or 19 or 24 - ? // return a random number or 4 - (a ^ 15 // if "a" is not 15 - ? // genetate a random number from 0 to 15 - 8 ^ Math.random() * (a ^ 20 ? 16 : 4) // unless "a" is 20, in which case a random number from 8 to 11 - : 4 // otherwise 4 - ).toString(16) : '-' // in other cases (if "a" is 9,14,19,24) insert "-" - ) {} - return b; - } - -}; - -util.makeBoundingBox = math.makeBoundingBox.bind(math); - -util._staticEmptyObject = {}; - -util.staticEmptyObject = function () { - return util._staticEmptyObject; -}; - -util.extend = Object.assign != null ? Object.assign.bind(Object) : function (tgt) { - var args = arguments; - - for (var i = 1; i < args.length; i++) { - var obj = args[i]; - - if (obj == null) { - continue; - } - - var keys = Object.keys(obj); - - for (var j = 0; j < keys.length; j++) { - var k = keys[j]; - - tgt[k] = obj[k]; - } - } - - return tgt; -}; - -util.assign = util.extend; - -util.default = function (val, def) { - if (val === undefined) { - return def; - } else { - return val; - } -}; - -util.removeFromArray = function (arr, ele, manyCopies) { - for (var i = arr.length; i >= 0; i--) { - if (arr[i] === ele) { - arr.splice(i, 1); - - if (!manyCopies) { - break; - } - } - } -}; - -util.clearArray = function (arr) { - arr.splice(0, arr.length); -}; - -util.push = function (arr, otherArr) { - for (var i = 0; i < otherArr.length; i++) { - var el = otherArr[i]; - - arr.push(el); - } -}; - -util.getPrefixedProperty = function (obj, propName, prefix) { - if (prefix) { - propName = this.prependCamel(prefix, propName); // e.g. (labelWidth, source) => sourceLabelWidth - } - - return obj[propName]; -}; - -util.setPrefixedProperty = function (obj, propName, prefix, value) { - if (prefix) { - propName = this.prependCamel(prefix, propName); // e.g. (labelWidth, source) => sourceLabelWidth - } - - obj[propName] = value; -}; - -[__webpack_require__(21), __webpack_require__(22), { memoize: __webpack_require__(13) }, __webpack_require__(23), __webpack_require__(24), __webpack_require__(25), __webpack_require__(27)].forEach(function (req) { - util.extend(util, req); -}); - -module.exports = util; - -/***/ }), -/* 2 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = {}; - -math.arePositionsSame = function (p1, p2) { - return p1.x === p2.x && p1.y === p2.y; -}; - -math.copyPosition = function (p) { - return { x: p.x, y: p.y }; -}; - -math.modelToRenderedPosition = function (p, zoom, pan) { - return { - x: p.x * zoom + pan.x, - y: p.y * zoom + pan.y - }; -}; - -math.renderedToModelPosition = function (p, zoom, pan) { - return { - x: (p.x - pan.x) / zoom, - y: (p.y - pan.y) / zoom - }; -}; - -math.array2point = function (arr) { - return { - x: arr[0], - y: arr[1] - }; -}; - -math.deg2rad = function (deg) { - return Math.PI * deg / 180; -}; - -math.getAngleFromDisp = function (dispX, dispY) { - return Math.atan2(dispY, dispX) - Math.PI / 2; -}; - -math.log2 = Math.log2 || function (n) { - return Math.log(n) / Math.log(2); -}; - -math.signum = function (x) { - if (x > 0) { - return 1; - } else if (x < 0) { - return -1; - } else { - return 0; - } -}; - -math.dist = function (p1, p2) { - return Math.sqrt(math.sqdist(p1, p2)); -}; - -math.sqdist = function (p1, p2) { - var dx = p2.x - p1.x; - var dy = p2.y - p1.y; - - return dx * dx + dy * dy; -}; - -// from http://en.wikipedia.org/wiki/Bézier_curve#Quadratic_curves -math.qbezierAt = function (p0, p1, p2, t) { - return (1 - t) * (1 - t) * p0 + 2 * (1 - t) * t * p1 + t * t * p2; -}; - -math.qbezierPtAt = function (p0, p1, p2, t) { - return { - x: math.qbezierAt(p0.x, p1.x, p2.x, t), - y: math.qbezierAt(p0.y, p1.y, p2.y, t) - }; -}; - -math.lineAt = function (p0, p1, t, d) { - var vec = { - x: p1.x - p0.x, - y: p1.y - p0.y - }; - - var vecDist = math.dist(p0, p1); - - var normVec = { - x: vec.x / vecDist, - y: vec.y / vecDist - }; - - t = t == null ? 0 : t; - - d = d != null ? d : t * vecDist; - - return { - x: p0.x + normVec.x * d, - y: p0.y + normVec.y * d - }; -}; - -math.lineAtDist = function (p0, p1, d) { - return math.lineAt(p0, p1, undefined, d); -}; - -// get angle at A via cosine law -math.triangleAngle = function (A, B, C) { - var a = math.dist(B, C); - var b = math.dist(A, C); - var c = math.dist(A, B); - - return Math.acos((a * a + b * b - c * c) / (2 * a * b)); -}; - -math.bound = function (min, val, max) { - return Math.max(min, Math.min(max, val)); -}; - -// makes a full bb (x1, y1, x2, y2, w, h) from implicit params -math.makeBoundingBox = function (bb) { - if (bb == null) { - return { - x1: Infinity, - y1: Infinity, - x2: -Infinity, - y2: -Infinity, - w: 0, - h: 0 - }; - } else if (bb.x1 != null && bb.y1 != null) { - if (bb.x2 != null && bb.y2 != null && bb.x2 >= bb.x1 && bb.y2 >= bb.y1) { - return { - x1: bb.x1, - y1: bb.y1, - x2: bb.x2, - y2: bb.y2, - w: bb.x2 - bb.x1, - h: bb.y2 - bb.y1 - }; - } else if (bb.w != null && bb.h != null && bb.w >= 0 && bb.h >= 0) { - return { - x1: bb.x1, - y1: bb.y1, - x2: bb.x1 + bb.w, - y2: bb.y1 + bb.h, - w: bb.w, - h: bb.h - }; - } - } -}; - -math.updateBoundingBox = function (bb1, bb2) { - // update bb1 with bb2 bounds - - bb1.x1 = Math.min(bb1.x1, bb2.x1); - bb1.x2 = Math.max(bb1.x2, bb2.x2); - bb1.w = bb1.x2 - bb1.x1; - - bb1.y1 = Math.min(bb1.y1, bb2.y1); - bb1.y2 = Math.max(bb1.y2, bb2.y2); - bb1.h = bb1.y2 - bb1.y1; -}; - -math.expandBoundingBoxByPoint = function (bb, x, y) { - bb.x1 = Math.min(bb.x1, x); - bb.x2 = Math.max(bb.x2, x); - bb.w = bb.x2 - bb.x1; - - bb.y1 = Math.min(bb.y1, y); - bb.y2 = Math.max(bb.y2, y); - bb.h = bb.y2 - bb.y1; -}; - -math.expandBoundingBox = function (bb, padding) { - bb.x1 -= padding; - bb.x2 += padding; - bb.y1 -= padding; - bb.y2 += padding; - bb.w = bb.x2 - bb.x1; - bb.h = bb.y2 - bb.y1; - - return bb; -}; - -math.boundingBoxesIntersect = function (bb1, bb2) { - // case: one bb to right of other - if (bb1.x1 > bb2.x2) { - return false; - } - if (bb2.x1 > bb1.x2) { - return false; - } - - // case: one bb to left of other - if (bb1.x2 < bb2.x1) { - return false; - } - if (bb2.x2 < bb1.x1) { - return false; - } - - // case: one bb above other - if (bb1.y2 < bb2.y1) { - return false; - } - if (bb2.y2 < bb1.y1) { - return false; - } - - // case: one bb below other - if (bb1.y1 > bb2.y2) { - return false; - } - if (bb2.y1 > bb1.y2) { - return false; - } - - // otherwise, must have some overlap - return true; -}; - -math.inBoundingBox = function (bb, x, y) { - return bb.x1 <= x && x <= bb.x2 && bb.y1 <= y && y <= bb.y2; -}; - -math.pointInBoundingBox = function (bb, pt) { - return this.inBoundingBox(bb, pt.x, pt.y); -}; - -math.boundingBoxInBoundingBox = function (bb1, bb2) { - return math.inBoundingBox(bb1, bb2.x1, bb2.y1) && math.inBoundingBox(bb1, bb2.x2, bb2.y2); -}; - -math.roundRectangleIntersectLine = function (x, y, nodeX, nodeY, width, height, padding) { - - var cornerRadius = this.getRoundRectangleRadius(width, height); - - var halfWidth = width / 2; - var halfHeight = height / 2; - - // Check intersections with straight line segments - var straightLineIntersections = void 0; - - // Top segment, left to right - { - var topStartX = nodeX - halfWidth + cornerRadius - padding; - var topStartY = nodeY - halfHeight - padding; - var topEndX = nodeX + halfWidth - cornerRadius + padding; - var topEndY = topStartY; - - straightLineIntersections = this.finiteLinesIntersect(x, y, nodeX, nodeY, topStartX, topStartY, topEndX, topEndY, false); - - if (straightLineIntersections.length > 0) { - return straightLineIntersections; - } - } - - // Right segment, top to bottom - { - var rightStartX = nodeX + halfWidth + padding; - var rightStartY = nodeY - halfHeight + cornerRadius - padding; - var rightEndX = rightStartX; - var rightEndY = nodeY + halfHeight - cornerRadius + padding; - - straightLineIntersections = this.finiteLinesIntersect(x, y, nodeX, nodeY, rightStartX, rightStartY, rightEndX, rightEndY, false); - - if (straightLineIntersections.length > 0) { - return straightLineIntersections; - } - } - - // Bottom segment, left to right - { - var bottomStartX = nodeX - halfWidth + cornerRadius - padding; - var bottomStartY = nodeY + halfHeight + padding; - var bottomEndX = nodeX + halfWidth - cornerRadius + padding; - var bottomEndY = bottomStartY; - - straightLineIntersections = this.finiteLinesIntersect(x, y, nodeX, nodeY, bottomStartX, bottomStartY, bottomEndX, bottomEndY, false); - - if (straightLineIntersections.length > 0) { - return straightLineIntersections; - } - } - - // Left segment, top to bottom - { - var leftStartX = nodeX - halfWidth - padding; - var leftStartY = nodeY - halfHeight + cornerRadius - padding; - var leftEndX = leftStartX; - var leftEndY = nodeY + halfHeight - cornerRadius + padding; - - straightLineIntersections = this.finiteLinesIntersect(x, y, nodeX, nodeY, leftStartX, leftStartY, leftEndX, leftEndY, false); - - if (straightLineIntersections.length > 0) { - return straightLineIntersections; - } - } - - // Check intersections with arc segments - var arcIntersections = void 0; - - // Top Left - { - var topLeftCenterX = nodeX - halfWidth + cornerRadius; - var topLeftCenterY = nodeY - halfHeight + cornerRadius; - arcIntersections = this.intersectLineCircle(x, y, nodeX, nodeY, topLeftCenterX, topLeftCenterY, cornerRadius + padding); - - // Ensure the intersection is on the desired quarter of the circle - if (arcIntersections.length > 0 && arcIntersections[0] <= topLeftCenterX && arcIntersections[1] <= topLeftCenterY) { - return [arcIntersections[0], arcIntersections[1]]; - } - } - - // Top Right - { - var topRightCenterX = nodeX + halfWidth - cornerRadius; - var topRightCenterY = nodeY - halfHeight + cornerRadius; - arcIntersections = this.intersectLineCircle(x, y, nodeX, nodeY, topRightCenterX, topRightCenterY, cornerRadius + padding); - - // Ensure the intersection is on the desired quarter of the circle - if (arcIntersections.length > 0 && arcIntersections[0] >= topRightCenterX && arcIntersections[1] <= topRightCenterY) { - return [arcIntersections[0], arcIntersections[1]]; - } - } - - // Bottom Right - { - var bottomRightCenterX = nodeX + halfWidth - cornerRadius; - var bottomRightCenterY = nodeY + halfHeight - cornerRadius; - arcIntersections = this.intersectLineCircle(x, y, nodeX, nodeY, bottomRightCenterX, bottomRightCenterY, cornerRadius + padding); - - // Ensure the intersection is on the desired quarter of the circle - if (arcIntersections.length > 0 && arcIntersections[0] >= bottomRightCenterX && arcIntersections[1] >= bottomRightCenterY) { - return [arcIntersections[0], arcIntersections[1]]; - } - } - - // Bottom Left - { - var bottomLeftCenterX = nodeX - halfWidth + cornerRadius; - var bottomLeftCenterY = nodeY + halfHeight - cornerRadius; - arcIntersections = this.intersectLineCircle(x, y, nodeX, nodeY, bottomLeftCenterX, bottomLeftCenterY, cornerRadius + padding); - - // Ensure the intersection is on the desired quarter of the circle - if (arcIntersections.length > 0 && arcIntersections[0] <= bottomLeftCenterX && arcIntersections[1] >= bottomLeftCenterY) { - return [arcIntersections[0], arcIntersections[1]]; - } - } - - return []; // if nothing -}; - -math.inLineVicinity = function (x, y, lx1, ly1, lx2, ly2, tolerance) { - var t = tolerance; - - var x1 = Math.min(lx1, lx2); - var x2 = Math.max(lx1, lx2); - var y1 = Math.min(ly1, ly2); - var y2 = Math.max(ly1, ly2); - - return x1 - t <= x && x <= x2 + t && y1 - t <= y && y <= y2 + t; -}; - -math.inBezierVicinity = function (x, y, x1, y1, x2, y2, x3, y3, tolerance) { - - var bb = { - x1: Math.min(x1, x3, x2) - tolerance, - x2: Math.max(x1, x3, x2) + tolerance, - y1: Math.min(y1, y3, y2) - tolerance, - y2: Math.max(y1, y3, y2) + tolerance - }; - - // if outside the rough bounding box for the bezier, then it can't be a hit - if (x < bb.x1 || x > bb.x2 || y < bb.y1 || y > bb.y2) { - // console.log('bezier out of rough bb') - return false; - } else { - // console.log('do more expensive check'); - return true; - } -}; -math.solveQuadratic = function (a, b, c, val) { - c -= val; - - var r = b * b - 4 * a * c; - - if (r < 0) { - return []; - } - - var sqrtR = Math.sqrt(r); - var denom = 2 * a; - var root1 = (-b + sqrtR) / denom; - var root2 = (-b - sqrtR) / denom; - - return [root1, root2]; -}; - -math.solveCubic = function (a, b, c, d, result) { - - // Solves a cubic function, returns root in form [r1, i1, r2, i2, r3, i3], where - // r is the real component, i is the imaginary component - - // An implementation of the Cardano method from the year 1545 - // http://en.wikipedia.org/wiki/Cubic_function#The_nature_of_the_roots - - b /= a; - c /= a; - d /= a; - - var discriminant = void 0, - q = void 0, - r = void 0, - dum1 = void 0, - s = void 0, - t = void 0, - term1 = void 0, - r13 = void 0; - - q = (3.0 * c - b * b) / 9.0; - r = -(27.0 * d) + b * (9.0 * c - 2.0 * (b * b)); - r /= 54.0; - - discriminant = q * q * q + r * r; - result[1] = 0; - term1 = b / 3.0; - - if (discriminant > 0) { - s = r + Math.sqrt(discriminant); - s = s < 0 ? -Math.pow(-s, 1.0 / 3.0) : Math.pow(s, 1.0 / 3.0); - t = r - Math.sqrt(discriminant); - t = t < 0 ? -Math.pow(-t, 1.0 / 3.0) : Math.pow(t, 1.0 / 3.0); - result[0] = -term1 + s + t; - term1 += (s + t) / 2.0; - result[4] = result[2] = -term1; - term1 = Math.sqrt(3.0) * (-t + s) / 2; - result[3] = term1; - result[5] = -term1; - return; - } - - result[5] = result[3] = 0; - - if (discriminant === 0) { - r13 = r < 0 ? -Math.pow(-r, 1.0 / 3.0) : Math.pow(r, 1.0 / 3.0); - result[0] = -term1 + 2.0 * r13; - result[4] = result[2] = -(r13 + term1); - return; - } - - q = -q; - dum1 = q * q * q; - dum1 = Math.acos(r / Math.sqrt(dum1)); - r13 = 2.0 * Math.sqrt(q); - result[0] = -term1 + r13 * Math.cos(dum1 / 3.0); - result[2] = -term1 + r13 * Math.cos((dum1 + 2.0 * Math.PI) / 3.0); - result[4] = -term1 + r13 * Math.cos((dum1 + 4.0 * Math.PI) / 3.0); - - return; -}; - -math.sqdistToQuadraticBezier = function (x, y, x1, y1, x2, y2, x3, y3) { - - // Find minimum distance by using the minimum of the distance - // function between the given point and the curve - - // This gives the coefficients of the resulting cubic equation - // whose roots tell us where a possible minimum is - // (Coefficients are divided by 4) - - var a = 1.0 * x1 * x1 - 4 * x1 * x2 + 2 * x1 * x3 + 4 * x2 * x2 - 4 * x2 * x3 + x3 * x3 + y1 * y1 - 4 * y1 * y2 + 2 * y1 * y3 + 4 * y2 * y2 - 4 * y2 * y3 + y3 * y3; - - var b = 1.0 * 9 * x1 * x2 - 3 * x1 * x1 - 3 * x1 * x3 - 6 * x2 * x2 + 3 * x2 * x3 + 9 * y1 * y2 - 3 * y1 * y1 - 3 * y1 * y3 - 6 * y2 * y2 + 3 * y2 * y3; - - var c = 1.0 * 3 * x1 * x1 - 6 * x1 * x2 + x1 * x3 - x1 * x + 2 * x2 * x2 + 2 * x2 * x - x3 * x + 3 * y1 * y1 - 6 * y1 * y2 + y1 * y3 - y1 * y + 2 * y2 * y2 + 2 * y2 * y - y3 * y; - - var d = 1.0 * x1 * x2 - x1 * x1 + x1 * x - x2 * x + y1 * y2 - y1 * y1 + y1 * y - y2 * y; - - // debug("coefficients: " + a / a + ", " + b / a + ", " + c / a + ", " + d / a); - - var roots = []; - - // Use the cubic solving algorithm - this.solveCubic(a, b, c, d, roots); - - var zeroThreshold = 0.0000001; - - var params = []; - - for (var index = 0; index < 6; index += 2) { - if (Math.abs(roots[index + 1]) < zeroThreshold && roots[index] >= 0 && roots[index] <= 1.0) { - params.push(roots[index]); - } - } - - params.push(1.0); - params.push(0.0); - - var minDistanceSquared = -1; - - var curX = void 0, - curY = void 0, - distSquared = void 0; - for (var i = 0; i < params.length; i++) { - curX = Math.pow(1.0 - params[i], 2.0) * x1 + 2.0 * (1 - params[i]) * params[i] * x2 + params[i] * params[i] * x3; - - curY = Math.pow(1 - params[i], 2.0) * y1 + 2 * (1.0 - params[i]) * params[i] * y2 + params[i] * params[i] * y3; - - distSquared = Math.pow(curX - x, 2) + Math.pow(curY - y, 2); - // debug('distance for param ' + params[i] + ": " + Math.sqrt(distSquared)); - if (minDistanceSquared >= 0) { - if (distSquared < minDistanceSquared) { - minDistanceSquared = distSquared; - } - } else { - minDistanceSquared = distSquared; - } - } - - return minDistanceSquared; -}; - -math.sqdistToFiniteLine = function (x, y, x1, y1, x2, y2) { - var offset = [x - x1, y - y1]; - var line = [x2 - x1, y2 - y1]; - - var lineSq = line[0] * line[0] + line[1] * line[1]; - var hypSq = offset[0] * offset[0] + offset[1] * offset[1]; - - var dotProduct = offset[0] * line[0] + offset[1] * line[1]; - var adjSq = dotProduct * dotProduct / lineSq; - - if (dotProduct < 0) { - return hypSq; - } - - if (adjSq > lineSq) { - return (x - x2) * (x - x2) + (y - y2) * (y - y2); - } - - return hypSq - adjSq; -}; - -math.pointInsidePolygonPoints = function (x, y, points) { - var x1 = void 0, - y1 = void 0, - x2 = void 0, - y2 = void 0; - var y3 = void 0; - - // Intersect with vertical line through (x, y) - var up = 0; - // let down = 0; - for (var i = 0; i < points.length / 2; i++) { - x1 = points[i * 2]; - y1 = points[i * 2 + 1]; - - if (i + 1 < points.length / 2) { - x2 = points[(i + 1) * 2]; - y2 = points[(i + 1) * 2 + 1]; - } else { - x2 = points[(i + 1 - points.length / 2) * 2]; - y2 = points[(i + 1 - points.length / 2) * 2 + 1]; - } - - if (x1 == x && x2 == x) { - // then ignore - } else if (x1 >= x && x >= x2 || x1 <= x && x <= x2) { - - y3 = (x - x1) / (x2 - x1) * (y2 - y1) + y1; - - if (y3 > y) { - up++; - } - - // if( y3 < y ){ - // down++; - // } - } else { - continue; - } - } - - if (up % 2 === 0) { - return false; - } else { - return true; - } -}; - -math.pointInsidePolygon = function (x, y, basePoints, centerX, centerY, width, height, direction, padding) { - - //let direction = arguments[6]; - var transformedPoints = new Array(basePoints.length); - - // Gives negative angle - var angle = void 0; - - if (direction[0] != null) { - angle = Math.atan(direction[1] / direction[0]); - - if (direction[0] < 0) { - angle = angle + Math.PI / 2; - } else { - angle = -angle - Math.PI / 2; - } - } else { - angle = direction; - } - - var cos = Math.cos(-angle); - var sin = Math.sin(-angle); - - // console.log("base: " + basePoints); - for (var i = 0; i < transformedPoints.length / 2; i++) { - transformedPoints[i * 2] = width / 2 * (basePoints[i * 2] * cos - basePoints[i * 2 + 1] * sin); - - transformedPoints[i * 2 + 1] = height / 2 * (basePoints[i * 2 + 1] * cos + basePoints[i * 2] * sin); - - transformedPoints[i * 2] += centerX; - transformedPoints[i * 2 + 1] += centerY; - } - - var points = void 0; - - if (padding > 0) { - var expandedLineSet = this.expandPolygon(transformedPoints, -padding); - - points = this.joinLines(expandedLineSet); - } else { - points = transformedPoints; - } - - return math.pointInsidePolygonPoints(x, y, points); -}; - -math.joinLines = function (lineSet) { - - var vertices = new Array(lineSet.length / 2); - - var currentLineStartX = void 0, - currentLineStartY = void 0, - currentLineEndX = void 0, - currentLineEndY = void 0; - var nextLineStartX = void 0, - nextLineStartY = void 0, - nextLineEndX = void 0, - nextLineEndY = void 0; - - for (var i = 0; i < lineSet.length / 4; i++) { - currentLineStartX = lineSet[i * 4]; - currentLineStartY = lineSet[i * 4 + 1]; - currentLineEndX = lineSet[i * 4 + 2]; - currentLineEndY = lineSet[i * 4 + 3]; - - if (i < lineSet.length / 4 - 1) { - nextLineStartX = lineSet[(i + 1) * 4]; - nextLineStartY = lineSet[(i + 1) * 4 + 1]; - nextLineEndX = lineSet[(i + 1) * 4 + 2]; - nextLineEndY = lineSet[(i + 1) * 4 + 3]; - } else { - nextLineStartX = lineSet[0]; - nextLineStartY = lineSet[1]; - nextLineEndX = lineSet[2]; - nextLineEndY = lineSet[3]; - } - - var intersection = this.finiteLinesIntersect(currentLineStartX, currentLineStartY, currentLineEndX, currentLineEndY, nextLineStartX, nextLineStartY, nextLineEndX, nextLineEndY, true); - - vertices[i * 2] = intersection[0]; - vertices[i * 2 + 1] = intersection[1]; - } - - return vertices; -}; - -math.expandPolygon = function (points, pad) { - - var expandedLineSet = new Array(points.length * 2); - - var currentPointX = void 0, - currentPointY = void 0, - nextPointX = void 0, - nextPointY = void 0; - - for (var i = 0; i < points.length / 2; i++) { - currentPointX = points[i * 2]; - currentPointY = points[i * 2 + 1]; - - if (i < points.length / 2 - 1) { - nextPointX = points[(i + 1) * 2]; - nextPointY = points[(i + 1) * 2 + 1]; - } else { - nextPointX = points[0]; - nextPointY = points[1]; - } - - // Current line: [currentPointX, currentPointY] to [nextPointX, nextPointY] - - // Assume CCW polygon winding - - var offsetX = nextPointY - currentPointY; - var offsetY = -(nextPointX - currentPointX); - - // Normalize - var offsetLength = Math.sqrt(offsetX * offsetX + offsetY * offsetY); - var normalizedOffsetX = offsetX / offsetLength; - var normalizedOffsetY = offsetY / offsetLength; - - expandedLineSet[i * 4] = currentPointX + normalizedOffsetX * pad; - expandedLineSet[i * 4 + 1] = currentPointY + normalizedOffsetY * pad; - expandedLineSet[i * 4 + 2] = nextPointX + normalizedOffsetX * pad; - expandedLineSet[i * 4 + 3] = nextPointY + normalizedOffsetY * pad; - } - - return expandedLineSet; -}; - -math.intersectLineEllipse = function (x, y, centerX, centerY, ellipseWradius, ellipseHradius) { - - var dispX = centerX - x; - var dispY = centerY - y; - - dispX /= ellipseWradius; - dispY /= ellipseHradius; - - var len = Math.sqrt(dispX * dispX + dispY * dispY); - - var newLength = len - 1; - - if (newLength < 0) { - return []; - } - - var lenProportion = newLength / len; - - return [(centerX - x) * lenProportion + x, (centerY - y) * lenProportion + y]; -}; - -math.checkInEllipse = function (x, y, width, height, centerX, centerY, padding) { - x -= centerX; - y -= centerY; - - x /= width / 2 + padding; - y /= height / 2 + padding; - - return x * x + y * y <= 1; -}; - -// Returns intersections of increasing distance from line's start point -math.intersectLineCircle = function (x1, y1, x2, y2, centerX, centerY, radius) { - - // Calculate d, direction vector of line - var d = [x2 - x1, y2 - y1]; // Direction vector of line - var f = [x1 - centerX, y1 - centerY]; - - var a = d[0] * d[0] + d[1] * d[1]; - var b = 2 * (f[0] * d[0] + f[1] * d[1]); - var c = f[0] * f[0] + f[1] * f[1] - radius * radius; - - var discriminant = b * b - 4 * a * c; - - if (discriminant < 0) { - return []; - } - - var t1 = (-b + Math.sqrt(discriminant)) / (2 * a); - var t2 = (-b - Math.sqrt(discriminant)) / (2 * a); - - var tMin = Math.min(t1, t2); - var tMax = Math.max(t1, t2); - var inRangeParams = []; - - if (tMin >= 0 && tMin <= 1) { - inRangeParams.push(tMin); - } - - if (tMax >= 0 && tMax <= 1) { - inRangeParams.push(tMax); - } - - if (inRangeParams.length === 0) { - return []; - } - - var nearIntersectionX = inRangeParams[0] * d[0] + x1; - var nearIntersectionY = inRangeParams[0] * d[1] + y1; - - if (inRangeParams.length > 1) { - - if (inRangeParams[0] == inRangeParams[1]) { - return [nearIntersectionX, nearIntersectionY]; - } else { - - var farIntersectionX = inRangeParams[1] * d[0] + x1; - var farIntersectionY = inRangeParams[1] * d[1] + y1; - - return [nearIntersectionX, nearIntersectionY, farIntersectionX, farIntersectionY]; - } - } else { - return [nearIntersectionX, nearIntersectionY]; - } -}; - -math.findCircleNearPoint = function (centerX, centerY, radius, farX, farY) { - - var displacementX = farX - centerX; - var displacementY = farY - centerY; - var distance = Math.sqrt(displacementX * displacementX + displacementY * displacementY); - - var unitDisplacementX = displacementX / distance; - var unitDisplacementY = displacementY / distance; - - return [centerX + unitDisplacementX * radius, centerY + unitDisplacementY * radius]; -}; - -math.findMaxSqDistanceToOrigin = function (points) { - var maxSqDistance = 0.000001; - var sqDistance = void 0; - - for (var i = 0; i < points.length / 2; i++) { - - sqDistance = points[i * 2] * points[i * 2] + points[i * 2 + 1] * points[i * 2 + 1]; - - if (sqDistance > maxSqDistance) { - maxSqDistance = sqDistance; - } - } - - return maxSqDistance; -}; - -math.midOfThree = function (a, b, c) { - if (b <= a && a <= c || c <= a && a <= b) { - return a; - } else if (a <= b && b <= c || c <= b && b <= a) { - return b; - } else { - return c; - } -}; - -// (x1,y1)=>(x2,y2) intersect with (x3,y3)=>(x4,y4) -math.finiteLinesIntersect = function (x1, y1, x2, y2, x3, y3, x4, y4, infiniteLines) { - - var dx13 = x1 - x3; - var dx21 = x2 - x1; - var dx43 = x4 - x3; - - var dy13 = y1 - y3; - var dy21 = y2 - y1; - var dy43 = y4 - y3; - - var ua_t = dx43 * dy13 - dy43 * dx13; - var ub_t = dx21 * dy13 - dy21 * dx13; - var u_b = dy43 * dx21 - dx43 * dy21; - - if (u_b !== 0) { - var ua = ua_t / u_b; - var ub = ub_t / u_b; - - var flptThreshold = 0.001; - var min = 0 - flptThreshold; - var max = 1 + flptThreshold; - - if (min <= ua && ua <= max && min <= ub && ub <= max) { - return [x1 + ua * dx21, y1 + ua * dy21]; - } else { - if (!infiniteLines) { - return []; - } else { - return [x1 + ua * dx21, y1 + ua * dy21]; - } - } - } else { - if (ua_t === 0 || ub_t === 0) { - - // Parallel, coincident lines. Check if overlap - - // Check endpoint of second line - if (this.midOfThree(x1, x2, x4) === x4) { - return [x4, y4]; - } - - // Check start point of second line - if (this.midOfThree(x1, x2, x3) === x3) { - return [x3, y3]; - } - - // Endpoint of first line - if (this.midOfThree(x3, x4, x2) === x2) { - return [x2, y2]; - } - - return []; - } else { - - // Parallel, non-coincident - return []; - } - } -}; - -// math.polygonIntersectLine( x, y, basePoints, centerX, centerY, width, height, padding ) -// intersect a node polygon (pts transformed) -// -// math.polygonIntersectLine( x, y, basePoints, centerX, centerY ) -// intersect the points (no transform) -math.polygonIntersectLine = function (x, y, basePoints, centerX, centerY, width, height, padding) { - - var intersections = []; - var intersection = void 0; - - var transformedPoints = new Array(basePoints.length); - - var doTransform = true; - if (arguments.length === 5) { - doTransform = false; - } - - var points = void 0; - - if (doTransform) { - for (var i = 0; i < transformedPoints.length / 2; i++) { - transformedPoints[i * 2] = basePoints[i * 2] * width + centerX; - transformedPoints[i * 2 + 1] = basePoints[i * 2 + 1] * height + centerY; - } - - if (padding > 0) { - var expandedLineSet = math.expandPolygon(transformedPoints, -padding); - - points = math.joinLines(expandedLineSet); - } else { - points = transformedPoints; - } - } else { - points = basePoints; - } - - var currentX = void 0, - currentY = void 0, - nextX = void 0, - nextY = void 0; - - for (var _i = 0; _i < points.length / 2; _i++) { - - currentX = points[_i * 2]; - currentY = points[_i * 2 + 1]; - - if (_i < points.length / 2 - 1) { - nextX = points[(_i + 1) * 2]; - nextY = points[(_i + 1) * 2 + 1]; - } else { - nextX = points[0]; - nextY = points[1]; - } - - intersection = this.finiteLinesIntersect(x, y, centerX, centerY, currentX, currentY, nextX, nextY); - - if (intersection.length !== 0) { - intersections.push(intersection[0], intersection[1]); - } - } - - return intersections; -}; - -math.shortenIntersection = function (intersection, offset, amount) { - - var disp = [intersection[0] - offset[0], intersection[1] - offset[1]]; - - var length = Math.sqrt(disp[0] * disp[0] + disp[1] * disp[1]); - - var lenRatio = (length - amount) / length; - - if (lenRatio < 0) { - lenRatio = 0.00001; - } - - return [offset[0] + lenRatio * disp[0], offset[1] + lenRatio * disp[1]]; -}; - -math.generateUnitNgonPointsFitToSquare = function (sides, rotationRadians) { - var points = math.generateUnitNgonPoints(sides, rotationRadians); - points = math.fitPolygonToSquare(points); - - return points; -}; - -math.fitPolygonToSquare = function (points) { - var x = void 0, - y = void 0; - var sides = points.length / 2; - var minX = Infinity, - minY = Infinity, - maxX = -Infinity, - maxY = -Infinity; - - for (var i = 0; i < sides; i++) { - x = points[2 * i]; - y = points[2 * i + 1]; - - minX = Math.min(minX, x); - maxX = Math.max(maxX, x); - minY = Math.min(minY, y); - maxY = Math.max(maxY, y); - } - - // stretch factors - var sx = 2 / (maxX - minX); - var sy = 2 / (maxY - minY); - - for (var _i2 = 0; _i2 < sides; _i2++) { - x = points[2 * _i2] = points[2 * _i2] * sx; - y = points[2 * _i2 + 1] = points[2 * _i2 + 1] * sy; - - minX = Math.min(minX, x); - maxX = Math.max(maxX, x); - minY = Math.min(minY, y); - maxY = Math.max(maxY, y); - } - - if (minY < -1) { - for (var _i3 = 0; _i3 < sides; _i3++) { - y = points[2 * _i3 + 1] = points[2 * _i3 + 1] + (-1 - minY); - } - } - - return points; -}; - -math.generateUnitNgonPoints = function (sides, rotationRadians) { - - var increment = 1.0 / sides * 2 * Math.PI; - var startAngle = sides % 2 === 0 ? Math.PI / 2.0 + increment / 2.0 : Math.PI / 2.0; - - startAngle += rotationRadians; - - var points = new Array(sides * 2); - - var currentAngle = void 0; - for (var i = 0; i < sides; i++) { - currentAngle = i * increment + startAngle; - - points[2 * i] = Math.cos(currentAngle); // x - points[2 * i + 1] = Math.sin(-currentAngle); // y - } - - return points; -}; - -math.getRoundRectangleRadius = function (width, height) { - - // Set the default radius, unless half of width or height is smaller than default - return Math.min(width / 4, height / 4, 8); -}; - -math.getCutRectangleCornerLength = function () { - return 8; -}; - -math.bezierPtsToQuadCoeff = function (p0, p1, p2) { - return [p0 - 2 * p1 + p2, 2 * (p1 - p0), p0]; -}; - -math.getBarrelCurveConstants = function (width, height) { - // get curve width, height, and control point position offsets as a percentage of node height / width - return { - heightOffset: Math.min(15, 0.05 * height), - widthOffset: Math.min(100, 0.25 * width), - ctrlPtOffsetPct: 0.05 - }; -}; - -module.exports = math; - -/***/ }), -/* 3 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = typeof window === 'undefined' ? null : window; // eslint-disable-line no-undef - -/***/ }), -/* 4 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -// use this module to cherry pick functions into your prototype -// (useful for functions shared between the core and collections, for example) - -// e.g. -// let foo = define.foo({ /* params... */ }) - -var util = __webpack_require__(1); - -var define = {}; - -[__webpack_require__(44), __webpack_require__(46), __webpack_require__(47)].forEach(function (m) { - util.assign(define, m); -}); - -module.exports = define; - -/***/ }), -/* 5 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; - -/*! -Embeddable Minimum Strictly-Compliant Promises/A+ 1.1.1 Thenable -Copyright (c) 2013-2014 Ralf S. Engelschall (http://engelschall.com) -Licensed under The MIT License (http://opensource.org/licenses/MIT) -*/ - -/* promise states [Promises/A+ 2.1] */ -var STATE_PENDING = 0; /* [Promises/A+ 2.1.1] */ -var STATE_FULFILLED = 1; /* [Promises/A+ 2.1.2] */ -var STATE_REJECTED = 2; /* [Promises/A+ 2.1.3] */ - -/* promise object constructor */ -var api = function api(executor) { - /* optionally support non-constructor/plain-function call */ - if (!(this instanceof api)) return new api(executor); - - /* initialize object */ - this.id = 'Thenable/1.0.7'; - this.state = STATE_PENDING; /* initial state */ - this.fulfillValue = undefined; /* initial value */ /* [Promises/A+ 1.3, 2.1.2.2] */ - this.rejectReason = undefined; /* initial reason */ /* [Promises/A+ 1.5, 2.1.3.2] */ - this.onFulfilled = []; /* initial handlers */ - this.onRejected = []; /* initial handlers */ - - /* provide optional information-hiding proxy */ - this.proxy = { - then: this.then.bind(this) - }; - - /* support optional executor function */ - if (typeof executor === 'function') executor.call(this, this.fulfill.bind(this), this.reject.bind(this)); -}; - -/* promise API methods */ -api.prototype = { - /* promise resolving methods */ - fulfill: function fulfill(value) { - return deliver(this, STATE_FULFILLED, 'fulfillValue', value); - }, - reject: function reject(value) { - return deliver(this, STATE_REJECTED, 'rejectReason', value); - }, - - /* "The then Method" [Promises/A+ 1.1, 1.2, 2.2] */ - then: function then(onFulfilled, onRejected) { - var curr = this; - var next = new api(); /* [Promises/A+ 2.2.7] */ - curr.onFulfilled.push(resolver(onFulfilled, next, 'fulfill')); /* [Promises/A+ 2.2.2/2.2.6] */ - curr.onRejected.push(resolver(onRejected, next, 'reject')); /* [Promises/A+ 2.2.3/2.2.6] */ - execute(curr); - return next.proxy; /* [Promises/A+ 2.2.7, 3.3] */ - } -}; - -/* deliver an action */ -var deliver = function deliver(curr, state, name, value) { - if (curr.state === STATE_PENDING) { - curr.state = state; /* [Promises/A+ 2.1.2.1, 2.1.3.1] */ - curr[name] = value; /* [Promises/A+ 2.1.2.2, 2.1.3.2] */ - execute(curr); - } - return curr; -}; - -/* execute all handlers */ -var execute = function execute(curr) { - if (curr.state === STATE_FULFILLED) execute_handlers(curr, 'onFulfilled', curr.fulfillValue);else if (curr.state === STATE_REJECTED) execute_handlers(curr, 'onRejected', curr.rejectReason); -}; - -/* execute particular set of handlers */ -var execute_handlers = function execute_handlers(curr, name, value) { - /* global setImmediate: true */ - /* global setTimeout: true */ - - /* short-circuit processing */ - if (curr[name].length === 0) return; - - /* iterate over all handlers, exactly once */ - var handlers = curr[name]; - curr[name] = []; /* [Promises/A+ 2.2.2.3, 2.2.3.3] */ - var func = function func() { - for (var i = 0; i < handlers.length; i++) { - handlers[i](value); - } /* [Promises/A+ 2.2.5] */ - }; - - /* execute procedure asynchronously */ /* [Promises/A+ 2.2.4, 3.1] */ - if (typeof setImmediate === 'function') setImmediate(func);else setTimeout(func, 0); -}; - -/* generate a resolver function */ -var resolver = function resolver(cb, next, method) { - return function (value) { - if (typeof cb !== 'function') /* [Promises/A+ 2.2.1, 2.2.7.3, 2.2.7.4] */ - next[method].call(next, value); /* [Promises/A+ 2.2.7.3, 2.2.7.4] */ - else { - var result; - try { - result = cb(value); - } /* [Promises/A+ 2.2.2.1, 2.2.3.1, 2.2.5, 3.2] */ - catch (e) { - next.reject(e); /* [Promises/A+ 2.2.7.2] */ - return; - } - resolve(next, result); /* [Promises/A+ 2.2.7.1] */ - } - }; -}; - -/* "Promise Resolution Procedure" */ /* [Promises/A+ 2.3] */ -var resolve = function resolve(promise, x) { - /* sanity check arguments */ /* [Promises/A+ 2.3.1] */ - if (promise === x || promise.proxy === x) { - promise.reject(new TypeError('cannot resolve promise with itself')); - return; - } - - /* surgically check for a "then" method - (mainly to just call the "getter" of "then" only once) */ - var then; - if ((typeof x === 'undefined' ? 'undefined' : _typeof(x)) === 'object' && x !== null || typeof x === 'function') { - try { - then = x.then; - } /* [Promises/A+ 2.3.3.1, 3.5] */ - catch (e) { - promise.reject(e); /* [Promises/A+ 2.3.3.2] */ - return; - } - } - - /* handle own Thenables [Promises/A+ 2.3.2] - and similar "thenables" [Promises/A+ 2.3.3] */ - if (typeof then === 'function') { - var resolved = false; - try { - /* call retrieved "then" method */ /* [Promises/A+ 2.3.3.3] */ - then.call(x, - /* resolvePromise */ /* [Promises/A+ 2.3.3.3.1] */ - function (y) { - if (resolved) return;resolved = true; /* [Promises/A+ 2.3.3.3.3] */ - if (y === x) /* [Promises/A+ 3.6] */ - promise.reject(new TypeError('circular thenable chain'));else resolve(promise, y); - }, - - /* rejectPromise */ /* [Promises/A+ 2.3.3.3.2] */ - function (r) { - if (resolved) return;resolved = true; /* [Promises/A+ 2.3.3.3.3] */ - promise.reject(r); - }); - } catch (e) { - if (!resolved) /* [Promises/A+ 2.3.3.3.3] */ - promise.reject(e); /* [Promises/A+ 2.3.3.3.4] */ - } - return; - } - - /* handle other values */ - promise.fulfill(x); /* [Promises/A+ 2.3.4, 2.3.3.4] */ -}; - -// so we always have Promise.all() -api.all = function (ps) { - return new api(function (resolveAll, rejectAll) { - var vals = new Array(ps.length); - var doneCount = 0; - - var fulfill = function fulfill(i, val) { - vals[i] = val; - doneCount++; - - if (doneCount === ps.length) { - resolveAll(vals); - } - }; - - for (var i = 0; i < ps.length; i++) { - (function (i) { - var p = ps[i]; - var isPromise = p != null && p.then != null; - - if (isPromise) { - p.then(function (val) { - fulfill(i, val); - }, function (err) { - rejectAll(err); - }); - } else { - var val = p; - fulfill(i, val); - } - })(i); - } - }); -}; - -api.resolve = function (val) { - return new api(function (resolve, reject) { - resolve(val); - }); -}; - -api.reject = function (val) { - return new api(function (resolve, reject) { - reject(val); - }); -}; - -module.exports = typeof Promise !== 'undefined' ? Promise : api; // eslint-disable-line no-undef - -/***/ }), -/* 6 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var newQuery = __webpack_require__(10); - -var Selector = function Selector(selector) { - var self = this; - - self._private = { - selectorText: selector, - invalid: true - }; - - if (selector == null || is.string(selector) && selector.match(/^\s*$/)) { - - self.length = 0; - } else if (selector === '*' || selector === 'edge' || selector === 'node') { - - // make single, group-only selectors cheap to make and cheap to filter - - self[0] = newQuery(); - self[0].group = selector === '*' ? selector : selector + 's'; - self[0].groupOnly = true; - self[0].length = 1; - self._private.invalid = false; - self.length = 1; - } else if (is.elementOrCollection(selector)) { - - var collection = selector.collection(); - - self[0] = newQuery(); - self[0].collection = collection; - self[0].length = 1; - self.length = 1; - } else if (is.fn(selector)) { - - self[0] = newQuery(); - self[0].filter = selector; - self[0].length = 1; - self.length = 1; - } else if (is.string(selector)) { - if (!self.parse(selector)) { - return; - } - } else { - util.error('A selector must be created from a string; found ', selector); - return; - } - - self._private.invalid = false; -}; - -var selfn = Selector.prototype; - -selfn.valid = function () { - return !this._private.invalid; -}; - -selfn.invalid = function () { - return this._private.invalid; -}; - -selfn.text = function () { - return this._private.selectorText; -}; - -selfn.size = function () { - return this.length; -}; - -selfn.eq = function (i) { - return this[i]; -}; - -selfn.sameText = function (otherSel) { - return this.text() === otherSel.text(); -}; - -selfn.toString = selfn.selector = function () { - - if (this._private.toStringCache != null) { - return this._private.toStringCache; - } - - var i = void 0; - var str = ''; - - var clean = function clean(obj) { - if (obj == null) { - return ''; - } else { - return obj; - } - }; - - var cleanVal = function cleanVal(val) { - if (is.string(val)) { - return '"' + val + '"'; - } else { - return clean(val); - } - }; - - var space = function space(val) { - return ' ' + val + ' '; - }; - - var queryToString = function queryToString(query) { - var str = ''; - var j = void 0, - sel = void 0; - - if (query.subject === query) { - str += '$'; - } - - var group = clean(query.group); - str += group.substring(0, group.length - 1); - - for (j = 0; j < query.data.length; j++) { - var data = query.data[j]; - - if (data.value) { - str += '[' + data.field + space(clean(data.operator)) + cleanVal(data.value) + ']'; - } else { - str += '[' + clean(data.operator) + data.field + ']'; - } - } - - for (j = 0; j < query.meta.length; j++) { - var meta = query.meta[j]; - str += '[[' + meta.field + space(clean(meta.operator)) + cleanVal(meta.value) + ']]'; - } - - for (j = 0; j < query.colonSelectors.length; j++) { - sel = query.colonSelectors[i]; - str += sel; - } - - for (j = 0; j < query.ids.length; j++) { - sel = '#' + query.ids[i]; - str += sel; - } - - for (j = 0; j < query.classes.length; j++) { - sel = '.' + query.classes[j]; - str += sel; - } - - if (query.source != null && query.target != null) { - str = queryToString(query.source) + ' -> ' + queryToString(query.target); - } - - if (query.connectedNodes != null) { - var n = query.connectedNodes; - - str = queryToString(n[0]) + ' <-> ' + queryToString(n[1]); - } - - if (query.parent != null) { - str = queryToString(query.parent) + ' > ' + str; - } - - if (query.ancestor != null) { - str = queryToString(query.ancestor) + ' ' + str; - } - - if (query.child != null) { - str += ' > ' + queryToString(query.child); - } - - if (query.descendant != null) { - str += ' ' + queryToString(query.descendant); - } - - return str; - }; - - for (i = 0; i < this.length; i++) { - var query = this[i]; - - str += queryToString(query); - - if (this.length > 1 && i < this.length - 1) { - str += ', '; - } - } - - this._private.toStringCache = str; - - return str; -}; - -[__webpack_require__(50), __webpack_require__(53)].forEach(function (p) { - return util.assign(selfn, p); -}); - -module.exports = Selector; - -/***/ }), -/* 7 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); -var Map = __webpack_require__(28); -var Set = __webpack_require__(8); - -var Element = __webpack_require__(14); - -// factory for generating edge ids when no id is specified for a new element -var idFactory = { - generate: function generate(cy, element, tryThisId) { - var id = tryThisId != null ? tryThisId : util.uuid(); - - while (cy.hasElementWithId(id)) { - id = util.uuid(); - } - - return id; - } -}; - -// represents a set of nodes, edges, or both together -var Collection = function Collection(cy, elements, options) { - if (cy === undefined || !is.core(cy)) { - util.error('A collection must have a reference to the core'); - return; - } - - var map = new Map(); - var createdElements = false; - - if (!elements) { - elements = []; - } else if (elements.length > 0 && is.plainObject(elements[0]) && !is.element(elements[0])) { - createdElements = true; - - // make elements from json and restore all at once later - var eles = []; - var elesIds = new Set(); - - for (var i = 0, l = elements.length; i < l; i++) { - var json = elements[i]; - - if (json.data == null) { - json.data = {}; - } - - var data = json.data; - - // make sure newly created elements have valid ids - if (data.id == null) { - data.id = idFactory.generate(cy, json); - } else if (cy.hasElementWithId(data.id) || elesIds.has(data.id)) { - continue; // can't create element if prior id already exists - } - - var ele = new Element(cy, json, false); - eles.push(ele); - elesIds.add(data.id); - } - - elements = eles; - } - - this.length = 0; - - for (var _i = 0, _l = elements.length; _i < _l; _i++) { - var element = elements[_i]; - if (element == null) { - continue; - } - - var id = element._private.data.id; - - if (options == null || options.unique && !map.has(id)) { - map.set(id, { - index: this.length, - ele: element - }); - - this[this.length] = element; - this.length++; - } - } - - this._private = { - cy: cy, - map: map - }; - - // restore the elements if we created them from json - if (createdElements) { - this.restore(); - } -}; - -// Functions -//////////////////////////////////////////////////////////////////////////////////////////////////// - -// keep the prototypes in sync (an element has the same functions as a collection) -// and use elefn and elesfn as shorthands to the prototypes -var elesfn = Element.prototype = Collection.prototype; - -elesfn.instanceString = function () { - return 'collection'; -}; - -elesfn.spawn = function (cy, eles, opts) { - if (!is.core(cy)) { - // cy is optional - opts = eles; - eles = cy; - cy = this.cy(); - } - - return new Collection(cy, eles, opts); -}; - -elesfn.spawnSelf = function () { - return this.spawn(this); -}; - -elesfn.cy = function () { - return this._private.cy; -}; - -elesfn.renderer = function () { - return this._private.cy.renderer(); -}; - -elesfn.element = function () { - return this[0]; -}; - -elesfn.collection = function () { - if (is.collection(this)) { - return this; - } else { - // an element - return new Collection(this._private.cy, [this]); - } -}; - -elesfn.unique = function () { - return new Collection(this._private.cy, this, { unique: true }); -}; - -elesfn.hasElementWithId = function (id) { - return this._private.map.has(id); -}; - -elesfn.getElementById = function (id) { - var cy = this._private.cy; - var entry = this._private.map.get(id); - - return entry ? entry.ele : new Collection(cy); // get ele or empty collection -}; - -elesfn.$id = elesfn.getElementById; - -elesfn.poolIndex = function () { - var cy = this._private.cy; - var eles = cy._private.elements; - var id = this._private.data.id; - - return eles._private.map.get(id).index; -}; - -elesfn.json = function (obj) { - var ele = this.element(); - var cy = this.cy(); - - if (ele == null && obj) { - return this; - } // can't set to no eles - - if (ele == null) { - return undefined; - } // can't get from no eles - - var p = ele._private; - - if (is.plainObject(obj)) { - // set - - cy.startBatch(); - - if (obj.data) { - ele.data(obj.data); - - var data = p.data; - - if (ele.isEdge()) { - // source and target are immutable via data() - var move = false; - var spec = {}; - var src = obj.data.source; - var tgt = obj.data.target; - - if (src != null && src !== data.source) { - spec.source = src; - move = true; - } - - if (tgt != null && tgt !== data.target) { - spec.target = tgt; - move = true; - } - - if (move) { - ele = ele.move(spec); - } - } else { - // parent is immutable via data() - var parent = obj.data.parent; - - if (parent != null && parent !== data.parent) { - ele = ele.move({ parent: parent }); - } - } - } - - if (obj.position) { - ele.position(obj.position); - } - - // ignore group -- immutable - - var checkSwitch = function checkSwitch(k, trueFnName, falseFnName) { - var obj_k = obj[k]; - - if (obj_k != null && obj_k !== p[k]) { - if (obj_k) { - ele[trueFnName](); - } else { - ele[falseFnName](); - } - } - }; - - checkSwitch('removed', 'remove', 'restore'); - - checkSwitch('selected', 'select', 'unselect'); - - checkSwitch('selectable', 'selectify', 'unselectify'); - - checkSwitch('locked', 'lock', 'unlock'); - - checkSwitch('grabbable', 'grabify', 'ungrabify'); - - if (obj.classes != null) { - ele.classes(obj.classes); - } - - cy.endBatch(); - - return this; - } else if (obj === undefined) { - // get - - var json = { - data: util.copy(p.data), - position: util.copy(p.position), - group: p.group, - removed: p.removed, - selected: p.selected, - selectable: p.selectable, - locked: p.locked, - grabbable: p.grabbable, - classes: null - }; - - json.classes = ''; - - var i = 0; - p.classes.forEach(function (cls) { - return json.classes += i++ === 0 ? cls : ' ' + cls; - }); - - return json; - } -}; - -elesfn.jsons = function () { - var jsons = []; - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var json = ele.json(); - - jsons.push(json); - } - - return jsons; -}; - -elesfn.clone = function () { - var cy = this.cy(); - var elesArr = []; - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var json = ele.json(); - var clone = new Element(cy, json, false); // NB no restore - - elesArr.push(clone); - } - - return new Collection(cy, elesArr); -}; -elesfn.copy = elesfn.clone; - -elesfn.restore = function (notifyRenderer) { - var self = this; - var cy = self.cy(); - var cy_p = cy._private; - - if (notifyRenderer === undefined) { - notifyRenderer = true; - } - - // create arrays of nodes and edges, since we need to - // restore the nodes first - var nodes = []; - var edges = []; - var elements = void 0; - for (var _i2 = 0, l = self.length; _i2 < l; _i2++) { - var ele = self[_i2]; - - if (!ele.removed()) { - // don't need to handle this ele - continue; - } - - // keep nodes first in the array and edges after - if (ele.isNode()) { - // put to front of array if node - nodes.push(ele); - } else { - // put to end of array if edge - edges.push(ele); - } - } - - elements = nodes.concat(edges); - - var i = void 0; - var removeFromElements = function removeFromElements() { - elements.splice(i, 1); - i--; - }; - - // now, restore each element - for (i = 0; i < elements.length; i++) { - var _ele = elements[i]; - - var _private = _ele._private; - var data = _private.data; - - // the traversal cache should start fresh when ele is added - _ele.clearTraversalCache(); - - // set id and validate - if (data.id === undefined) { - data.id = idFactory.generate(cy, _ele); - } else if (is.number(data.id)) { - data.id = '' + data.id; // now it's a string - } else if (is.emptyString(data.id) || !is.string(data.id)) { - util.error('Can not create element with invalid string ID `' + data.id + '`'); - - // can't create element if it has empty string as id or non-string id - removeFromElements(); - continue; - } else if (cy.hasElementWithId(data.id)) { - util.error('Can not create second element with ID `' + data.id + '`'); - - // can't create element if one already has that id - removeFromElements(); - continue; - } - - var id = data.id; // id is finalised, now let's keep a ref - - if (_ele.isNode()) { - // extra checks for nodes - var pos = _private.position; - - // make sure the nodes have a defined position - - if (pos.x == null) { - pos.x = 0; - } - - if (pos.y == null) { - pos.y = 0; - } - } - - if (_ele.isEdge()) { - // extra checks for edges - - var edge = _ele; - var fields = ['source', 'target']; - var fieldsLength = fields.length; - var badSourceOrTarget = false; - for (var j = 0; j < fieldsLength; j++) { - - var field = fields[j]; - var val = data[field]; - - if (is.number(val)) { - val = data[field] = '' + data[field]; // now string - } - - if (val == null || val === '') { - // can't create if source or target is not defined properly - util.error('Can not create edge `' + id + '` with unspecified ' + field); - badSourceOrTarget = true; - } else if (!cy.hasElementWithId(val)) { - // can't create edge if one of its nodes doesn't exist - util.error('Can not create edge `' + id + '` with nonexistant ' + field + ' `' + val + '`'); - badSourceOrTarget = true; - } - } - - if (badSourceOrTarget) { - removeFromElements();continue; - } // can't create this - - var src = cy.getElementById(data.source); - var tgt = cy.getElementById(data.target); - - src._private.edges.push(edge); - tgt._private.edges.push(edge); - - edge._private.source = src; - edge._private.target = tgt; - } // if is edge - - // create mock ids / indexes maps for element so it can be used like collections - _private.map = new Map(); - _private.map.set(id, { ele: _ele, index: 0 }); - - _private.removed = false; - cy.addToPool(_ele); - } // for each element - - // do compound node sanity checks - for (var _i3 = 0; _i3 < nodes.length; _i3++) { - // each node - var node = nodes[_i3]; - var _data = node._private.data; - - if (is.number(_data.parent)) { - // then automake string - _data.parent = '' + _data.parent; - } - - var parentId = _data.parent; - - var specifiedParent = parentId != null; - - if (specifiedParent) { - var parent = cy.getElementById(parentId); - - if (parent.empty()) { - // non-existant parent; just remove it - _data.parent = undefined; - } else { - var selfAsParent = false; - var ancestor = parent; - while (!ancestor.empty()) { - if (node.same(ancestor)) { - // mark self as parent and remove from data - selfAsParent = true; - _data.parent = undefined; // remove parent reference - - // exit or we loop forever - break; - } - - ancestor = ancestor.parent(); - } - - if (!selfAsParent) { - // connect with children - parent[0]._private.children.push(node); - node._private.parent = parent[0]; - - // let the core know we have a compound graph - cy_p.hasCompoundNodes = true; - } - } // else - } // if specified parent - } // for each node - - if (elements.length > 0) { - var restored = new Collection(cy, elements); - - for (var _i4 = 0; _i4 < restored.length; _i4++) { - var _ele2 = restored[_i4]; - - if (_ele2.isNode()) { - continue; - } - - // adding an edge invalidates the traversal caches for the parallel edges - _ele2.parallelEdges().clearTraversalCache(); - - // adding an edge invalidates the traversal cache for the connected nodes - _ele2.source().clearTraversalCache(); - _ele2.target().clearTraversalCache(); - } - - var toUpdateStyle = void 0; - - if (cy_p.hasCompoundNodes) { - toUpdateStyle = cy.collection().merge(restored).merge(restored.connectedNodes()).merge(restored.parent()); - } else { - toUpdateStyle = restored; - } - - toUpdateStyle.dirtyCompoundBoundsCache().updateStyle(notifyRenderer); - - if (notifyRenderer) { - restored.emitAndNotify('add'); - } else { - restored.emit('add'); - } - } - - return self; // chainability -}; - -elesfn.removed = function () { - var ele = this[0]; - return ele && ele._private.removed; -}; - -elesfn.inside = function () { - var ele = this[0]; - return ele && !ele._private.removed; -}; - -elesfn.remove = function (notifyRenderer) { - var self = this; - var removed = []; - var elesToRemove = []; - var elesToRemoveIds = {}; - var cy = self._private.cy; - - if (notifyRenderer === undefined) { - notifyRenderer = true; - } - - // add connected edges - function addConnectedEdges(node) { - var edges = node._private.edges; - for (var i = 0; i < edges.length; i++) { - add(edges[i]); - } - } - - // add descendant nodes - function addChildren(node) { - var children = node._private.children; - - for (var i = 0; i < children.length; i++) { - add(children[i]); - } - } - - function add(ele) { - var alreadyAdded = elesToRemoveIds[ele.id()]; - if (ele.removed() || alreadyAdded) { - return; - } else { - elesToRemoveIds[ele.id()] = true; - } - - if (ele.isNode()) { - elesToRemove.push(ele); // nodes are removed last - - addConnectedEdges(ele); - addChildren(ele); - } else { - elesToRemove.unshift(ele); // edges are removed first - } - } - - // make the list of elements to remove - // (may be removing more than specified due to connected edges etc) - - for (var i = 0, l = self.length; i < l; i++) { - var ele = self[i]; - - add(ele); - } - - function removeEdgeRef(node, edge) { - var connectedEdges = node._private.edges; - - util.removeFromArray(connectedEdges, edge); - - // removing an edges invalidates the traversal cache for its nodes - node.clearTraversalCache(); - } - - function removeParallelRefs(edge) { - // removing an edge invalidates the traversal caches for the parallel edges - edge.parallelEdges().clearTraversalCache(); - } - - var alteredParents = []; - alteredParents.ids = {}; - - function removeChildRef(parent, ele) { - ele = ele[0]; - parent = parent[0]; - - var children = parent._private.children; - var pid = parent.id(); - - util.removeFromArray(children, ele); - - if (!alteredParents.ids[pid]) { - alteredParents.ids[pid] = true; - alteredParents.push(parent); - } - } - - self.dirtyCompoundBoundsCache(); - - cy.removeFromPool(elesToRemove); // remove from core pool - - for (var _i5 = 0; _i5 < elesToRemove.length; _i5++) { - var _ele3 = elesToRemove[_i5]; - - // mark as removed - _ele3._private.removed = true; - - // add to list of removed elements - removed.push(_ele3); - - if (_ele3.isEdge()) { - // remove references to this edge in its connected nodes - var src = _ele3.source()[0]; - var tgt = _ele3.target()[0]; - - removeEdgeRef(src, _ele3); - removeEdgeRef(tgt, _ele3); - removeParallelRefs(_ele3); - } else { - // remove reference to parent - var parent = _ele3.parent(); - - if (parent.length !== 0) { - removeChildRef(parent, _ele3); - } - } - } - - // check to see if we have a compound graph or not - var elesStillInside = cy._private.elements; - cy._private.hasCompoundNodes = false; - for (var _i6 = 0; _i6 < elesStillInside.length; _i6++) { - var _ele4 = elesStillInside[_i6]; - - if (_ele4.isParent()) { - cy._private.hasCompoundNodes = true; - break; - } - } - - var removedElements = new Collection(this.cy(), removed); - if (removedElements.size() > 0) { - // must manually notify since trigger won't do this automatically once removed - - if (notifyRenderer) { - this.cy().notify({ - type: 'remove', - eles: removedElements - }); - } - - removedElements.emit('remove'); - } - - // the parents who were modified by the removal need their style updated - for (var _i7 = 0; _i7 < alteredParents.length; _i7++) { - var _ele5 = alteredParents[_i7]; - - if (!_ele5.removed()) { - _ele5.updateStyle(); - } - } - - return new Collection(cy, removed); -}; - -elesfn.move = function (struct) { - var cy = this._private.cy; - - if (struct.source !== undefined || struct.target !== undefined) { - var srcId = struct.source; - var tgtId = struct.target; - var srcExists = cy.hasElementWithId(srcId); - var tgtExists = cy.hasElementWithId(tgtId); - - if (srcExists || tgtExists) { - var jsons = this.jsons(); - - this.remove(); - - for (var i = 0; i < jsons.length; i++) { - var json = jsons[i]; - var ele = this[i]; - - if (json.group === 'edges') { - if (srcExists) { - json.data.source = srcId; - } - - if (tgtExists) { - json.data.target = tgtId; - } - - json.scratch = ele._private.scratch; - } - } - - return cy.add(jsons); - } - } else if (struct.parent !== undefined) { - // move node to new parent - var parentId = struct.parent; - var parentExists = parentId === null || cy.hasElementWithId(parentId); - - if (parentExists) { - var _jsons = this.jsons(); - var descs = this.descendants(); - var descsEtcJsons = descs.union(descs.union(this).connectedEdges()).jsons(); - - this.remove(); // NB: also removes descendants and their connected edges - - for (var _i8 = 0; _i8 < _jsons.length; _i8++) { - var _json = _jsons[_i8]; - var _ele6 = this[_i8]; - - if (_json.group === 'nodes') { - _json.data.parent = parentId === null ? undefined : parentId; - - _json.scratch = _ele6._private.scratch; - } - } - - return cy.add(_jsons.concat(descsEtcJsons)); - } - } - - return this; // if nothing done -}; - -[__webpack_require__(29), __webpack_require__(43), __webpack_require__(48), __webpack_require__(49), __webpack_require__(54), __webpack_require__(55), __webpack_require__(56), __webpack_require__(57), __webpack_require__(62), __webpack_require__(63), __webpack_require__(64), __webpack_require__(7), __webpack_require__(65), __webpack_require__(66), __webpack_require__(67), __webpack_require__(68), __webpack_require__(69)].forEach(function (props) { - util.extend(elesfn, props); -}); - -module.exports = Collection; - -/***/ }), -/* 8 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -/* global Set */ - -var undef = true ? 'undefined' : _typeof(undefined); - -var ObjectSet = function () { - function ObjectSet(arrayOrObjectSet) { - _classCallCheck(this, ObjectSet); - - this._obj = Object.create(null); - - if (arrayOrObjectSet != null) { - var arr = void 0; - - if (arrayOrObjectSet.instanceString != null && arrayOrObjectSet.instanceString() === this.instanceString()) { - arr = arrayOrObjectSet.toArray(); - } else { - arr = arrayOrObjectSet; - } - - for (var i = 0; i < arr.length; i++) { - this.add(arr[i]); - } - } - } - - _createClass(ObjectSet, [{ - key: 'instanceString', - value: function instanceString() { - return 'set'; - } - }, { - key: 'add', - value: function add(val) { - this._obj[val] = 1; - } - }, { - key: 'delete', - value: function _delete(val) { - this._obj[val] = 0; - } - }, { - key: 'clear', - value: function clear() { - this._obj = Object.create(null); - } - }, { - key: 'has', - value: function has(val) { - return this._obj[val] === 1; - } - }, { - key: 'toArray', - value: function toArray() { - var _this = this; - - return Object.keys(this._obj).filter(function (key) { - return _this.has(key); - }); - } - }, { - key: 'forEach', - value: function forEach(callback, thisArg) { - return this.toArray().forEach(callback, thisArg); - } - }, { - key: 'size', - get: function get() { - return this.toArray().length; - } - }]); - - return ObjectSet; -}(); - -// TODO use the stdlib Set in future... -// module.exports = typeof Set !== undef ? Set : ObjectSet; - - -module.exports = ObjectSet; - -/***/ }), -/* 9 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = __webpack_require__(32); - -/***/ }), -/* 10 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -// storage for parsed queries -var newQuery = function newQuery() { - return { - classes: [], - colonSelectors: [], - data: [], - group: null, - ids: [], - meta: [], - - // fake selectors - collection: null, // a collection to match against - filter: null, // filter function - - // these are defined in the upward direction rather than down (e.g. child) - // because we need to go up in Selector.filter() - parent: null, // parent query obj - ancestor: null, // ancestor query obj - subject: null, // defines subject in compound query (subject query obj; points to self if subject) - - // use these only when subject has been defined - child: null, - descendant: null - }; -}; - -module.exports = newQuery; - -/***/ }), -/* 11 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); -var Event = __webpack_require__(16); - -var eventRegex = /^([^.]+)(\.(?:[^.]+))?$/; // regex for matching event strings (e.g. "click.namespace") -var universalNamespace = '.*'; // matches as if no namespace specified and prevents users from unbinding accidentally - -var defaults = { - qualifierCompare: function qualifierCompare(q1, q2) { - return q1 === q2; - }, - eventMatches: function eventMatches() /*context, listener, eventObj*/{ - return true; - }, - eventFields: function eventFields() /*context*/{ - return {}; - }, - callbackContext: function callbackContext(context /*, listener, eventObj*/) { - return context; - }, - beforeEmit: function beforeEmit() /* context, listener, eventObj */{}, - afterEmit: function afterEmit() /* context, listener, eventObj */{}, - bubble: function bubble() /*context*/{ - return false; - }, - parent: function parent() /*context*/{ - return null; - }, - context: undefined -}; - -function Emitter(opts) { - util.assign(this, defaults, opts); - - this.listeners = []; - this.emitting = 0; -} - -var p = Emitter.prototype; - -var forEachEvent = function forEachEvent(self, handler, events, qualifier, callback, conf, confOverrides) { - if (is.fn(qualifier)) { - callback = qualifier; - qualifier = null; - } - - if (confOverrides) { - if (conf == null) { - conf = confOverrides; - } else { - conf = util.assign({}, conf, confOverrides); - } - } - - var eventList = events.split(/\s+/); - - for (var i = 0; i < eventList.length; i++) { - var evt = eventList[i]; - - if (is.emptyString(evt)) { - continue; - } - - var match = evt.match(eventRegex); // type[.namespace] - - if (match) { - var type = match[1]; - var namespace = match[2] ? match[2] : null; - var ret = handler(self, evt, type, namespace, qualifier, callback, conf); - - if (ret === false) { - break; - } // allow exiting early - } - } -}; - -var makeEventObj = function makeEventObj(self, obj) { - return new Event(obj.type, util.assign(obj, self.eventFields(self.context))); -}; - -var forEachEventObj = function forEachEventObj(self, handler, events) { - if (is.event(events)) { - handler(self, events); - - return; - } else if (is.plainObject(events)) { - handler(self, makeEventObj(self, events)); - - return; - } - - var eventList = events.split(/\s+/); - - for (var i = 0; i < eventList.length; i++) { - var evt = eventList[i]; - - if (is.emptyString(evt)) { - continue; - } - - var match = evt.match(eventRegex); // type[.namespace] - - if (match) { - var type = match[1]; - var namespace = match[2] ? match[2] : null; - var eventObj = makeEventObj(self, { - type: type, - namespace: namespace, - target: self.context - }); - - handler(self, eventObj); - } - } -}; - -p.on = p.addListener = function (events, qualifier, callback, conf, confOverrides) { - forEachEvent(this, function (self, event, type, namespace, qualifier, callback, conf) { - if (is.fn(callback)) { - self.listeners.push({ - event: event, // full event string - callback: callback, // callback to run - type: type, // the event type (e.g. 'click') - namespace: namespace, // the event namespace (e.g. ".foo") - qualifier: qualifier, // a restriction on whether to match this emitter - conf: conf // additional configuration - }); - } - }, events, qualifier, callback, conf, confOverrides); - - return this; -}; - -p.one = function (events, qualifier, callback, conf) { - return this.on(events, qualifier, callback, conf, { one: true }); -}; - -p.removeListener = p.off = function (events, qualifier, callback, conf) { - var _this = this; - - if (this.emitting !== 0) { - this.listeners = util.copyArray(this.listeners); - } - - var listeners = this.listeners; - - var _loop = function _loop(i) { - var listener = listeners[i]; - - forEachEvent(_this, function (self, event, type, namespace, qualifier, callback /*, conf*/) { - if (listener.type === type && (!namespace || listener.namespace === namespace) && (!qualifier || self.qualifierCompare(listener.qualifier, qualifier)) && (!callback || listener.callback === callback)) { - listeners.splice(i, 1); - - return false; - } - }, events, qualifier, callback, conf); - }; - - for (var i = listeners.length - 1; i >= 0; i--) { - _loop(i); - } - - return this; -}; - -p.emit = p.trigger = function (events, extraParams, manualCallback) { - var listeners = this.listeners; - var numListenersBeforeEmit = listeners.length; - - this.emitting++; - - if (!is.array(extraParams)) { - extraParams = [extraParams]; - } - - forEachEventObj(this, function (self, eventObj) { - if (manualCallback != null) { - listeners = [{ - event: eventObj.event, - type: eventObj.type, - namespace: eventObj.namespace, - callback: manualCallback - }]; - - numListenersBeforeEmit = listeners.length; - } - - var _loop2 = function _loop2(i) { - var listener = listeners[i]; - - if (listener.type === eventObj.type && (!listener.namespace || listener.namespace === eventObj.namespace || listener.namespace === universalNamespace) && self.eventMatches(self.context, listener, eventObj)) { - var args = [eventObj]; - - if (extraParams != null) { - util.push(args, extraParams); - } - - self.beforeEmit(self.context, listener, eventObj); - - if (listener.conf && listener.conf.one) { - self.listeners = self.listeners.filter(function (l) { - return l !== listener; - }); - } - - var context = self.callbackContext(self.context, listener, eventObj); - var ret = listener.callback.apply(context, args); - - self.afterEmit(self.context, listener, eventObj); - - if (ret === false) { - eventObj.stopPropagation(); - eventObj.preventDefault(); - } - } // if listener matches - }; - - for (var i = 0; i < numListenersBeforeEmit; i++) { - _loop2(i); - } // for listener - - if (self.bubble(self.context) && !eventObj.isPropagationStopped()) { - self.parent(self.context).emit(eventObj, extraParams); - } - }, events); - - this.emitting--; - - return this; -}; - -module.exports = Emitter; - -/***/ }), -/* 12 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var window = __webpack_require__(3); -var util = __webpack_require__(1); -var Collection = __webpack_require__(7); -var is = __webpack_require__(0); -var Promise = __webpack_require__(5); -var define = __webpack_require__(4); - -var Core = function Core(opts) { - var cy = this; - - opts = util.extend({}, opts); - - var container = opts.container; - - // allow for passing a wrapped jquery object - // e.g. cytoscape({ container: $('#cy') }) - if (container && !is.htmlElement(container) && is.htmlElement(container[0])) { - container = container[0]; - } - - var reg = container ? container._cyreg : null; // e.g. already registered some info (e.g. readies) via jquery - reg = reg || {}; - - if (reg && reg.cy) { - reg.cy.destroy(); - - reg = {}; // old instance => replace reg completely - } - - var readies = reg.readies = reg.readies || []; - - if (container) { - container._cyreg = reg; - } // make sure container assoc'd reg points to this cy - reg.cy = cy; - - var head = window !== undefined && container !== undefined && !opts.headless; - var options = opts; - options.layout = util.extend({ name: head ? 'grid' : 'null' }, options.layout); - options.renderer = util.extend({ name: head ? 'canvas' : 'null' }, options.renderer); - - var defVal = function defVal(def, val, altVal) { - if (val !== undefined) { - return val; - } else if (altVal !== undefined) { - return altVal; - } else { - return def; - } - }; - - var _p = this._private = { - container: container, // html dom ele container - ready: false, // whether ready has been triggered - options: options, // cached options - elements: new Collection(this), // elements in the graph - listeners: [], // list of listeners - aniEles: new Collection(this), // elements being animated - scratch: {}, // scratch object for core - layout: null, - renderer: null, - destroyed: false, // whether destroy was called - notificationsEnabled: true, // whether notifications are sent to the renderer - minZoom: 1e-50, - maxZoom: 1e50, - zoomingEnabled: defVal(true, options.zoomingEnabled), - userZoomingEnabled: defVal(true, options.userZoomingEnabled), - panningEnabled: defVal(true, options.panningEnabled), - userPanningEnabled: defVal(true, options.userPanningEnabled), - boxSelectionEnabled: defVal(true, options.boxSelectionEnabled), - autolock: defVal(false, options.autolock, options.autolockNodes), - autoungrabify: defVal(false, options.autoungrabify, options.autoungrabifyNodes), - autounselectify: defVal(false, options.autounselectify), - styleEnabled: options.styleEnabled === undefined ? head : options.styleEnabled, - zoom: is.number(options.zoom) ? options.zoom : 1, - pan: { - x: is.plainObject(options.pan) && is.number(options.pan.x) ? options.pan.x : 0, - y: is.plainObject(options.pan) && is.number(options.pan.y) ? options.pan.y : 0 - }, - animation: { // object for currently-running animations - current: [], - queue: [] - }, - hasCompoundNodes: false - }; - - this.createEmitter(); - - // set selection type - var selType = options.selectionType; - if (selType === undefined || selType !== 'additive' && selType !== 'single') { - // then set default - - _p.selectionType = 'single'; - } else { - _p.selectionType = selType; - } - - // init zoom bounds - if (is.number(options.minZoom) && is.number(options.maxZoom) && options.minZoom < options.maxZoom) { - _p.minZoom = options.minZoom; - _p.maxZoom = options.maxZoom; - } else if (is.number(options.minZoom) && options.maxZoom === undefined) { - _p.minZoom = options.minZoom; - } else if (is.number(options.maxZoom) && options.minZoom === undefined) { - _p.maxZoom = options.maxZoom; - } - - var loadExtData = function loadExtData(extData, next) { - var anyIsPromise = extData.some(is.promise); - - if (anyIsPromise) { - return Promise.all(extData).then(next); // load all data asynchronously, then exec rest of init - } else { - next(extData); // exec synchronously for convenience - } - }; - - // start with the default stylesheet so we have something before loading an external stylesheet - if (_p.styleEnabled) { - cy.setStyle([]); - } - - // create the renderer - cy.initRenderer(util.extend({ - hideEdgesOnViewport: options.hideEdgesOnViewport, - textureOnViewport: options.textureOnViewport, - wheelSensitivity: is.number(options.wheelSensitivity) && options.wheelSensitivity > 0 ? options.wheelSensitivity : 1, - motionBlur: options.motionBlur === undefined ? false : options.motionBlur, // off by default - motionBlurOpacity: options.motionBlurOpacity === undefined ? 0.05 : options.motionBlurOpacity, - pixelRatio: is.number(options.pixelRatio) && options.pixelRatio > 0 ? options.pixelRatio : undefined, - desktopTapThreshold: options.desktopTapThreshold === undefined ? 4 : options.desktopTapThreshold, - touchTapThreshold: options.touchTapThreshold === undefined ? 8 : options.touchTapThreshold - }, options.renderer)); - - var setElesAndLayout = function setElesAndLayout(elements, onload, ondone) { - cy.notifications(false); - - // remove old elements - var oldEles = cy.mutableElements(); - if (oldEles.length > 0) { - oldEles.remove(); - } - - if (elements != null) { - if (is.plainObject(elements) || is.array(elements)) { - cy.add(elements); - } - } - - cy.one('layoutready', function (e) { - cy.notifications(true); - cy.emit(e); // we missed this event by turning notifications off, so pass it on - - cy.notify({ - type: 'load', - eles: cy.mutableElements() - }); - - cy.one('load', onload); - cy.emit('load'); - }).one('layoutstop', function () { - cy.one('done', ondone); - cy.emit('done'); - }); - - var layoutOpts = util.extend({}, cy._private.options.layout); - layoutOpts.eles = cy.elements(); - - cy.layout(layoutOpts).run(); - }; - - loadExtData([options.style, options.elements], function (thens) { - var initStyle = thens[0]; - var initEles = thens[1]; - - // init style - if (_p.styleEnabled) { - cy.style().append(initStyle); - } - - // initial load - setElesAndLayout(initEles, function () { - // onready - cy.startAnimationLoop(); - _p.ready = true; - - // if a ready callback is specified as an option, the bind it - if (is.fn(options.ready)) { - cy.on('ready', options.ready); - } - - // bind all the ready handlers registered before creating this instance - for (var i = 0; i < readies.length; i++) { - var fn = readies[i]; - cy.on('ready', fn); - } - if (reg) { - reg.readies = []; - } // clear b/c we've bound them all and don't want to keep it around in case a new core uses the same div etc - - cy.emit('ready'); - }, options.done); - }); -}; - -var corefn = Core.prototype; // short alias - -util.extend(corefn, { - instanceString: function instanceString() { - return 'core'; - }, - - isReady: function isReady() { - return this._private.ready; - }, - - isDestroyed: function isDestroyed() { - return this._private.destroyed; - }, - - ready: function ready(fn) { - if (this.isReady()) { - this.emitter().emit('ready', [], fn); // just calls fn as though triggered via ready event - } else { - this.on('ready', fn); - } - - return this; - }, - - destroy: function destroy() { - var cy = this; - if (cy.isDestroyed()) return; - - cy.stopAnimationLoop(); - - cy.destroyRenderer(); - - this.emit('destroy'); - - cy._private.destroyed = true; - - return cy; - }, - - hasElementWithId: function hasElementWithId(id) { - return this._private.elements.hasElementWithId(id); - }, - - getElementById: function getElementById(id) { - return this._private.elements.getElementById(id); - }, - - selectionType: function selectionType() { - return this._private.selectionType; - }, - - hasCompoundNodes: function hasCompoundNodes() { - return this._private.hasCompoundNodes; - }, - - headless: function headless() { - return this._private.options.renderer.name === 'null'; - }, - - styleEnabled: function styleEnabled() { - return this._private.styleEnabled; - }, - - addToPool: function addToPool(eles) { - this._private.elements.merge(eles); - - return this; // chaining - }, - - removeFromPool: function removeFromPool(eles) { - this._private.elements.unmerge(eles); - - return this; - }, - - container: function container() { - return this._private.container; - }, - - options: function options() { - return util.copy(this._private.options); - }, - - json: function json(obj) { - var cy = this; - var _p = cy._private; - var eles = cy.mutableElements(); - - if (is.plainObject(obj)) { - // set - - cy.startBatch(); - - if (obj.elements) { - var idInJson = {}; - - var updateEles = function updateEles(jsons, gr) { - var toAdd = []; - - for (var i = 0; i < jsons.length; i++) { - var json = jsons[i]; - var id = json.data.id; - var ele = cy.getElementById(id); - - idInJson[id] = true; - - if (ele.length !== 0) { - // existing element should be updated - ele.json(json); - } else { - // otherwise should be added - if (gr) { - toAdd.push(util.extend({ group: gr }, json)); - } else { - toAdd.push(json); - } - } - } - - cy.add(toAdd); - }; - - if (is.array(obj.elements)) { - // elements: [] - updateEles(obj.elements); - } else { - // elements: { nodes: [], edges: [] } - var grs = ['nodes', 'edges']; - for (var i = 0; i < grs.length; i++) { - var gr = grs[i]; - var elements = obj.elements[gr]; - - if (is.array(elements)) { - updateEles(elements, gr); - } - } - } - - // elements not specified in json should be removed - eles.stdFilter(function (ele) { - return !idInJson[ele.id()]; - }).remove(); - } - - if (obj.style) { - cy.style(obj.style); - } - - if (obj.zoom != null && obj.zoom !== _p.zoom) { - cy.zoom(obj.zoom); - } - - if (obj.pan) { - if (obj.pan.x !== _p.pan.x || obj.pan.y !== _p.pan.y) { - cy.pan(obj.pan); - } - } - - var fields = ['minZoom', 'maxZoom', 'zoomingEnabled', 'userZoomingEnabled', 'panningEnabled', 'userPanningEnabled', 'boxSelectionEnabled', 'autolock', 'autoungrabify', 'autounselectify']; - - for (var _i = 0; _i < fields.length; _i++) { - var f = fields[_i]; - - if (obj[f] != null) { - cy[f](obj[f]); - } - } - - cy.endBatch(); - - return this; // chaining - } else if (obj === undefined) { - // get - var json = {}; - - json.elements = {}; - eles.forEach(function (ele) { - var group = ele.group(); - - if (!json.elements[group]) { - json.elements[group] = []; - } - - json.elements[group].push(ele.json()); - }); - - if (this._private.styleEnabled) { - json.style = cy.style().json(); - } - - json.zoomingEnabled = cy._private.zoomingEnabled; - json.userZoomingEnabled = cy._private.userZoomingEnabled; - json.zoom = cy._private.zoom; - json.minZoom = cy._private.minZoom; - json.maxZoom = cy._private.maxZoom; - json.panningEnabled = cy._private.panningEnabled; - json.userPanningEnabled = cy._private.userPanningEnabled; - json.pan = util.copy(cy._private.pan); - json.boxSelectionEnabled = cy._private.boxSelectionEnabled; - json.renderer = util.copy(cy._private.options.renderer); - json.hideEdgesOnViewport = cy._private.options.hideEdgesOnViewport; - json.textureOnViewport = cy._private.options.textureOnViewport; - json.wheelSensitivity = cy._private.options.wheelSensitivity; - json.motionBlur = cy._private.options.motionBlur; - - return json; - } - }, - - scratch: define.data({ - field: 'scratch', - bindingEvent: 'scratch', - allowBinding: true, - allowSetting: true, - settingEvent: 'scratch', - settingTriggersEvent: true, - triggerFnName: 'trigger', - allowGetting: true - }), - - removeScratch: define.removeData({ - field: 'scratch', - event: 'scratch', - triggerFnName: 'trigger', - triggerEvent: true - }) - -}); - -corefn.$id = corefn.getElementById; - -[__webpack_require__(70), __webpack_require__(71), __webpack_require__(79), __webpack_require__(80), __webpack_require__(81), __webpack_require__(82), __webpack_require__(83), __webpack_require__(84), __webpack_require__(85), __webpack_require__(94)].forEach(function (props) { - util.extend(corefn, props); -}); - -module.exports = Core; - -/***/ }), -/* 13 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = function memoize(fn, keyFn) { - if (!keyFn) { - keyFn = function keyFn() { - if (arguments.length === 1) { - return arguments[0]; - } else if (arguments.length === 0) { - return 'undefined'; - } - - var args = []; - - for (var i = 0; i < arguments.length; i++) { - args.push(arguments[i]); - } - - return args.join('$'); - }; - } - - var memoizedFn = function memoizedFn() { - var self = this; - var args = arguments; - var ret = void 0; - var k = keyFn.apply(self, args); - var cache = memoizedFn.cache; - - if (!(ret = cache[k])) { - ret = cache[k] = fn.apply(self, args); - } - - return ret; - }; - - memoizedFn.cache = {}; - - return memoizedFn; -}; - -/***/ }), -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); -var Set = __webpack_require__(8); - -// represents a node or an edge -var Element = function Element(cy, params, restore) { - restore = restore === undefined || restore ? true : false; - - if (cy === undefined || params === undefined || !is.core(cy)) { - util.error('An element must have a core reference and parameters set'); - return; - } - - var group = params.group; - - // try to automatically infer the group if unspecified - if (group == null) { - if (params.data && params.data.source != null && params.data.target != null) { - group = 'edges'; - } else { - group = 'nodes'; - } - } - - // validate group - if (group !== 'nodes' && group !== 'edges') { - util.error('An element must be of type `nodes` or `edges`; you specified `' + group + '`'); - return; - } - - // make the element array-like, just like a collection - this.length = 1; - this[0] = this; - - // NOTE: when something is added here, add also to ele.json() - var _p = this._private = { - cy: cy, - single: true, // indicates this is an element - data: params.data || {}, // data object - position: params.position || {}, // (x, y) position pair - autoWidth: undefined, // width and height of nodes calculated by the renderer when set to special 'auto' value - autoHeight: undefined, - autoPadding: undefined, - compoundBoundsClean: false, // whether the compound dimensions need to be recalculated the next time dimensions are read - listeners: [], // array of bound listeners - group: group, // string; 'nodes' or 'edges' - style: {}, // properties as set by the style - rstyle: {}, // properties for style sent from the renderer to the core - styleCxts: [], // applied style contexts from the styler - removed: true, // whether it's inside the vis; true if removed (set true here since we call restore) - selected: params.selected ? true : false, // whether it's selected - selectable: params.selectable === undefined ? true : params.selectable ? true : false, // whether it's selectable - locked: params.locked ? true : false, // whether the element is locked (cannot be moved) - grabbed: false, // whether the element is grabbed by the mouse; renderer sets this privately - grabbable: params.grabbable === undefined ? true : params.grabbable ? true : false, // whether the element can be grabbed - active: false, // whether the element is active from user interaction - classes: new Set(), // map ( className => true ) - animation: { // object for currently-running animations - current: [], - queue: [] - }, - rscratch: {}, // object in which the renderer can store information - scratch: params.scratch || {}, // scratch objects - edges: [], // array of connected edges - children: [], // array of children - parent: null, // parent ref - traversalCache: {}, // cache of output of traversal functions - backgrounding: false // whether background images are loading - }; - - // renderedPosition overrides if specified - if (params.renderedPosition) { - var rpos = params.renderedPosition; - var pan = cy.pan(); - var zoom = cy.zoom(); - - _p.position = { - x: (rpos.x - pan.x) / zoom, - y: (rpos.y - pan.y) / zoom - }; - } - - if (is.string(params.classes)) { - var classes = params.classes.split(/\s+/); - for (var i = 0, l = classes.length; i < l; i++) { - var cls = classes[i]; - if (!cls || cls === '') { - continue; - } - - _p.classes.add(cls); - } - } - - if (params.style || params.css) { - cy.style().applyBypass(this, params.style || params.css); - } - - this.createEmitter(); - - if (restore === undefined || restore) { - this.restore(); - } -}; - -module.exports = Element; - -/***/ }), -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var stateSelectors = [{ - selector: ':selected', - matches: function matches(ele) { - return ele.selected(); - } -}, { - selector: ':unselected', - matches: function matches(ele) { - return !ele.selected(); - } -}, { - selector: ':selectable', - matches: function matches(ele) { - return ele.selectable(); - } -}, { - selector: ':unselectable', - matches: function matches(ele) { - return !ele.selectable(); - } -}, { - selector: ':locked', - matches: function matches(ele) { - return ele.locked(); - } -}, { - selector: ':unlocked', - matches: function matches(ele) { - return !ele.locked(); - } -}, { - selector: ':visible', - matches: function matches(ele) { - return ele.visible(); - } -}, { - selector: ':hidden', - matches: function matches(ele) { - return !ele.visible(); - } -}, { - selector: ':transparent', - matches: function matches(ele) { - return ele.transparent(); - } -}, { - selector: ':grabbed', - matches: function matches(ele) { - return ele.grabbed(); - } -}, { - selector: ':free', - matches: function matches(ele) { - return !ele.grabbed(); - } -}, { - selector: ':removed', - matches: function matches(ele) { - return ele.removed(); - } -}, { - selector: ':inside', - matches: function matches(ele) { - return !ele.removed(); - } -}, { - selector: ':grabbable', - matches: function matches(ele) { - return ele.grabbable(); - } -}, { - selector: ':ungrabbable', - matches: function matches(ele) { - return !ele.grabbable(); - } -}, { - selector: ':animated', - matches: function matches(ele) { - return ele.animated(); - } -}, { - selector: ':unanimated', - matches: function matches(ele) { - return !ele.animated(); - } -}, { - selector: ':parent', - matches: function matches(ele) { - return ele.isParent(); - } -}, { - selector: ':childless', - matches: function matches(ele) { - return ele.isChildless(); - } -}, { - selector: ':child', - matches: function matches(ele) { - return ele.isChild(); - } -}, { - selector: ':orphan', - matches: function matches(ele) { - return ele.isOrphan(); - } -}, { - selector: ':nonorphan', - matches: function matches(ele) { - return ele.isChild(); - } -}, { - selector: ':loop', - matches: function matches(ele) { - return ele.isLoop(); - } -}, { - selector: ':simple', - matches: function matches(ele) { - return ele.isSimple(); - } -}, { - selector: ':active', - matches: function matches(ele) { - return ele.active(); - } -}, { - selector: ':inactive', - matches: function matches(ele) { - return !ele.active(); - } -}, { - selector: ':backgrounding', - matches: function matches(ele) { - return ele.backgrounding(); - } -}, { - selector: ':nonbackgrounding', - matches: function matches(ele) { - return !ele.backgrounding(); - } -}].sort(function (a, b) { - // n.b. selectors that are starting substrings of others must have the longer ones first - return util.sort.descending(a.selector, b.selector); -}); - -var stateSelectorMatches = function stateSelectorMatches(sel, ele) { - var lookup = stateSelectorMatches.lookup = stateSelectorMatches.lookup || function () { - var selToFn = {}; - var s = void 0; - - for (var i = 0; i < stateSelectors.length; i++) { - s = stateSelectors[i]; - - selToFn[s.selector] = s.matches; - } - - return selToFn; - }(); - - return lookup[sel](ele); -}; - -var stateSelectorRegex = '(' + stateSelectors.map(function (s) { - return s.selector; -}).join('|') + ')'; - -module.exports = { stateSelectors: stateSelectors, stateSelectorMatches: stateSelectorMatches, stateSelectorRegex: stateSelectorRegex }; - -/***/ }), -/* 16 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/*! -Event object based on jQuery events, MIT license - -https://jquery.org/license/ -https://tldrlegal.com/license/mit-license -https://github.com/jquery/jquery/blob/master/src/event.js -*/ - -var Event = function Event(src, props) { - this.recycle(src, props); -}; - -function returnFalse() { - return false; -} - -function returnTrue() { - return true; -} - -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -Event.prototype = { - instanceString: function instanceString() { - return 'event'; - }, - - recycle: function recycle(src, props) { - this.isImmediatePropagationStopped = this.isPropagationStopped = this.isDefaultPrevented = returnFalse; - - if (src != null && src.preventDefault) { - // Browser Event object - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented ? returnTrue : returnFalse; - } else if (src != null && src.type) { - // Plain object containing all event details - props = src; - } else { - // Event string - this.type = src; - } - - // Put explicitly provided properties onto the event object - if (props != null) { - // more efficient to manually copy fields we use - this.originalEvent = props.originalEvent; - this.type = props.type != null ? props.type : this.type; - this.cy = props.cy; - this.target = props.target; - this.position = props.position; - this.renderedPosition = props.renderedPosition; - this.namespace = props.namespace; - this.layout = props.layout; - } - - if (this.cy != null && this.position != null && this.renderedPosition == null) { - // create a rendered position based on the passed position - var pos = this.position; - var zoom = this.cy.zoom(); - var pan = this.cy.pan(); - - this.renderedPosition = { - x: pos.x * zoom + pan.x, - y: pos.y * zoom + pan.y - }; - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || Date.now(); - }, - - preventDefault: function preventDefault() { - this.isDefaultPrevented = returnTrue; - - var e = this.originalEvent; - if (!e) { - return; - } - - // if preventDefault exists run it on the original event - if (e.preventDefault) { - e.preventDefault(); - } - }, - - stopPropagation: function stopPropagation() { - this.isPropagationStopped = returnTrue; - - var e = this.originalEvent; - if (!e) { - return; - } - - // if stopPropagation exists run it on the original event - if (e.stopPropagation) { - e.stopPropagation(); - } - }, - - stopImmediatePropagation: function stopImmediatePropagation() { - this.isImmediatePropagationStopped = returnTrue; - this.stopPropagation(); - }, - - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse -}; - -module.exports = Event; - -/***/ }), -/* 17 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/** - * Elements are drawn in a specific order based on compound depth (low to high), the element type (nodes above edges), - * and z-index (low to high). These styles affect how this applies: - * - * z-compound-depth: May be `bottom | orphan | auto | top`. The first drawn is `bottom`, then `orphan` which is the - * same depth as the root of the compound graph, followed by the default value `auto` which draws in order from - * root to leaves of the compound graph. The last drawn is `top`. - * z-index-compare: May be `auto | manual`. The default value is `auto` which always draws edges under nodes. - * `manual` ignores this convention and draws based on the `z-index` value setting. - * z-index: An integer value that affects the relative draw order of elements. In general, an element with a higher - * `z-index` will be drawn on top of an element with a lower `z-index`. - */ -var util = __webpack_require__(1); - -var zIndexSort = function zIndexSort(a, b) { - var cy = a.cy(); - var hasCompoundNodes = cy.hasCompoundNodes(); - - function getDepth(ele) { - var style = ele.pstyle('z-compound-depth'); - if (style.value === 'auto') { - return hasCompoundNodes ? ele.zDepth() : 0; - } else if (style.value === 'bottom') { - return -1; - } else if (style.value === 'top') { - return util.MAX_INT; - } - // 'orphan' - return 0; - } - var depthDiff = getDepth(a) - getDepth(b); - if (depthDiff !== 0) { - return depthDiff; - } - - function getEleDepth(ele) { - var style = ele.pstyle('z-index-compare'); - if (style.value === 'auto') { - return ele.isNode() ? 1 : 0; - } - // 'manual' - return 0; - } - var eleDiff = getEleDepth(a) - getEleDepth(b); - if (eleDiff !== 0) { - return eleDiff; - } - - var zDiff = a.pstyle('z-index').value - b.pstyle('z-index').value; - if (zDiff !== 0) { - return zDiff; - } - // compare indices in the core (order added to graph w/ last on top) - return a.poolIndex() - b.poolIndex(); -}; - -module.exports = zIndexSort; - -/***/ }), -/* 18 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var Selector = __webpack_require__(6); - -var Style = function Style(cy) { - - if (!(this instanceof Style)) { - return new Style(cy); - } - - if (!is.core(cy)) { - util.error('A style must have a core reference'); - return; - } - - this._private = { - cy: cy, - coreStyle: {} - }; - - this.length = 0; - - this.resetToDefault(); -}; - -var styfn = Style.prototype; - -styfn.instanceString = function () { - return 'style'; -}; - -// remove all contexts -styfn.clear = function () { - for (var i = 0; i < this.length; i++) { - this[i] = undefined; - } - this.length = 0; - - var _p = this._private; - - _p.newStyle = true; - - return this; // chaining -}; - -styfn.resetToDefault = function () { - this.clear(); - this.addDefaultStylesheet(); - - return this; -}; - -// builds a style object for the 'core' selector -styfn.core = function () { - return this._private.coreStyle; -}; - -// create a new context from the specified selector string and switch to that context -styfn.selector = function (selectorStr) { - // 'core' is a special case and does not need a selector - var selector = selectorStr === 'core' ? null : new Selector(selectorStr); - - var i = this.length++; // new context means new index - this[i] = { - selector: selector, - properties: [], - mappedProperties: [], - index: i - }; - - return this; // chaining -}; - -// add one or many css rules to the current context -styfn.css = function () { - var self = this; - var args = arguments; - - switch (args.length) { - case 1: - var map = args[0]; - - for (var i = 0; i < self.properties.length; i++) { - var prop = self.properties[i]; - var mapVal = map[prop.name]; - - if (mapVal === undefined) { - mapVal = map[util.dash2camel(prop.name)]; - } - - if (mapVal !== undefined) { - this.cssRule(prop.name, mapVal); - } - } - - break; - - case 2: - this.cssRule(args[0], args[1]); - break; - - default: - break; // do nothing if args are invalid - } - - return this; // chaining -}; -styfn.style = styfn.css; - -// add a single css rule to the current context -styfn.cssRule = function (name, value) { - // name-value pair - var property = this.parse(name, value); - - // add property to current context if valid - if (property) { - var i = this.length - 1; - this[i].properties.push(property); - this[i].properties[property.name] = property; // allow access by name as well - - if (property.name.match(/pie-(\d+)-background-size/) && property.value) { - this._private.hasPie = true; - } - - if (property.mapped) { - this[i].mappedProperties.push(property); - } - - // add to core style if necessary - var currentSelectorIsCore = !this[i].selector; - if (currentSelectorIsCore) { - this._private.coreStyle[property.name] = property; - } - } - - return this; // chaining -}; - -styfn.append = function (style) { - if (is.stylesheet(style)) { - style.appendToStyle(this); - } else if (is.array(style)) { - this.appendFromJson(style); - } else if (is.string(style)) { - this.appendFromString(style); - } // you probably wouldn't want to append a Style, since you'd duplicate the default parts - - return this; -}; - -// static function -Style.fromJson = function (cy, json) { - var style = new Style(cy); - - style.fromJson(json); - - return style; -}; - -Style.fromString = function (cy, string) { - return new Style(cy).fromString(string); -}; - -[__webpack_require__(86), __webpack_require__(87), __webpack_require__(88), __webpack_require__(89), __webpack_require__(90), __webpack_require__(91), __webpack_require__(92), __webpack_require__(93)].forEach(function (props) { - util.extend(styfn, props); -}); - -Style.types = styfn.types; -Style.properties = styfn.properties; - -module.exports = Style; - -/***/ }), -/* 19 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var fullFpsTime = 1000 / 60; // assume 60 frames per second - -module.exports = { - setupDequeueing: function setupDequeueing(opts) { - return function setupDequeueingImpl() { - var self = this; - var r = this.renderer; - - if (self.dequeueingSetup) { - return; - } else { - self.dequeueingSetup = true; - } - - var queueRedraw = util.debounce(function () { - r.redrawHint('eles', true); - r.redrawHint('drag', true); - - r.redraw(); - }, opts.deqRedrawThreshold); - - var dequeue = function dequeue(willDraw, frameStartTime) { - var startTime = util.performanceNow(); - var avgRenderTime = r.averageRedrawTime; - var renderTime = r.lastRedrawTime; - var deqd = []; - var extent = r.cy.extent(); - var pixelRatio = r.getPixelRatio(); - - while (true) { - var now = util.performanceNow(); - var duration = now - startTime; - var frameDuration = now - frameStartTime; - - if (renderTime < fullFpsTime) { - // if we're rendering faster than the ideal fps, then do dequeueing - // during all of the remaining frame time - - var timeAvailable = fullFpsTime - (willDraw ? avgRenderTime : 0); - - if (frameDuration >= opts.deqFastCost * timeAvailable) { - break; - } - } else { - if (willDraw) { - if (duration >= opts.deqCost * renderTime || duration >= opts.deqAvgCost * avgRenderTime) { - break; - } - } else if (frameDuration >= opts.deqNoDrawCost * fullFpsTime) { - break; - } - } - - var thisDeqd = opts.deq(self, pixelRatio, extent); - - if (thisDeqd.length > 0) { - for (var i = 0; i < thisDeqd.length; i++) { - deqd.push(thisDeqd[i]); - } - } else { - break; - } - } - - // callbacks on dequeue - if (deqd.length > 0) { - opts.onDeqd(self, deqd); - - if (!willDraw && opts.shouldRedraw(self, deqd, pixelRatio, extent)) { - queueRedraw(); - } - } - }; - - var priority = opts.priority || util.noop; - - r.beforeRender(dequeue, priority(self)); - }; - } -}; - -/***/ }), -/* 20 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var Core = __webpack_require__(12); -var extension = __webpack_require__(95); -var Stylesheet = __webpack_require__(137); - -var cytoscape = function cytoscape(options) { - // jshint ignore:line - // if no options specified, use default - if (options === undefined) { - options = {}; - } - - // create instance - if (is.plainObject(options)) { - return new Core(options); - } - - // allow for registration of extensions - else if (is.string(options)) { - return extension.apply(extension, arguments); - } -}; - -// e.g. cytoscape.use( require('cytoscape-foo'), bar ) -cytoscape.use = function (ext) { - var args = Array.prototype.slice.call(arguments, 1); // args to pass to ext - - args.unshift(cytoscape); // cytoscape is first arg to ext - - ext.apply(null, args); - - return this; -}; - -// replaced by build system -cytoscape.version = __webpack_require__(138); - -// expose public apis (mostly for extensions) -cytoscape.stylesheet = cytoscape.Stylesheet = Stylesheet; - -module.exports = cytoscape; - -/***/ }), -/* 21 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -module.exports = { - // get [r, g, b] from #abc or #aabbcc - hex2tuple: function hex2tuple(hex) { - if (!(hex.length === 4 || hex.length === 7) || hex[0] !== '#') { - return; - } - - var shortHex = hex.length === 4; - var r = void 0, - g = void 0, - b = void 0; - var base = 16; - - if (shortHex) { - r = parseInt(hex[1] + hex[1], base); - g = parseInt(hex[2] + hex[2], base); - b = parseInt(hex[3] + hex[3], base); - } else { - r = parseInt(hex[1] + hex[2], base); - g = parseInt(hex[3] + hex[4], base); - b = parseInt(hex[5] + hex[6], base); - } - - return [r, g, b]; - }, - - // get [r, g, b, a] from hsl(0, 0, 0) or hsla(0, 0, 0, 0) - hsl2tuple: function hsl2tuple(hsl) { - var ret = void 0; - var h = void 0, - s = void 0, - l = void 0, - a = void 0, - r = void 0, - g = void 0, - b = void 0; - function hue2rgb(p, q, t) { - if (t < 0) t += 1; - if (t > 1) t -= 1; - if (t < 1 / 6) return p + (q - p) * 6 * t; - if (t < 1 / 2) return q; - if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6; - return p; - } - - var m = new RegExp('^' + this.regex.hsla + '$').exec(hsl); - if (m) { - - // get hue - h = parseInt(m[1]); - if (h < 0) { - h = (360 - -1 * h % 360) % 360; - } else if (h > 360) { - h = h % 360; - } - h /= 360; // normalise on [0, 1] - - s = parseFloat(m[2]); - if (s < 0 || s > 100) { - return; - } // saturation is [0, 100] - s = s / 100; // normalise on [0, 1] - - l = parseFloat(m[3]); - if (l < 0 || l > 100) { - return; - } // lightness is [0, 100] - l = l / 100; // normalise on [0, 1] - - a = m[4]; - if (a !== undefined) { - a = parseFloat(a); - - if (a < 0 || a > 1) { - return; - } // alpha is [0, 1] - } - - // now, convert to rgb - // code from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript - if (s === 0) { - r = g = b = Math.round(l * 255); // achromatic - } else { - var q = l < 0.5 ? l * (1 + s) : l + s - l * s; - var p = 2 * l - q; - r = Math.round(255 * hue2rgb(p, q, h + 1 / 3)); - g = Math.round(255 * hue2rgb(p, q, h)); - b = Math.round(255 * hue2rgb(p, q, h - 1 / 3)); - } - - ret = [r, g, b, a]; - } - - return ret; - }, - - // get [r, g, b, a] from rgb(0, 0, 0) or rgba(0, 0, 0, 0) - rgb2tuple: function rgb2tuple(rgb) { - var ret = void 0; - - var m = new RegExp('^' + this.regex.rgba + '$').exec(rgb); - if (m) { - ret = []; - - var isPct = []; - for (var i = 1; i <= 3; i++) { - var channel = m[i]; - - if (channel[channel.length - 1] === '%') { - isPct[i] = true; - } - channel = parseFloat(channel); - - if (isPct[i]) { - channel = channel / 100 * 255; // normalise to [0, 255] - } - - if (channel < 0 || channel > 255) { - return; - } // invalid channel value - - ret.push(Math.floor(channel)); - } - - var atLeastOneIsPct = isPct[1] || isPct[2] || isPct[3]; - var allArePct = isPct[1] && isPct[2] && isPct[3]; - if (atLeastOneIsPct && !allArePct) { - return; - } // must all be percent values if one is - - var alpha = m[4]; - if (alpha !== undefined) { - alpha = parseFloat(alpha); - - if (alpha < 0 || alpha > 1) { - return; - } // invalid alpha value - - ret.push(alpha); - } - } - - return ret; - }, - - colorname2tuple: function colorname2tuple(color) { - return this.colors[color.toLowerCase()]; - }, - - color2tuple: function color2tuple(color) { - return (is.array(color) ? color : null) || this.colorname2tuple(color) || this.hex2tuple(color) || this.rgb2tuple(color) || this.hsl2tuple(color); - }, - - colors: { - // special colour names - transparent: [0, 0, 0, 0], // NB alpha === 0 - - // regular colours - aliceblue: [240, 248, 255], - antiquewhite: [250, 235, 215], - aqua: [0, 255, 255], - aquamarine: [127, 255, 212], - azure: [240, 255, 255], - beige: [245, 245, 220], - bisque: [255, 228, 196], - black: [0, 0, 0], - blanchedalmond: [255, 235, 205], - blue: [0, 0, 255], - blueviolet: [138, 43, 226], - brown: [165, 42, 42], - burlywood: [222, 184, 135], - cadetblue: [95, 158, 160], - chartreuse: [127, 255, 0], - chocolate: [210, 105, 30], - coral: [255, 127, 80], - cornflowerblue: [100, 149, 237], - cornsilk: [255, 248, 220], - crimson: [220, 20, 60], - cyan: [0, 255, 255], - darkblue: [0, 0, 139], - darkcyan: [0, 139, 139], - darkgoldenrod: [184, 134, 11], - darkgray: [169, 169, 169], - darkgreen: [0, 100, 0], - darkgrey: [169, 169, 169], - darkkhaki: [189, 183, 107], - darkmagenta: [139, 0, 139], - darkolivegreen: [85, 107, 47], - darkorange: [255, 140, 0], - darkorchid: [153, 50, 204], - darkred: [139, 0, 0], - darksalmon: [233, 150, 122], - darkseagreen: [143, 188, 143], - darkslateblue: [72, 61, 139], - darkslategray: [47, 79, 79], - darkslategrey: [47, 79, 79], - darkturquoise: [0, 206, 209], - darkviolet: [148, 0, 211], - deeppink: [255, 20, 147], - deepskyblue: [0, 191, 255], - dimgray: [105, 105, 105], - dimgrey: [105, 105, 105], - dodgerblue: [30, 144, 255], - firebrick: [178, 34, 34], - floralwhite: [255, 250, 240], - forestgreen: [34, 139, 34], - fuchsia: [255, 0, 255], - gainsboro: [220, 220, 220], - ghostwhite: [248, 248, 255], - gold: [255, 215, 0], - goldenrod: [218, 165, 32], - gray: [128, 128, 128], - grey: [128, 128, 128], - green: [0, 128, 0], - greenyellow: [173, 255, 47], - honeydew: [240, 255, 240], - hotpink: [255, 105, 180], - indianred: [205, 92, 92], - indigo: [75, 0, 130], - ivory: [255, 255, 240], - khaki: [240, 230, 140], - lavender: [230, 230, 250], - lavenderblush: [255, 240, 245], - lawngreen: [124, 252, 0], - lemonchiffon: [255, 250, 205], - lightblue: [173, 216, 230], - lightcoral: [240, 128, 128], - lightcyan: [224, 255, 255], - lightgoldenrodyellow: [250, 250, 210], - lightgray: [211, 211, 211], - lightgreen: [144, 238, 144], - lightgrey: [211, 211, 211], - lightpink: [255, 182, 193], - lightsalmon: [255, 160, 122], - lightseagreen: [32, 178, 170], - lightskyblue: [135, 206, 250], - lightslategray: [119, 136, 153], - lightslategrey: [119, 136, 153], - lightsteelblue: [176, 196, 222], - lightyellow: [255, 255, 224], - lime: [0, 255, 0], - limegreen: [50, 205, 50], - linen: [250, 240, 230], - magenta: [255, 0, 255], - maroon: [128, 0, 0], - mediumaquamarine: [102, 205, 170], - mediumblue: [0, 0, 205], - mediumorchid: [186, 85, 211], - mediumpurple: [147, 112, 219], - mediumseagreen: [60, 179, 113], - mediumslateblue: [123, 104, 238], - mediumspringgreen: [0, 250, 154], - mediumturquoise: [72, 209, 204], - mediumvioletred: [199, 21, 133], - midnightblue: [25, 25, 112], - mintcream: [245, 255, 250], - mistyrose: [255, 228, 225], - moccasin: [255, 228, 181], - navajowhite: [255, 222, 173], - navy: [0, 0, 128], - oldlace: [253, 245, 230], - olive: [128, 128, 0], - olivedrab: [107, 142, 35], - orange: [255, 165, 0], - orangered: [255, 69, 0], - orchid: [218, 112, 214], - palegoldenrod: [238, 232, 170], - palegreen: [152, 251, 152], - paleturquoise: [175, 238, 238], - palevioletred: [219, 112, 147], - papayawhip: [255, 239, 213], - peachpuff: [255, 218, 185], - peru: [205, 133, 63], - pink: [255, 192, 203], - plum: [221, 160, 221], - powderblue: [176, 224, 230], - purple: [128, 0, 128], - red: [255, 0, 0], - rosybrown: [188, 143, 143], - royalblue: [65, 105, 225], - saddlebrown: [139, 69, 19], - salmon: [250, 128, 114], - sandybrown: [244, 164, 96], - seagreen: [46, 139, 87], - seashell: [255, 245, 238], - sienna: [160, 82, 45], - silver: [192, 192, 192], - skyblue: [135, 206, 235], - slateblue: [106, 90, 205], - slategray: [112, 128, 144], - slategrey: [112, 128, 144], - snow: [255, 250, 250], - springgreen: [0, 255, 127], - steelblue: [70, 130, 180], - tan: [210, 180, 140], - teal: [0, 128, 128], - thistle: [216, 191, 216], - tomato: [255, 99, 71], - turquoise: [64, 224, 208], - violet: [238, 130, 238], - wheat: [245, 222, 179], - white: [255, 255, 255], - whitesmoke: [245, 245, 245], - yellow: [255, 255, 0], - yellowgreen: [154, 205, 50] - } -}; - -/***/ }), -/* 22 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -module.exports = { - // has anything been set in the map - mapEmpty: function mapEmpty(map) { - var empty = true; - - if (map != null) { - return Object.keys(map).length === 0; - } - - return empty; - }, - - // pushes to the array at the end of a map (map may not be built) - pushMap: function pushMap(options) { - var array = this.getMap(options); - - if (array == null) { - // if empty, put initial array - this.setMap(this.extend({}, options, { - value: [options.value] - })); - } else { - array.push(options.value); - } - }, - - // sets the value in a map (map may not be built) - setMap: function setMap(options) { - var obj = options.map; - var key = void 0; - var keys = options.keys; - var l = keys.length; - - for (var i = 0; i < l; i++) { - var _key = keys[i]; - - if (is.plainObject(_key)) { - this.error('Tried to set map with object key'); - } - - if (i < keys.length - 1) { - - // extend the map if necessary - if (obj[_key] == null) { - obj[_key] = {}; - } - - obj = obj[_key]; - } else { - // set the value - obj[_key] = options.value; - } - } - }, - - // gets the value in a map even if it's not built in places - getMap: function getMap(options) { - var obj = options.map; - var keys = options.keys; - var l = keys.length; - - for (var i = 0; i < l; i++) { - var key = keys[i]; - - if (is.plainObject(key)) { - this.error('Tried to get map with object key'); - } - - obj = obj[key]; - - if (obj == null) { - return obj; - } - } - - return obj; - }, - - // deletes the entry in the map - deleteMap: function deleteMap(options) { - var obj = options.map; - var keys = options.keys; - var l = keys.length; - var keepChildren = options.keepChildren; - - for (var i = 0; i < l; i++) { - var key = keys[i]; - - if (is.plainObject(key)) { - this.error('Tried to delete map with object key'); - } - - var lastKey = i === options.keys.length - 1; - if (lastKey) { - - if (keepChildren) { - // then only delete child fields not in keepChildren - var children = Object.keys(obj); - - for (var j = 0; j < children.length; j++) { - var child = children[j]; - - if (!keepChildren[child]) { - obj[child] = undefined; - } - } - } else { - obj[key] = undefined; - } - } else { - obj = obj[key]; - } - } - } -}; - -/***/ }), -/* 23 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var number = '(?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?))'; - -var rgba = 'rgb[a]?\\((' + number + '[%]?)\\s*,\\s*(' + number + '[%]?)\\s*,\\s*(' + number + '[%]?)(?:\\s*,\\s*(' + number + '))?\\)'; -var rgbaNoBackRefs = 'rgb[a]?\\((?:' + number + '[%]?)\\s*,\\s*(?:' + number + '[%]?)\\s*,\\s*(?:' + number + '[%]?)(?:\\s*,\\s*(?:' + number + '))?\\)'; - -var hsla = 'hsl[a]?\\((' + number + ')\\s*,\\s*(' + number + '[%])\\s*,\\s*(' + number + '[%])(?:\\s*,\\s*(' + number + '))?\\)'; -var hslaNoBackRefs = 'hsl[a]?\\((?:' + number + ')\\s*,\\s*(?:' + number + '[%])\\s*,\\s*(?:' + number + '[%])(?:\\s*,\\s*(?:' + number + '))?\\)'; - -var hex3 = '\\#[0-9a-fA-F]{3}'; -var hex6 = '\\#[0-9a-fA-F]{6}'; - -module.exports = { - regex: { - number: number, - rgba: rgba, - rgbaNoBackRefs: rgbaNoBackRefs, - hsla: hsla, - hslaNoBackRefs: hslaNoBackRefs, - hex3: hex3, - hex6: hex6 - } -}; - -/***/ }), -/* 24 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var memoize = __webpack_require__(13); -var is = __webpack_require__(0); - -module.exports = { - - camel2dash: memoize(function (str) { - return str.replace(/([A-Z])/g, function (v) { - return '-' + v.toLowerCase(); - }); - }), - - dash2camel: memoize(function (str) { - return str.replace(/(-\w)/g, function (v) { - return v[1].toUpperCase(); - }); - }), - - prependCamel: memoize(function (prefix, str) { - return prefix + str[0].toUpperCase() + str.substring(1); - }, function (prefix, str) { - return prefix + '$' + str; - }), - - capitalize: function capitalize(str) { - if (is.emptyString(str)) { - return str; - } - - return str.charAt(0).toUpperCase() + str.substring(1); - } - -}; - -/***/ }), -/* 25 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var window = __webpack_require__(3); -var performance = window ? window.performance : null; - -var util = {}; - -var pnow = performance && performance.now ? function () { - return performance.now(); -} : function () { - return Date.now(); -}; - -var raf = function () { - if (window) { - if (window.requestAnimationFrame) { - return function (fn) { - window.requestAnimationFrame(fn); - }; - } else if (window.mozRequestAnimationFrame) { - return function (fn) { - window.mozRequestAnimationFrame(fn); - }; - } else if (window.webkitRequestAnimationFrame) { - return function (fn) { - window.webkitRequestAnimationFrame(fn); - }; - } else if (window.msRequestAnimationFrame) { - return function (fn) { - window.msRequestAnimationFrame(fn); - }; - } - } - - return function (fn) { - if (fn) { - setTimeout(function () { - fn(pnow()); - }, 1000 / 60); - } - }; -}(); - -util.requestAnimationFrame = function (fn) { - raf(fn); -}; - -util.performanceNow = pnow; - -util.debounce = __webpack_require__(26); - -util.now = function () { - return Date.now(); -}; - -module.exports = util; - -/***/ }), -/* 26 */ -/***/ (function(module, exports) { - -/** - * lodash (Custom Build) - * Build: `lodash modularize exports="npm" -o ./` - * Copyright jQuery Foundation and other contributors - * Released under MIT license - * Based on Underscore.js 1.8.3 - * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors - */ - -/** Used as the `TypeError` message for "Functions" methods. */ -var FUNC_ERROR_TEXT = 'Expected a function'; - -/** Used as references for various `Number` constants. */ -var NAN = 0 / 0; - -/** `Object#toString` result references. */ -var symbolTag = '[object Symbol]'; - -/** Used to match leading and trailing whitespace. */ -var reTrim = /^\s+|\s+$/g; - -/** Used to detect bad signed hexadecimal string values. */ -var reIsBadHex = /^[-+]0x[0-9a-f]+$/i; - -/** Used to detect binary string values. */ -var reIsBinary = /^0b[01]+$/i; - -/** Used to detect octal string values. */ -var reIsOctal = /^0o[0-7]+$/i; - -/** Built-in method references without a dependency on `root`. */ -var freeParseInt = parseInt; - -/** Detect free variable `global` from Node.js. */ -var freeGlobal = typeof global == 'object' && global && global.Object === Object && global; - -/** Detect free variable `self`. */ -var freeSelf = typeof self == 'object' && self && self.Object === Object && self; - -/** Used as a reference to the global object. */ -var root = freeGlobal || freeSelf || Function('return this')(); - -/** Used for built-in method references. */ -var objectProto = Object.prototype; - -/** - * Used to resolve the - * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) - * of values. - */ -var objectToString = objectProto.toString; - -/* Built-in method references for those with the same name as other `lodash` methods. */ -var nativeMax = Math.max, - nativeMin = Math.min; - -/** - * Gets the timestamp of the number of milliseconds that have elapsed since - * the Unix epoch (1 January 1970 00:00:00 UTC). - * - * @static - * @memberOf _ - * @since 2.4.0 - * @category Date - * @returns {number} Returns the timestamp. - * @example - * - * _.defer(function(stamp) { - * console.log(_.now() - stamp); - * }, _.now()); - * // => Logs the number of milliseconds it took for the deferred invocation. - */ -var now = function() { - return root.Date.now(); -}; - -/** - * Creates a debounced function that delays invoking `func` until after `wait` - * milliseconds have elapsed since the last time the debounced function was - * invoked. The debounced function comes with a `cancel` method to cancel - * delayed `func` invocations and a `flush` method to immediately invoke them. - * Provide `options` to indicate whether `func` should be invoked on the - * leading and/or trailing edge of the `wait` timeout. The `func` is invoked - * with the last arguments provided to the debounced function. Subsequent - * calls to the debounced function return the result of the last `func` - * invocation. - * - * **Note:** If `leading` and `trailing` options are `true`, `func` is - * invoked on the trailing edge of the timeout only if the debounced function - * is invoked more than once during the `wait` timeout. - * - * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred - * until to the next tick, similar to `setTimeout` with a timeout of `0`. - * - * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/) - * for details over the differences between `_.debounce` and `_.throttle`. - * - * @static - * @memberOf _ - * @since 0.1.0 - * @category Function - * @param {Function} func The function to debounce. - * @param {number} [wait=0] The number of milliseconds to delay. - * @param {Object} [options={}] The options object. - * @param {boolean} [options.leading=false] - * Specify invoking on the leading edge of the timeout. - * @param {number} [options.maxWait] - * The maximum time `func` is allowed to be delayed before it's invoked. - * @param {boolean} [options.trailing=true] - * Specify invoking on the trailing edge of the timeout. - * @returns {Function} Returns the new debounced function. - * @example - * - * // Avoid costly calculations while the window size is in flux. - * jQuery(window).on('resize', _.debounce(calculateLayout, 150)); - * - * // Invoke `sendMail` when clicked, debouncing subsequent calls. - * jQuery(element).on('click', _.debounce(sendMail, 300, { - * 'leading': true, - * 'trailing': false - * })); - * - * // Ensure `batchLog` is invoked once after 1 second of debounced calls. - * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 }); - * var source = new EventSource('/stream'); - * jQuery(source).on('message', debounced); - * - * // Cancel the trailing debounced invocation. - * jQuery(window).on('popstate', debounced.cancel); - */ -function debounce(func, wait, options) { - var lastArgs, - lastThis, - maxWait, - result, - timerId, - lastCallTime, - lastInvokeTime = 0, - leading = false, - maxing = false, - trailing = true; - - if (typeof func != 'function') { - throw new TypeError(FUNC_ERROR_TEXT); - } - wait = toNumber(wait) || 0; - if (isObject(options)) { - leading = !!options.leading; - maxing = 'maxWait' in options; - maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait; - trailing = 'trailing' in options ? !!options.trailing : trailing; - } - - function invokeFunc(time) { - var args = lastArgs, - thisArg = lastThis; - - lastArgs = lastThis = undefined; - lastInvokeTime = time; - result = func.apply(thisArg, args); - return result; - } - - function leadingEdge(time) { - // Reset any `maxWait` timer. - lastInvokeTime = time; - // Start the timer for the trailing edge. - timerId = setTimeout(timerExpired, wait); - // Invoke the leading edge. - return leading ? invokeFunc(time) : result; - } - - function remainingWait(time) { - var timeSinceLastCall = time - lastCallTime, - timeSinceLastInvoke = time - lastInvokeTime, - result = wait - timeSinceLastCall; - - return maxing ? nativeMin(result, maxWait - timeSinceLastInvoke) : result; - } - - function shouldInvoke(time) { - var timeSinceLastCall = time - lastCallTime, - timeSinceLastInvoke = time - lastInvokeTime; - - // Either this is the first call, activity has stopped and we're at the - // trailing edge, the system time has gone backwards and we're treating - // it as the trailing edge, or we've hit the `maxWait` limit. - return (lastCallTime === undefined || (timeSinceLastCall >= wait) || - (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait)); - } - - function timerExpired() { - var time = now(); - if (shouldInvoke(time)) { - return trailingEdge(time); - } - // Restart the timer. - timerId = setTimeout(timerExpired, remainingWait(time)); - } - - function trailingEdge(time) { - timerId = undefined; - - // Only invoke if we have `lastArgs` which means `func` has been - // debounced at least once. - if (trailing && lastArgs) { - return invokeFunc(time); - } - lastArgs = lastThis = undefined; - return result; - } - - function cancel() { - if (timerId !== undefined) { - clearTimeout(timerId); - } - lastInvokeTime = 0; - lastArgs = lastCallTime = lastThis = timerId = undefined; - } - - function flush() { - return timerId === undefined ? result : trailingEdge(now()); - } - - function debounced() { - var time = now(), - isInvoking = shouldInvoke(time); - - lastArgs = arguments; - lastThis = this; - lastCallTime = time; - - if (isInvoking) { - if (timerId === undefined) { - return leadingEdge(lastCallTime); - } - if (maxing) { - // Handle invocations in a tight loop. - timerId = setTimeout(timerExpired, wait); - return invokeFunc(lastCallTime); - } - } - if (timerId === undefined) { - timerId = setTimeout(timerExpired, wait); - } - return result; - } - debounced.cancel = cancel; - debounced.flush = flush; - return debounced; -} - -/** - * Checks if `value` is the - * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types) - * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`) - * - * @static - * @memberOf _ - * @since 0.1.0 - * @category Lang - * @param {*} value The value to check. - * @returns {boolean} Returns `true` if `value` is an object, else `false`. - * @example - * - * _.isObject({}); - * // => true - * - * _.isObject([1, 2, 3]); - * // => true - * - * _.isObject(_.noop); - * // => true - * - * _.isObject(null); - * // => false - */ -function isObject(value) { - var type = typeof value; - return !!value && (type == 'object' || type == 'function'); -} - -/** - * Checks if `value` is object-like. A value is object-like if it's not `null` - * and has a `typeof` result of "object". - * - * @static - * @memberOf _ - * @since 4.0.0 - * @category Lang - * @param {*} value The value to check. - * @returns {boolean} Returns `true` if `value` is object-like, else `false`. - * @example - * - * _.isObjectLike({}); - * // => true - * - * _.isObjectLike([1, 2, 3]); - * // => true - * - * _.isObjectLike(_.noop); - * // => false - * - * _.isObjectLike(null); - * // => false - */ -function isObjectLike(value) { - return !!value && typeof value == 'object'; -} - -/** - * Checks if `value` is classified as a `Symbol` primitive or object. - * - * @static - * @memberOf _ - * @since 4.0.0 - * @category Lang - * @param {*} value The value to check. - * @returns {boolean} Returns `true` if `value` is a symbol, else `false`. - * @example - * - * _.isSymbol(Symbol.iterator); - * // => true - * - * _.isSymbol('abc'); - * // => false - */ -function isSymbol(value) { - return typeof value == 'symbol' || - (isObjectLike(value) && objectToString.call(value) == symbolTag); -} - -/** - * Converts `value` to a number. - * - * @static - * @memberOf _ - * @since 4.0.0 - * @category Lang - * @param {*} value The value to process. - * @returns {number} Returns the number. - * @example - * - * _.toNumber(3.2); - * // => 3.2 - * - * _.toNumber(Number.MIN_VALUE); - * // => 5e-324 - * - * _.toNumber(Infinity); - * // => Infinity - * - * _.toNumber('3.2'); - * // => 3.2 - */ -function toNumber(value) { - if (typeof value == 'number') { - return value; - } - if (isSymbol(value)) { - return NAN; - } - if (isObject(value)) { - var other = typeof value.valueOf == 'function' ? value.valueOf() : value; - value = isObject(other) ? (other + '') : other; - } - if (typeof value != 'string') { - return value === 0 ? value : +value; - } - value = value.replace(reTrim, ''); - var isBinary = reIsBinary.test(value); - return (isBinary || reIsOctal.test(value)) - ? freeParseInt(value.slice(2), isBinary ? 2 : 8) - : (reIsBadHex.test(value) ? NAN : +value); -} - -module.exports = debounce; - - -/***/ }), -/* 27 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -function ascending(a, b) { - if (a < b) { - return -1; - } else if (a > b) { - return 1; - } else { - return 0; - } -} - -function descending(a, b) { - return -1 * ascending(a, b); -} - -module.exports = { - sort: { - ascending: ascending, - descending: descending - } -}; - -/***/ }), -/* 28 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -function ObjectMap() { - this._obj = {}; -} - -var p = ObjectMap.prototype; - -p.set = function (key, val) { - this._obj[key] = val; -}; - -p.delete = function (key) { - this._obj[key] = null; -}; - -p.has = function (key) { - return this._obj[key] != null; -}; - -p.get = function (key) { - return this._obj[key]; -}; - -// TODO use the stdlib Map in future... -// module.exports = typeof Map !== 'undefined' ? Map : ObjectMap; -module.exports = ObjectMap; - -/***/ }), -/* 29 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var elesfn = {}; - -[__webpack_require__(30), __webpack_require__(31), __webpack_require__(34), __webpack_require__(35), __webpack_require__(36), __webpack_require__(37), __webpack_require__(38), __webpack_require__(39), __webpack_require__(40), __webpack_require__(41), __webpack_require__(42)].forEach(function (props) { - util.extend(elesfn, props); -}); - -module.exports = elesfn; - -/***/ }), -/* 30 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -var defineSearch = function defineSearch(params) { - params = { - bfs: params.bfs || !params.dfs, - dfs: params.dfs || !params.bfs - }; - - // from pseudocode on wikipedia - return function searchFn(roots, fn, directed) { - var options; - if (is.plainObject(roots) && !is.elementOrCollection(roots)) { - options = roots; - roots = options.roots || options.root; - fn = options.visit; - directed = options.directed; - } - - directed = arguments.length === 2 && !is.fn(fn) ? fn : directed; - fn = is.fn(fn) ? fn : function () {}; - - var cy = this._private.cy; - var v = roots = is.string(roots) ? this.filter(roots) : roots; - var Q = []; - var connectedNodes = []; - var connectedBy = {}; - var id2depth = {}; - var V = {}; - var j = 0; - var found; - var nodes = this.nodes(); - var edges = this.edges(); - - // enqueue v - for (var i = 0; i < v.length; i++) { - if (v[i].isNode()) { - Q.unshift(v[i]); - - if (params.bfs) { - V[v[i].id()] = true; - - connectedNodes.push(v[i]); - } - - id2depth[v[i].id()] = 0; - } - } - - while (Q.length !== 0) { - var v = params.bfs ? Q.shift() : Q.pop(); - - if (params.dfs) { - if (V[v.id()]) { - continue; - } - - V[v.id()] = true; - - connectedNodes.push(v); - } - - var depth = id2depth[v.id()]; - var prevEdge = connectedBy[v.id()]; - var prevNode = prevEdge == null ? undefined : prevEdge.connectedNodes().not(v)[0]; - var ret; - - ret = fn(v, prevEdge, prevNode, j++, depth); - - if (ret === true) { - found = v; - break; - } - - if (ret === false) { - break; - } - - var vwEdges = v.connectedEdges(directed ? function (ele) { - return ele.data('source') === v.id(); - } : undefined).intersect(edges); - for (var i = 0; i < vwEdges.length; i++) { - var e = vwEdges[i]; - var w = e.connectedNodes(function (n) { - return n.id() !== v.id(); - }).intersect(nodes); - - if (w.length !== 0 && !V[w.id()]) { - w = w[0]; - - Q.push(w); - - if (params.bfs) { - V[w.id()] = true; - - connectedNodes.push(w); - } - - connectedBy[w.id()] = e; - - id2depth[w.id()] = id2depth[v.id()] + 1; - } - } - } - - var connectedEles = []; - - for (var i = 0; i < connectedNodes.length; i++) { - var node = connectedNodes[i]; - var edge = connectedBy[node.id()]; - - if (edge) { - connectedEles.push(edge); - } - - connectedEles.push(node); - } - - return { - path: cy.collection(connectedEles, { unique: true }), - found: cy.collection(found) - }; - }; -}; - -// search, spanning trees, etc -var elesfn = { - breadthFirstSearch: defineSearch({ bfs: true }), - depthFirstSearch: defineSearch({ dfs: true }) -}; - -// nice, short mathemathical alias -elesfn.bfs = elesfn.breadthFirstSearch; -elesfn.dfs = elesfn.depthFirstSearch; - -module.exports = elesfn; - -/***/ }), -/* 31 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var Heap = __webpack_require__(9); - -var elesfn = { - - dijkstra: function dijkstra(root, weightFn, directed) { - var options; - if (is.plainObject(root) && !is.elementOrCollection(root)) { - options = root; - root = options.root; - weightFn = options.weight; - directed = options.directed; - } - - var cy = this._private.cy; - weightFn = is.fn(weightFn) ? weightFn : function () { - return 1; - }; // if not specified, assume each edge has equal weight (1) - - var source = is.string(root) ? this.filter(root)[0] : root[0]; - var dist = {}; - var prev = {}; - var knownDist = {}; - - var edges = this.edges().filter(function (ele) { - return !ele.isLoop(); - }); - var nodes = this.nodes(); - - var getDist = function getDist(node) { - return dist[node.id()]; - }; - - var setDist = function setDist(node, d) { - dist[node.id()] = d; - - Q.updateItem(node); - }; - - var Q = new Heap(function (a, b) { - return getDist(a) - getDist(b); - }); - - for (var i = 0; i < nodes.length; i++) { - var node = nodes[i]; - - dist[node.id()] = node.same(source) ? 0 : Infinity; - Q.push(node); - } - - var distBetween = function distBetween(u, v) { - var uvs = (directed ? u.edgesTo(v) : u.edgesWith(v)).intersect(edges); - var smallestDistance = Infinity; - var smallestEdge; - - for (var i = 0; i < uvs.length; i++) { - var edge = uvs[i]; - var weight = weightFn(edge); - - if (weight < smallestDistance || !smallestEdge) { - smallestDistance = weight; - smallestEdge = edge; - } - } - - return { - edge: smallestEdge, - dist: smallestDistance - }; - }; - - while (Q.size() > 0) { - var u = Q.pop(); - var smalletsDist = getDist(u); - var uid = u.id(); - - knownDist[uid] = smalletsDist; - - if (smalletsDist === Infinity) { - continue; - } - - var neighbors = u.neighborhood().intersect(nodes); - for (var i = 0; i < neighbors.length; i++) { - var v = neighbors[i]; - var vid = v.id(); - var vDist = distBetween(u, v); - - var alt = smalletsDist + vDist.dist; - - if (alt < getDist(v)) { - setDist(v, alt); - - prev[vid] = { - node: u, - edge: vDist.edge - }; - } - } // for - } // while - - return { - distanceTo: function distanceTo(node) { - var target = is.string(node) ? nodes.filter(node)[0] : node[0]; - - return knownDist[target.id()]; - }, - - pathTo: function pathTo(node) { - var target = is.string(node) ? nodes.filter(node)[0] : node[0]; - var S = []; - var u = target; - - if (target.length > 0) { - S.unshift(target); - - while (prev[u.id()]) { - var p = prev[u.id()]; - - S.unshift(p.edge); - S.unshift(p.node); - - u = p.node; - } - } - - return cy.collection(S); - } - }; - } -}; - -module.exports = elesfn; - -/***/ }), -/* 32 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = __webpack_require__(33); - - -/***/ }), -/* 33 */ -/***/ (function(module, exports, __webpack_require__) { - -var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Generated by CoffeeScript 1.8.0 -(function() { - var Heap, defaultCmp, floor, heapify, heappop, heappush, heappushpop, heapreplace, insort, min, nlargest, nsmallest, updateItem, _siftdown, _siftup; - - floor = Math.floor, min = Math.min; - - - /* - Default comparison function to be used - */ - - defaultCmp = function(x, y) { - if (x < y) { - return -1; - } - if (x > y) { - return 1; - } - return 0; - }; - - - /* - Insert item x in list a, and keep it sorted assuming a is sorted. - - If x is already in a, insert it to the right of the rightmost x. - - Optional args lo (default 0) and hi (default a.length) bound the slice - of a to be searched. - */ - - insort = function(a, x, lo, hi, cmp) { - var mid; - if (lo == null) { - lo = 0; - } - if (cmp == null) { - cmp = defaultCmp; - } - if (lo < 0) { - throw new Error('lo must be non-negative'); - } - if (hi == null) { - hi = a.length; - } - while (lo < hi) { - mid = floor((lo + hi) / 2); - if (cmp(x, a[mid]) < 0) { - hi = mid; - } else { - lo = mid + 1; - } - } - return ([].splice.apply(a, [lo, lo - lo].concat(x)), x); - }; - - - /* - Push item onto heap, maintaining the heap invariant. - */ - - heappush = function(array, item, cmp) { - if (cmp == null) { - cmp = defaultCmp; - } - array.push(item); - return _siftdown(array, 0, array.length - 1, cmp); - }; - - - /* - Pop the smallest item off the heap, maintaining the heap invariant. - */ - - heappop = function(array, cmp) { - var lastelt, returnitem; - if (cmp == null) { - cmp = defaultCmp; - } - lastelt = array.pop(); - if (array.length) { - returnitem = array[0]; - array[0] = lastelt; - _siftup(array, 0, cmp); - } else { - returnitem = lastelt; - } - return returnitem; - }; - - - /* - Pop and return the current smallest value, and add the new item. - - This is more efficient than heappop() followed by heappush(), and can be - more appropriate when using a fixed size heap. Note that the value - returned may be larger than item! That constrains reasonable use of - this routine unless written as part of a conditional replacement: - if item > array[0] - item = heapreplace(array, item) - */ - - heapreplace = function(array, item, cmp) { - var returnitem; - if (cmp == null) { - cmp = defaultCmp; - } - returnitem = array[0]; - array[0] = item; - _siftup(array, 0, cmp); - return returnitem; - }; - - - /* - Fast version of a heappush followed by a heappop. - */ - - heappushpop = function(array, item, cmp) { - var _ref; - if (cmp == null) { - cmp = defaultCmp; - } - if (array.length && cmp(array[0], item) < 0) { - _ref = [array[0], item], item = _ref[0], array[0] = _ref[1]; - _siftup(array, 0, cmp); - } - return item; - }; - - - /* - Transform list into a heap, in-place, in O(array.length) time. - */ - - heapify = function(array, cmp) { - var i, _i, _j, _len, _ref, _ref1, _results, _results1; - if (cmp == null) { - cmp = defaultCmp; - } - _ref1 = (function() { - _results1 = []; - for (var _j = 0, _ref = floor(array.length / 2); 0 <= _ref ? _j < _ref : _j > _ref; 0 <= _ref ? _j++ : _j--){ _results1.push(_j); } - return _results1; - }).apply(this).reverse(); - _results = []; - for (_i = 0, _len = _ref1.length; _i < _len; _i++) { - i = _ref1[_i]; - _results.push(_siftup(array, i, cmp)); - } - return _results; - }; - - - /* - Update the position of the given item in the heap. - This function should be called every time the item is being modified. - */ - - updateItem = function(array, item, cmp) { - var pos; - if (cmp == null) { - cmp = defaultCmp; - } - pos = array.indexOf(item); - if (pos === -1) { - return; - } - _siftdown(array, 0, pos, cmp); - return _siftup(array, pos, cmp); - }; - - - /* - Find the n largest elements in a dataset. - */ - - nlargest = function(array, n, cmp) { - var elem, result, _i, _len, _ref; - if (cmp == null) { - cmp = defaultCmp; - } - result = array.slice(0, n); - if (!result.length) { - return result; - } - heapify(result, cmp); - _ref = array.slice(n); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - elem = _ref[_i]; - heappushpop(result, elem, cmp); - } - return result.sort(cmp).reverse(); - }; - - - /* - Find the n smallest elements in a dataset. - */ - - nsmallest = function(array, n, cmp) { - var elem, i, los, result, _i, _j, _len, _ref, _ref1, _results; - if (cmp == null) { - cmp = defaultCmp; - } - if (n * 10 <= array.length) { - result = array.slice(0, n).sort(cmp); - if (!result.length) { - return result; - } - los = result[result.length - 1]; - _ref = array.slice(n); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - elem = _ref[_i]; - if (cmp(elem, los) < 0) { - insort(result, elem, 0, null, cmp); - result.pop(); - los = result[result.length - 1]; - } - } - return result; - } - heapify(array, cmp); - _results = []; - for (i = _j = 0, _ref1 = min(n, array.length); 0 <= _ref1 ? _j < _ref1 : _j > _ref1; i = 0 <= _ref1 ? ++_j : --_j) { - _results.push(heappop(array, cmp)); - } - return _results; - }; - - _siftdown = function(array, startpos, pos, cmp) { - var newitem, parent, parentpos; - if (cmp == null) { - cmp = defaultCmp; - } - newitem = array[pos]; - while (pos > startpos) { - parentpos = (pos - 1) >> 1; - parent = array[parentpos]; - if (cmp(newitem, parent) < 0) { - array[pos] = parent; - pos = parentpos; - continue; - } - break; - } - return array[pos] = newitem; - }; - - _siftup = function(array, pos, cmp) { - var childpos, endpos, newitem, rightpos, startpos; - if (cmp == null) { - cmp = defaultCmp; - } - endpos = array.length; - startpos = pos; - newitem = array[pos]; - childpos = 2 * pos + 1; - while (childpos < endpos) { - rightpos = childpos + 1; - if (rightpos < endpos && !(cmp(array[childpos], array[rightpos]) < 0)) { - childpos = rightpos; - } - array[pos] = array[childpos]; - pos = childpos; - childpos = 2 * pos + 1; - } - array[pos] = newitem; - return _siftdown(array, startpos, pos, cmp); - }; - - Heap = (function() { - Heap.push = heappush; - - Heap.pop = heappop; - - Heap.replace = heapreplace; - - Heap.pushpop = heappushpop; - - Heap.heapify = heapify; - - Heap.updateItem = updateItem; - - Heap.nlargest = nlargest; - - Heap.nsmallest = nsmallest; - - function Heap(cmp) { - this.cmp = cmp != null ? cmp : defaultCmp; - this.nodes = []; - } - - Heap.prototype.push = function(x) { - return heappush(this.nodes, x, this.cmp); - }; - - Heap.prototype.pop = function() { - return heappop(this.nodes, this.cmp); - }; - - Heap.prototype.peek = function() { - return this.nodes[0]; - }; - - Heap.prototype.contains = function(x) { - return this.nodes.indexOf(x) !== -1; - }; - - Heap.prototype.replace = function(x) { - return heapreplace(this.nodes, x, this.cmp); - }; - - Heap.prototype.pushpop = function(x) { - return heappushpop(this.nodes, x, this.cmp); - }; - - Heap.prototype.heapify = function() { - return heapify(this.nodes, this.cmp); - }; - - Heap.prototype.updateItem = function(x) { - return updateItem(this.nodes, x, this.cmp); - }; - - Heap.prototype.clear = function() { - return this.nodes = []; - }; - - Heap.prototype.empty = function() { - return this.nodes.length === 0; - }; - - Heap.prototype.size = function() { - return this.nodes.length; - }; - - Heap.prototype.clone = function() { - var heap; - heap = new Heap(); - heap.nodes = this.nodes.slice(0); - return heap; - }; - - Heap.prototype.toArray = function() { - return this.nodes.slice(0); - }; - - Heap.prototype.insert = Heap.prototype.push; - - Heap.prototype.top = Heap.prototype.peek; - - Heap.prototype.front = Heap.prototype.peek; - - Heap.prototype.has = Heap.prototype.contains; - - Heap.prototype.copy = Heap.prototype.clone; - - return Heap; - - })(); - - (function(root, factory) { - if (true) { - return !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory), - __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? - (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__), - __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); - } else if (typeof exports === 'object') { - return module.exports = factory(); - } else { - return root.Heap = factory(); - } - })(this, function() { - return Heap; - }); - -}).call(this); - - -/***/ }), -/* 34 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -// search, spanning trees, etc -var elesfn = { - - // kruskal's algorithm (finds min spanning tree, assuming undirected graph) - // implemented from pseudocode from wikipedia - kruskal: function kruskal(weightFn) { - var cy = this.cy(); - - weightFn = is.fn(weightFn) ? weightFn : function () { - return 1; - }; // if not specified, assume each edge has equal weight (1) - - function findSet(ele) { - for (var i = 0; i < forest.length; i++) { - var eles = forest[i]; - - if (eles.anySame(ele)) { - return { - eles: eles, - index: i - }; - } - } - } - - var A = cy.collection(cy, []); - var forest = []; - var nodes = this.nodes(); - - for (var i = 0; i < nodes.length; i++) { - forest.push(nodes[i].collection()); - } - - var edges = this.edges(); - var S = edges.toArray().sort(function (a, b) { - var weightA = weightFn(a); - var weightB = weightFn(b); - - return weightA - weightB; - }); - - for (var i = 0; i < S.length; i++) { - var edge = S[i]; - var u = edge.source()[0]; - var v = edge.target()[0]; - var setU = findSet(u); - var setV = findSet(v); - - if (setU.index !== setV.index) { - A = A.add(edge); - - // combine forests for u and v - forest[setU.index] = setU.eles.add(setV.eles); - forest.splice(setV.index, 1); - } - } - - return nodes.add(A); - } -}; - -module.exports = elesfn; - -/***/ }), -/* 35 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -var elesfn = { - - // Implemented from pseudocode from wikipedia - aStar: function aStar(options) { - var eles = this; - - options = options || {}; - - // Reconstructs the path from Start to End, acumulating the result in pathAcum - var reconstructPath = function reconstructPath(start, end, cameFromMap, pathAcum) { - // Base case - if (start == end) { - pathAcum.unshift(cy.getElementById(end)); - return pathAcum; - } - - if (end in cameFromMap) { - // We know which node is before the last one - var previous = cameFromMap[end]; - var previousEdge = cameFromEdge[end]; - - pathAcum.unshift(cy.getElementById(previousEdge)); - pathAcum.unshift(cy.getElementById(end)); - - return reconstructPath(start, previous, cameFromMap, pathAcum); - } - - // We should not reach here! - return undefined; - }; - - // Returns the index of the element in openSet which has minimum fScore - var findMin = function findMin(openSet, fScore) { - if (openSet.length === 0) { - // Should never be the case - return undefined; - } - var minPos = 0; - var tempScore = fScore[openSet[0]]; - for (var i = 1; i < openSet.length; i++) { - var s = fScore[openSet[i]]; - if (s < tempScore) { - tempScore = s; - minPos = i; - } - } - return minPos; - }; - - var cy = this._private.cy; - - // root - mandatory! - if (options != null && options.root != null) { - var source = is.string(options.root) ? - // use it as a selector, e.g. "#rootID - this.filter(options.root)[0] : options.root[0]; - } else { - return undefined; - } - - // goal - mandatory! - if (options.goal != null) { - var target = is.string(options.goal) ? - // use it as a selector, e.g. "#goalID - this.filter(options.goal)[0] : options.goal[0]; - } else { - return undefined; - } - - // Heuristic function - optional - if (options.heuristic != null && is.fn(options.heuristic)) { - var heuristic = options.heuristic; - } else { - var heuristic = function heuristic() { - return 0; - }; // use constant if unspecified - } - - // Weight function - optional - if (options.weight != null && is.fn(options.weight)) { - var weightFn = options.weight; - } else { - // If not specified, assume each edge has equal weight (1) - var weightFn = function weightFn(e) { - return 1; - }; - } - - // directed - optional - if (options.directed != null) { - var directed = options.directed; - } else { - var directed = false; - } - - var sid = source.id(); - var tid = target.id(); - - var closedSet = []; - var openSet = [sid]; - var cameFrom = {}; - var cameFromEdge = {}; - var gScore = {}; - var fScore = {}; - - gScore[sid] = 0; - fScore[sid] = heuristic(source); - - // Counter - var steps = 0; - - // Main loop - while (openSet.length > 0) { - var minPos = findMin(openSet, fScore); - var cMin = cy.getElementById(openSet[minPos]); - var cMinId = cMin.id(); - steps++; - - // If we've found our goal, then we are done - if (cMinId == tid) { - var rPath = reconstructPath(sid, tid, cameFrom, []); - - return { - found: true, - distance: gScore[cMinId], - path: eles.spawn(rPath), - steps: steps - }; - } - - // Add cMin to processed nodes - closedSet.push(cMinId); - // Remove cMin from boundary nodes - openSet.splice(minPos, 1); - - // Update scores for neighbors of cMin - // Take into account if graph is directed or not - var vwEdges = cMin._private.edges; - - for (var i = 0; i < vwEdges.length; i++) { - var e = vwEdges[i]; - - // edge must be in set of calling eles - if (!this.hasElementWithId(e.id())) { - continue; - } - - // cMin must be the source of edge if directed - if (directed && e.data('source') !== cMinId) { - continue; - } - - var wSrc = e.source(); - var wTgt = e.target(); - - var w = wSrc.id() !== cMinId ? wSrc : wTgt; - var wid = w.id(); - - // node must be in set of calling eles - if (!this.hasElementWithId(wid)) { - continue; - } - - // if node is in closedSet, ignore it - if (closedSet.indexOf(wid) != -1) { - continue; - } - - // New tentative score for node w - var tempScore = gScore[cMinId] + weightFn(e); - - // Update gScore for node w if: - // w not present in openSet - // OR - // tentative gScore is less than previous value - - // w not in openSet - if (openSet.indexOf(wid) == -1) { - gScore[wid] = tempScore; - fScore[wid] = tempScore + heuristic(w); - openSet.push(wid); // Add node to openSet - cameFrom[wid] = cMinId; - cameFromEdge[wid] = e.id(); - continue; - } - // w already in openSet, but with greater gScore - if (tempScore < gScore[wid]) { - gScore[wid] = tempScore; - fScore[wid] = tempScore + heuristic(w); - cameFrom[wid] = cMinId; - } - } // End of neighbors update - } // End of main loop - - // If we've reached here, then we've not reached our goal - return { - found: false, - distance: undefined, - path: undefined, - steps: steps - }; - } - -}; // elesfn - - -module.exports = elesfn; - -/***/ }), -/* 36 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -var elesfn = { - - // Implemented from pseudocode from wikipedia - floydWarshall: function floydWarshall(options) { - options = options || {}; - - var cy = this.cy(); - - // Weight function - optional - if (options.weight != null && is.fn(options.weight)) { - var weightFn = options.weight; - } else { - // If not specified, assume each edge has equal weight (1) - var weightFn = function weightFn(e) { - return 1; - }; - } - - // directed - optional - if (options.directed != null) { - var directed = options.directed; - } else { - var directed = false; - } - - var edges = this.edges().stdFilter(function (e) { - return !e.isLoop(); - }); - var nodes = this.nodes(); - var numNodes = nodes.length; - - // mapping: node id -> position in nodes array - var id2position = {}; - for (var i = 0; i < numNodes; i++) { - id2position[nodes[i].id()] = i; - } - - // Initialize distance matrix - var dist = []; - for (var i = 0; i < numNodes; i++) { - var newRow = new Array(numNodes); - for (var j = 0; j < numNodes; j++) { - if (i == j) { - newRow[j] = 0; - } else { - newRow[j] = Infinity; - } - } - dist.push(newRow); - } - - // Initialize matrix used for path reconstruction - // Initialize distance matrix - var next = []; - var edgeNext = []; - - var initMatrix = function initMatrix(next) { - for (var i = 0; i < numNodes; i++) { - var newRow = new Array(numNodes); - for (var j = 0; j < numNodes; j++) { - newRow[j] = undefined; - } - next.push(newRow); - } - }; - - initMatrix(next); - initMatrix(edgeNext); - - // Process edges - for (var i = 0; i < edges.length; i++) { - var sourceIndex = id2position[edges[i].source().id()]; - var targetIndex = id2position[edges[i].target().id()]; - var weight = weightFn(edges[i]); - - // Check if already process another edge between same 2 nodes - if (dist[sourceIndex][targetIndex] > weight) { - dist[sourceIndex][targetIndex] = weight; - next[sourceIndex][targetIndex] = targetIndex; - edgeNext[sourceIndex][targetIndex] = edges[i]; - } - } - - // If undirected graph, process 'reversed' edges - if (!directed) { - for (var i = 0; i < edges.length; i++) { - var sourceIndex = id2position[edges[i].target().id()]; - var targetIndex = id2position[edges[i].source().id()]; - var weight = weightFn(edges[i]); - - // Check if already process another edge between same 2 nodes - if (dist[sourceIndex][targetIndex] > weight) { - dist[sourceIndex][targetIndex] = weight; - next[sourceIndex][targetIndex] = targetIndex; - edgeNext[sourceIndex][targetIndex] = edges[i]; - } - } - } - - // Main loop - for (var k = 0; k < numNodes; k++) { - for (var i = 0; i < numNodes; i++) { - for (var j = 0; j < numNodes; j++) { - if (dist[i][k] + dist[k][j] < dist[i][j]) { - dist[i][j] = dist[i][k] + dist[k][j]; - next[i][j] = next[i][k]; - } - } - } - } - - // Build result object - var position2id = []; - for (var i = 0; i < numNodes; i++) { - position2id.push(nodes[i].id()); - } - - var res = { - distance: function distance(from, to) { - if (is.string(from)) { - // from is a selector string - var fromId = cy.filter(from)[0].id(); - } else { - // from is a node - var fromId = from.id(); - } - - if (is.string(to)) { - // to is a selector string - var toId = cy.filter(to)[0].id(); - } else { - // to is a node - var toId = to.id(); - } - - return dist[id2position[fromId]][id2position[toId]]; - }, - - path: function path(from, to) { - var reconstructPathAux = function reconstructPathAux(from, to, next, position2id, edgeNext) { - if (from === to) { - return cy.getElementById(position2id[from]); - } - if (next[from][to] === undefined) { - return undefined; - } - - var path = [cy.getElementById(position2id[from])]; - var prev = from; - while (from !== to) { - prev = from; - from = next[from][to]; - - var edge = edgeNext[prev][from]; - path.push(edge); - - path.push(cy.getElementById(position2id[from])); - } - return path; - }; - - if (is.string(from)) { - // from is a selector string - var fromId = cy.filter(from)[0].id(); - } else { - // from is a node - var fromId = from.id(); - } - - if (is.string(to)) { - // to is a selector string - var toId = cy.filter(to)[0].id(); - } else { - // to is a node - var toId = to.id(); - } - - var pathArr = reconstructPathAux(id2position[fromId], id2position[toId], next, position2id, edgeNext); - - return cy.collection(pathArr); - } - }; - - return res; - } // floydWarshall - -}; // elesfn - -module.exports = elesfn; - -/***/ }), -/* 37 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); - -var elesfn = { - - // Implemented from pseudocode from wikipedia - bellmanFord: function bellmanFord(options) { - var eles = this; - - options = options || {}; - - // Weight function - optional - if (options.weight != null && is.fn(options.weight)) { - var weightFn = options.weight; - } else { - // If not specified, assume each edge has equal weight (1) - var weightFn = function weightFn(e) { - return 1; - }; - } - - // directed - optional - if (options.directed != null) { - var directed = options.directed; - } else { - var directed = false; - } - - // root - mandatory! - if (options.root != null) { - if (is.string(options.root)) { - // use it as a selector, e.g. "#rootID - var source = this.filter(options.root)[0]; - } else { - var source = options.root[0]; - } - } else { - return undefined; - } - - var cy = this._private.cy; - var edges = this.edges().stdFilter(function (e) { - return !e.isLoop(); - }); - var nodes = this.nodes(); - var numNodes = nodes.length; - - // mapping: node id -> position in nodes array - var id2position = {}; - for (var i = 0; i < numNodes; i++) { - id2position[nodes[i].id()] = i; - } - - // Initializations - var cost = []; - var predecessor = []; - var predEdge = []; - - for (var i = 0; i < numNodes; i++) { - if (nodes[i].id() === source.id()) { - cost[i] = 0; - } else { - cost[i] = Infinity; - } - predecessor[i] = undefined; - } - - // Edges relaxation - var flag = false; - for (var i = 1; i < numNodes; i++) { - flag = false; - for (var e = 0; e < edges.length; e++) { - var sourceIndex = id2position[edges[e].source().id()]; - var targetIndex = id2position[edges[e].target().id()]; - var weight = weightFn(edges[e]); - - var temp = cost[sourceIndex] + weight; - if (temp < cost[targetIndex]) { - cost[targetIndex] = temp; - predecessor[targetIndex] = sourceIndex; - predEdge[targetIndex] = edges[e]; - flag = true; - } - - // If undirected graph, we need to take into account the 'reverse' edge - if (!directed) { - var temp = cost[targetIndex] + weight; - if (temp < cost[sourceIndex]) { - cost[sourceIndex] = temp; - predecessor[sourceIndex] = targetIndex; - predEdge[sourceIndex] = edges[e]; - flag = true; - } - } - } - - if (!flag) { - break; - } - } - - if (flag) { - // Check for negative weight cycles - for (var e = 0; e < edges.length; e++) { - var sourceIndex = id2position[edges[e].source().id()]; - var targetIndex = id2position[edges[e].target().id()]; - var weight = weightFn(edges[e]); - - if (cost[sourceIndex] + weight < cost[targetIndex]) { - util.error('Graph contains a negative weight cycle for Bellman-Ford'); - return { pathTo: undefined, - distanceTo: undefined, - hasNegativeWeightCycle: true }; - } - } - } - - // Build result object - var position2id = []; - for (var i = 0; i < numNodes; i++) { - position2id.push(nodes[i].id()); - } - - var res = { - distanceTo: function distanceTo(to) { - if (is.string(to)) { - // to is a selector string - var toId = cy.filter(to)[0].id(); - } else { - // to is a node - var toId = to.id(); - } - - return cost[id2position[toId]]; - }, - - pathTo: function pathTo(to) { - - var reconstructPathAux = function reconstructPathAux(predecessor, fromPos, toPos, position2id, acumPath, predEdge) { - for (;;) { - // Add toId to path - acumPath.push(cy.getElementById(position2id[toPos])); - acumPath.push(predEdge[toPos]); - - if (fromPos === toPos) { - // reached starting node - return acumPath; - } - - // If no path exists, discart acumulated path and return undefined - var predPos = predecessor[toPos]; - if (typeof predPos === 'undefined') { - return undefined; - } - - toPos = predPos; - } - }; - - if (is.string(to)) { - // to is a selector string - var toId = cy.filter(to)[0].id(); - } else { - // to is a node - var toId = to.id(); - } - var path = []; - - // This returns a reversed path - var res = reconstructPathAux(predecessor, id2position[source.id()], id2position[toId], position2id, path, predEdge); - - // Get it in the correct order and return it - if (res != null) { - res.reverse(); - } - - return eles.spawn(res); - }, - - hasNegativeWeightCycle: false - }; - - return res; - } // bellmanFord - -}; // elesfn - -module.exports = elesfn; - -/***/ }), -/* 38 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var elesfn = { - - // Computes the minimum cut of an undirected graph - // Returns the correct answer with high probability - kargerStein: function kargerStein(options) { - var eles = this; - - options = options || {}; - - // Function which colapses 2 (meta) nodes into one - // Updates the remaining edge lists - // Receives as a paramater the edge which causes the collapse - var colapse = function colapse(edgeIndex, nodeMap, remainingEdges) { - var edgeInfo = remainingEdges[edgeIndex]; - var sourceIn = edgeInfo[1]; - var targetIn = edgeInfo[2]; - var partition1 = nodeMap[sourceIn]; - var partition2 = nodeMap[targetIn]; - - // Delete all edges between partition1 and partition2 - var newEdges = remainingEdges.filter(function (edge) { - if (nodeMap[edge[1]] === partition1 && nodeMap[edge[2]] === partition2) { - return false; - } - if (nodeMap[edge[1]] === partition2 && nodeMap[edge[2]] === partition1) { - return false; - } - return true; - }); - - // All edges pointing to partition2 should now point to partition1 - for (var i = 0; i < newEdges.length; i++) { - var edge = newEdges[i]; - if (edge[1] === partition2) { - // Check source - newEdges[i] = edge.slice(0); - newEdges[i][1] = partition1; - } else if (edge[2] === partition2) { - // Check target - newEdges[i] = edge.slice(0); - newEdges[i][2] = partition1; - } - } - - // Move all nodes from partition2 to partition1 - for (var i = 0; i < nodeMap.length; i++) { - if (nodeMap[i] === partition2) { - nodeMap[i] = partition1; - } - } - - return newEdges; - }; - - // Contracts a graph until we reach a certain number of meta nodes - var contractUntil = function contractUntil(metaNodeMap, remainingEdges, size, sizeLimit) { - // Stop condition - if (size <= sizeLimit) { - return remainingEdges; - } - - // Choose an edge randomly - var edgeIndex = Math.floor(Math.random() * remainingEdges.length); - - // Colapse graph based on edge - var newEdges = colapse(edgeIndex, metaNodeMap, remainingEdges); - - return contractUntil(metaNodeMap, newEdges, size - 1, sizeLimit); - }; - - var cy = this._private.cy; - var edges = this.edges().stdFilter(function (e) { - return !e.isLoop(); - }); - var nodes = this.nodes(); - var numNodes = nodes.length; - var numEdges = edges.length; - var numIter = Math.ceil(Math.pow(Math.log(numNodes) / Math.LN2, 2)); - var stopSize = Math.floor(numNodes / Math.sqrt(2)); - - if (numNodes < 2) { - util.error('At least 2 nodes are required for Karger-Stein algorithm'); - return undefined; - } - - // Create numerical identifiers for each node - // mapping: node id -> position in nodes array - // for reverse mapping, simply use nodes array - var id2position = {}; - for (var i = 0; i < numNodes; i++) { - id2position[nodes[i].id()] = i; - } - - // Now store edge destination as indexes - // Format for each edge (edge index, source node index, target node index) - var edgeIndexes = []; - for (var i = 0; i < numEdges; i++) { - var e = edges[i]; - edgeIndexes.push([i, id2position[e.source().id()], id2position[e.target().id()]]); - } - - // We will store the best cut found here - var minCutSize = Infinity; - var minCut; - - // Initial meta node partition - var originalMetaNode = []; - for (var i = 0; i < numNodes; i++) { - originalMetaNode.push(i); - } - - // Main loop - for (var iter = 0; iter <= numIter; iter++) { - // Create new meta node partition - var metaNodeMap = originalMetaNode.slice(0); - - // Contract until stop point (stopSize nodes) - var edgesState = contractUntil(metaNodeMap, edgeIndexes, numNodes, stopSize); - - // Create a copy of the colapsed nodes state - var metaNodeMap2 = metaNodeMap.slice(0); - - // Run 2 iterations starting in the stop state - var res1 = contractUntil(metaNodeMap, edgesState, stopSize, 2); - var res2 = contractUntil(metaNodeMap2, edgesState, stopSize, 2); - - // Is any of the 2 results the best cut so far? - if (res1.length <= res2.length && res1.length < minCutSize) { - minCutSize = res1.length; - minCut = [res1, metaNodeMap]; - } else if (res2.length <= res1.length && res2.length < minCutSize) { - minCutSize = res2.length; - minCut = [res2, metaNodeMap2]; - } - } // end of main loop - - - // Construct result - var resEdges = minCut[0].map(function (e) { - return edges[e[0]]; - }); - var partition1 = []; - var partition2 = []; - - // traverse metaNodeMap for best cut - var witnessNodePartition = minCut[1][0]; - for (var i = 0; i < minCut[1].length; i++) { - var partitionId = minCut[1][i]; - if (partitionId === witnessNodePartition) { - partition1.push(nodes[i]); - } else { - partition2.push(nodes[i]); - } - } - - var ret = { - cut: eles.spawn(cy, resEdges), - partition1: eles.spawn(partition1), - partition2: eles.spawn(partition2) - }; - - return ret; - } -}; // elesfn - - -module.exports = elesfn; - -/***/ }), -/* 39 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -var elesfn = { - - pageRank: function pageRank(options) { - options = options || {}; - - var normalizeVector = function normalizeVector(vector) { - var length = vector.length; - - // First, get sum of all elements - var total = 0; - for (var i = 0; i < length; i++) { - total += vector[i]; - } - - // Now, divide each by the sum of all elements - for (var i = 0; i < length; i++) { - vector[i] = vector[i] / total; - } - }; - - // dampingFactor - optional - if (options != null && options.dampingFactor != null) { - var dampingFactor = options.dampingFactor; - } else { - var dampingFactor = 0.8; // Default damping factor - } - - // desired precision - optional - if (options != null && options.precision != null) { - var epsilon = options.precision; - } else { - var epsilon = 0.000001; // Default precision - } - - // Max number of iterations - optional - if (options != null && options.iterations != null) { - var numIter = options.iterations; - } else { - var numIter = 200; // Default number of iterations - } - - // Weight function - optional - if (options != null && options.weight != null && is.fn(options.weight)) { - var weightFn = options.weight; - } else { - // If not specified, assume each edge has equal weight (1) - var weightFn = function weightFn(e) { - return 1; - }; - } - - var cy = this._private.cy; - var edges = this.edges().stdFilter(function (e) { - return !e.isLoop(); - }); - var nodes = this.nodes(); - var numNodes = nodes.length; - var numEdges = edges.length; - - // Create numerical identifiers for each node - // mapping: node id -> position in nodes array - // for reverse mapping, simply use nodes array - var id2position = {}; - for (var i = 0; i < numNodes; i++) { - id2position[nodes[i].id()] = i; - } - - // Construct transposed adjacency matrix - // First lets have a zeroed matrix of the right size - // We'll also keep track of the sum of each column - var matrix = []; - var columnSum = []; - var additionalProb = (1 - dampingFactor) / numNodes; - - // Create null matric - for (var i = 0; i < numNodes; i++) { - var newRow = []; - for (var j = 0; j < numNodes; j++) { - newRow.push(0.0); - } - matrix.push(newRow); - columnSum.push(0.0); - } - - // Now, process edges - for (var i = 0; i < numEdges; i++) { - var edge = edges[i]; - var s = id2position[edge.source().id()]; - var t = id2position[edge.target().id()]; - var w = weightFn(edge); - - // Update matrix - matrix[t][s] += w; - - // Update column sum - columnSum[s] += w; - } - - // Add additional probability based on damping factor - // Also, take into account columns that have sum = 0 - var p = 1.0 / numNodes + additionalProb; // Shorthand - // Traverse matrix, column by column - for (var j = 0; j < numNodes; j++) { - if (columnSum[j] === 0) { - // No 'links' out from node jth, assume equal probability for each possible node - for (var i = 0; i < numNodes; i++) { - matrix[i][j] = p; - } - } else { - // Node jth has outgoing link, compute normalized probabilities - for (var i = 0; i < numNodes; i++) { - matrix[i][j] = matrix[i][j] / columnSum[j] + additionalProb; - } - } - } - - // Compute dominant eigenvector using power method - var eigenvector = []; - var nullVector = []; - var previous; - - // Start with a vector of all 1's - // Also, initialize a null vector which will be used as shorthand - for (var i = 0; i < numNodes; i++) { - eigenvector.push(1.0); - nullVector.push(0.0); - } - - for (var iter = 0; iter < numIter; iter++) { - // New array with all 0's - var temp = nullVector.slice(0); - - // Multiply matrix with previous result - for (var i = 0; i < numNodes; i++) { - for (var j = 0; j < numNodes; j++) { - temp[i] += matrix[i][j] * eigenvector[j]; - } - } - - normalizeVector(temp); - previous = eigenvector; - eigenvector = temp; - - var diff = 0; - // Compute difference (squared module) of both vectors - for (var i = 0; i < numNodes; i++) { - diff += Math.pow(previous[i] - eigenvector[i], 2); - } - - // If difference is less than the desired threshold, stop iterating - if (diff < epsilon) { - break; - } - } - - // Construct result - var res = { - rank: function rank(node) { - if (is.string(node)) { - // is a selector string - var nodeId = cy.filter(node)[0].id(); - } else { - // is a node object - var nodeId = node.id(); - } - return eigenvector[id2position[nodeId]]; - } - }; - - return res; - } // pageRank - -}; // elesfn - -module.exports = elesfn; - -/***/ }), -/* 40 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); - -var elesfn = { - - degreeCentralityNormalized: function degreeCentralityNormalized(options) { - options = options || {}; - - var cy = this.cy(); - - // directed - optional - if (options.directed != null) { - var directed = options.directed; - } else { - var directed = false; - } - - var nodes = this.nodes(); - var numNodes = nodes.length; - - if (!directed) { - var degrees = {}; - var maxDegree = 0; - - for (var i = 0; i < numNodes; i++) { - var node = nodes[i]; - // add current node to the current options object and call degreeCentrality - var currDegree = this.degreeCentrality(util.extend({}, options, { root: node })); - if (maxDegree < currDegree.degree) maxDegree = currDegree.degree; - - degrees[node.id()] = currDegree.degree; - } - - return { - degree: function degree(node) { - if (maxDegree == 0) return 0; - - if (is.string(node)) { - // from is a selector string - var node = cy.filter(node)[0].id(); - } else { - // from is a node - var node = node.id(); - } - - return degrees[node] / maxDegree; - } - }; - } else { - var indegrees = {}; - var outdegrees = {}; - var maxIndegree = 0; - var maxOutdegree = 0; - - for (var i = 0; i < numNodes; i++) { - var node = nodes[i]; - // add current node to the current options object and call degreeCentrality - var currDegree = this.degreeCentrality(util.extend({}, options, { root: node })); - - if (maxIndegree < currDegree.indegree) maxIndegree = currDegree.indegree; - - if (maxOutdegree < currDegree.outdegree) maxOutdegree = currDegree.outdegree; - - indegrees[node.id()] = currDegree.indegree; - outdegrees[node.id()] = currDegree.outdegree; - } - - return { - indegree: function indegree(node) { - if (maxIndegree == 0) return 0; - - if (is.string(node)) { - // from is a selector string - var node = cy.filter(node)[0].id(); - } else { - // from is a node - var node = node.id(); - } - - return indegrees[node] / maxIndegree; - }, - outdegree: function outdegree(node) { - if (maxOutdegree == 0) return 0; - - if (is.string(node)) { - // from is a selector string - var node = cy.filter(node)[0].id(); - } else { - // from is a node - var node = node.id(); - } - - return outdegrees[node] / maxOutdegree; - } - - }; - } - }, // degreeCentralityNormalized - - // Implemented from the algorithm in Opsahl's paper - // "Node centrality in weighted networks: Generalizing degree and shortest paths" - // check the heading 2 "Degree" - degreeCentrality: function degreeCentrality(options) { - options = options || {}; - - var callingEles = this; - - // root - mandatory! - if (options != null && options.root != null) { - var root = is.string(options.root) ? this.filter(options.root)[0] : options.root[0]; - } else { - return undefined; - } - - // weight - optional - if (options.weight != null && is.fn(options.weight)) { - var weightFn = options.weight; - } else { - // If not specified, assume each edge has equal weight (1) - var weightFn = function weightFn(e) { - return 1; - }; - } - - // directed - optional - if (options.directed != null) { - var directed = options.directed; - } else { - var directed = false; - } - - // alpha - optional - if (options.alpha != null && is.number(options.alpha)) { - var alpha = options.alpha; - } else { - alpha = 0; - } - - if (!directed) { - var connEdges = root.connectedEdges().intersection(callingEles); - var k = connEdges.length; - var s = 0; - - // Now, sum edge weights - for (var i = 0; i < connEdges.length; i++) { - var edge = connEdges[i]; - s += weightFn(edge); - } - - return { - degree: Math.pow(k, 1 - alpha) * Math.pow(s, alpha) - }; - } else { - var incoming = root.connectedEdges('edge[target = "' + root.id() + '"]').intersection(callingEles); - var outgoing = root.connectedEdges('edge[source = "' + root.id() + '"]').intersection(callingEles); - var k_in = incoming.length; - var k_out = outgoing.length; - var s_in = 0; - var s_out = 0; - - // Now, sum incoming edge weights - for (var i = 0; i < incoming.length; i++) { - var edge = incoming[i]; - s_in += weightFn(edge); - } - - // Now, sum outgoing edge weights - for (var i = 0; i < outgoing.length; i++) { - var edge = outgoing[i]; - s_out += weightFn(edge); - } - - return { - indegree: Math.pow(k_in, 1 - alpha) * Math.pow(s_in, alpha), - outdegree: Math.pow(k_out, 1 - alpha) * Math.pow(s_out, alpha) - }; - } - } // degreeCentrality - -}; // elesfn - -// nice, short mathemathical alias -elesfn.dc = elesfn.degreeCentrality; -elesfn.dcn = elesfn.degreeCentralityNormalised = elesfn.degreeCentralityNormalized; - -module.exports = elesfn; - -/***/ }), -/* 41 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -var elesfn = { - - closenessCentralityNormalized: function closenessCentralityNormalized(options) { - options = options || {}; - - var cy = this.cy(); - - var harmonic = options.harmonic; - if (harmonic === undefined) { - harmonic = true; - } - - var closenesses = {}; - var maxCloseness = 0; - var nodes = this.nodes(); - var fw = this.floydWarshall({ weight: options.weight, directed: options.directed }); - - // Compute closeness for every node and find the maximum closeness - for (var i = 0; i < nodes.length; i++) { - var currCloseness = 0; - for (var j = 0; j < nodes.length; j++) { - if (i != j) { - var d = fw.distance(nodes[i], nodes[j]); - - if (harmonic) { - currCloseness += 1 / d; - } else { - currCloseness += d; - } - } - } - - if (!harmonic) { - currCloseness = 1 / currCloseness; - } - - if (maxCloseness < currCloseness) { - maxCloseness = currCloseness; - } - - closenesses[nodes[i].id()] = currCloseness; - } - - return { - closeness: function closeness(node) { - if (maxCloseness == 0) { - return 0; - } - - if (is.string(node)) { - // from is a selector string - var node = cy.filter(node)[0].id(); - } else { - // from is a node - var node = node.id(); - } - - return closenesses[node] / maxCloseness; - } - }; - }, - - // Implemented from pseudocode from wikipedia - closenessCentrality: function closenessCentrality(options) { - options = options || {}; - - // root - mandatory! - if (options.root != null) { - if (is.string(options.root)) { - // use it as a selector, e.g. "#rootID - var root = this.filter(options.root)[0]; - } else { - var root = options.root[0]; - } - } else { - return undefined; - } - - // weight - optional - if (options.weight != null && is.fn(options.weight)) { - var weight = options.weight; - } else { - var weight = function weight() { - return 1; - }; - } - - // directed - optional - if (options.directed != null && is.bool(options.directed)) { - var directed = options.directed; - } else { - var directed = false; - } - - var harmonic = options.harmonic; - if (harmonic === undefined) { - harmonic = true; - } - - // we need distance from this node to every other node - var dijkstra = this.dijkstra({ - root: root, - weight: weight, - directed: directed - }); - var totalDistance = 0; - - var nodes = this.nodes(); - for (var i = 0; i < nodes.length; i++) { - if (nodes[i].id() != root.id()) { - var d = dijkstra.distanceTo(nodes[i]); - - if (harmonic) { - totalDistance += 1 / d; - } else { - totalDistance += d; - } - } - } - - return harmonic ? totalDistance : 1 / totalDistance; - } // closenessCentrality - -}; // elesfn - -// nice, short mathemathical alias -elesfn.cc = elesfn.closenessCentrality; -elesfn.ccn = elesfn.closenessCentralityNormalised = elesfn.closenessCentralityNormalized; - -module.exports = elesfn; - -/***/ }), -/* 42 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var Heap = __webpack_require__(9); - -var elesfn = { - - // Implemented from the algorithm in the paper "On Variants of Shortest-Path Betweenness Centrality and their Generic Computation" by Ulrik Brandes - betweennessCentrality: function betweennessCentrality(options) { - options = options || {}; - - // Weight - optional - var weighted, weightFn; - if (is.fn(options.weight)) { - weightFn = options.weight; - weighted = true; - } else { - weighted = false; - } - - // Directed - default false - var directed = options.directed != null ? options.directed : false; - - var cy = this._private.cy; - - // starting - var V = this.nodes(); - var A = {}; - var _C = {}; - var max = 0; - var C = { - set: function set(key, val) { - _C[key] = val; - - if (val > max) { - max = val; - } - }, - - get: function get(key) { - return _C[key]; - } - }; - - // A contains the neighborhoods of every node - for (var i = 0; i < V.length; i++) { - var v = V[i]; - var vid = v.id(); - - if (directed) { - A[vid] = v.outgoers().nodes(); // get outgoers of every node - } else { - A[vid] = v.openNeighborhood().nodes(); // get neighbors of every node - } - - C.set(vid, 0); - } - - for (var s = 0; s < V.length; s++) { - var sid = V[s].id(); - var S = []; // stack - var P = {}; - var g = {}; - var d = {}; - var Q = new Heap(function (a, b) { - return d[a] - d[b]; - }); // queue - - // init dictionaries - for (var i = 0; i < V.length; i++) { - var vid = V[i].id(); - - P[vid] = []; - g[vid] = 0; - d[vid] = Infinity; - } - - g[sid] = 1; // sigma - d[sid] = 0; // distance to s - - Q.push(sid); - - while (!Q.empty()) { - var v = Q.pop(); - - S.push(v); - - if (weighted) { - for (var j = 0; j < A[v].length; j++) { - var w = A[v][j]; - var vEle = cy.getElementById(v); - - var edge; - if (vEle.edgesTo(w).length > 0) { - edge = vEle.edgesTo(w)[0]; - } else { - edge = w.edgesTo(vEle)[0]; - } - - var edgeWeight = weightFn(edge); - - w = w.id(); - - if (d[w] > d[v] + edgeWeight) { - d[w] = d[v] + edgeWeight; - - if (Q.nodes.indexOf(w) < 0) { - //if w is not in Q - Q.push(w); - } else { - // update position if w is in Q - Q.updateItem(w); - } - - g[w] = 0; - P[w] = []; - } - - if (d[w] == d[v] + edgeWeight) { - g[w] = g[w] + g[v]; - P[w].push(v); - } - } - } else { - for (var j = 0; j < A[v].length; j++) { - var w = A[v][j].id(); - - if (d[w] == Infinity) { - Q.push(w); - - d[w] = d[v] + 1; - } - - if (d[w] == d[v] + 1) { - g[w] = g[w] + g[v]; - P[w].push(v); - } - } - } - } - - var e = {}; - for (var i = 0; i < V.length; i++) { - e[V[i].id()] = 0; - } - - while (S.length > 0) { - var w = S.pop(); - - for (var j = 0; j < P[w].length; j++) { - var v = P[w][j]; - - e[v] = e[v] + g[v] / g[w] * (1 + e[w]); - - if (w != V[s].id()) { - C.set(w, C.get(w) + e[w]); - } - } - } - } - - var ret = { - betweenness: function betweenness(node) { - if (is.string(node)) { - var node = cy.filter(node).id(); - } else { - var node = node.id(); - } - - return C.get(node); - }, - - betweennessNormalized: function betweennessNormalized(node) { - if (max == 0) return 0; - - if (is.string(node)) { - var node = cy.filter(node).id(); - } else { - var node = node.id(); - } - - return C.get(node) / max; - } - }; - - // alias - ret.betweennessNormalised = ret.betweennessNormalized; - - return ret; - } // betweennessCentrality - -}; // elesfn - -// nice, short mathemathical alias -elesfn.bc = elesfn.betweennessCentrality; - -module.exports = elesfn; - -/***/ }), -/* 43 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var define = __webpack_require__(4); - -var elesfn = { - animate: define.animate(), - animation: define.animation(), - animated: define.animated(), - clearQueue: define.clearQueue(), - delay: define.delay(), - delayAnimation: define.delayAnimation(), - stop: define.stop() -}; - -module.exports = elesfn; - -/***/ }), -/* 44 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var Animation = __webpack_require__(45); -var math = __webpack_require__(2); -var is = __webpack_require__(0); - -var define = { - - animated: function animated() { - return function animatedImpl() { - var self = this; - var selfIsArrayLike = self.length !== undefined; - var all = selfIsArrayLike ? self : [self]; // put in array if not array-like - var cy = this._private.cy || this; - - if (!cy.styleEnabled()) { - return false; - } - - var ele = all[0]; - - if (ele) { - return ele._private.animation.current.length > 0; - } - }; - }, // animated - - clearQueue: function clearQueue() { - return function clearQueueImpl() { - var self = this; - var selfIsArrayLike = self.length !== undefined; - var all = selfIsArrayLike ? self : [self]; // put in array if not array-like - var cy = this._private.cy || this; - - if (!cy.styleEnabled()) { - return this; - } - - for (var i = 0; i < all.length; i++) { - var ele = all[i]; - ele._private.animation.queue = []; - } - - return this; - }; - }, // clearQueue - - delay: function delay() { - return function delayImpl(time, complete) { - var cy = this._private.cy || this; - - if (!cy.styleEnabled()) { - return this; - } - - return this.animate({ - delay: time, - duration: time, - complete: complete - }); - }; - }, // delay - - delayAnimation: function delayAnimation() { - return function delayAnimationImpl(time, complete) { - var cy = this._private.cy || this; - - if (!cy.styleEnabled()) { - return this; - } - - return this.animation({ - delay: time, - duration: time, - complete: complete - }); - }; - }, // delay - - animation: function animation() { - return function animationImpl(properties, params) { - var self = this; - var selfIsArrayLike = self.length !== undefined; - var all = selfIsArrayLike ? self : [self]; // put in array if not array-like - var cy = this._private.cy || this; - var isCore = !selfIsArrayLike; - var isEles = !isCore; - - if (!cy.styleEnabled()) { - return this; - } - - var style = cy.style(); - - properties = util.assign({}, properties, params); - - var propertiesEmpty = Object.keys(properties).length === 0; - - if (propertiesEmpty) { - return new Animation(all[0], properties); // nothing to animate - } - - if (properties.duration === undefined) { - properties.duration = 400; - } - - switch (properties.duration) { - case 'slow': - properties.duration = 600; - break; - case 'fast': - properties.duration = 200; - break; - } - - if (isEles) { - properties.style = style.getPropsList(properties.style || properties.css); - - properties.css = undefined; - } - - if (isEles && properties.renderedPosition != null) { - var rpos = properties.renderedPosition; - var pan = cy.pan(); - var zoom = cy.zoom(); - - properties.position = math.renderedToModelPosition(rpos, zoom, pan); - } - - // override pan w/ panBy if set - if (isCore && properties.panBy != null) { - var panBy = properties.panBy; - var cyPan = cy.pan(); - - properties.pan = { - x: cyPan.x + panBy.x, - y: cyPan.y + panBy.y - }; - } - - // override pan w/ center if set - var center = properties.center || properties.centre; - if (isCore && center != null) { - var centerPan = cy.getCenterPan(center.eles, properties.zoom); - - if (centerPan != null) { - properties.pan = centerPan; - } - } - - // override pan & zoom w/ fit if set - if (isCore && properties.fit != null) { - var fit = properties.fit; - var fitVp = cy.getFitViewport(fit.eles || fit.boundingBox, fit.padding); - - if (fitVp != null) { - properties.pan = fitVp.pan; - properties.zoom = fitVp.zoom; - } - } - - // override zoom (& potentially pan) w/ zoom obj if set - if (isCore && is.plainObject(properties.zoom)) { - var vp = cy.getZoomedViewport(properties.zoom); - - if (vp != null) { - if (vp.zoomed) { - properties.zoom = vp.zoom; - } - - if (vp.panned) { - properties.pan = vp.pan; - } - } - } - - return new Animation(all[0], properties); - }; - }, // animate - - animate: function animate() { - return function animateImpl(properties, params) { - var self = this; - var selfIsArrayLike = self.length !== undefined; - var all = selfIsArrayLike ? self : [self]; // put in array if not array-like - var cy = this._private.cy || this; - - if (!cy.styleEnabled()) { - return this; - } - - if (params) { - properties = util.extend({}, properties, params); - } - - // manually hook and run the animation - for (var i = 0; i < all.length; i++) { - var ele = all[i]; - var queue = ele.animated() && (properties.queue === undefined || properties.queue); - - var ani = ele.animation(properties, queue ? { queue: true } : undefined); - - ani.play(); - } - - return this; // chaining - }; - }, // animate - - stop: function stop() { - return function stopImpl(clearQueue, jumpToEnd) { - var self = this; - var selfIsArrayLike = self.length !== undefined; - var all = selfIsArrayLike ? self : [self]; // put in array if not array-like - var cy = this._private.cy || this; - - if (!cy.styleEnabled()) { - return this; - } - - for (var i = 0; i < all.length; i++) { - var ele = all[i]; - var _p = ele._private; - var anis = _p.animation.current; - - for (var j = 0; j < anis.length; j++) { - var ani = anis[j]; - var ani_p = ani._private; - - if (jumpToEnd) { - // next iteration of the animation loop, the animation - // will go straight to the end and be removed - ani_p.duration = 0; - } - } - - // clear the queue of future animations - if (clearQueue) { - _p.animation.queue = []; - } - - if (!jumpToEnd) { - _p.animation.current = []; - } - } - - // we have to notify (the animation loop doesn't do it for us on `stop`) - cy.notify({ - eles: this, - type: 'draw' - }); - - return this; - }; - } // stop - -}; // define - -module.exports = define; - -/***/ }), -/* 45 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); -var Promise = __webpack_require__(5); - -var Animation = function Animation(target, opts, opts2) { - var _p = this._private = util.extend({ - duration: 1000 - }, opts, opts2); - - _p.target = target; - _p.style = _p.style || _p.css; - _p.started = false; - _p.playing = false; - _p.hooked = false; - _p.applying = false; - _p.progress = 0; - _p.completes = []; - _p.frames = []; - - if (_p.complete && is.fn(_p.complete)) { - _p.completes.push(_p.complete); - } - - // for future timeline/animations impl - this.length = 1; - this[0] = this; -}; - -var anifn = Animation.prototype; - -util.extend(anifn, { - - instanceString: function instanceString() { - return 'animation'; - }, - - hook: function hook() { - var _p = this._private; - - if (!_p.hooked) { - // add to target's animation queue - var q = void 0; - var tAni = _p.target._private.animation; - if (_p.queue) { - q = tAni.queue; - } else { - q = tAni.current; - } - q.push(this); - - // add to the animation loop pool - if (is.elementOrCollection(_p.target)) { - _p.target.cy().addToAnimationPool(_p.target); - } - - _p.hooked = true; - } - - return this; - }, - - play: function play() { - var _p = this._private; - - // autorewind - if (_p.progress === 1) { - _p.progress = 0; - } - - _p.playing = true; - _p.started = false; // needs to be started by animation loop - _p.stopped = false; - - this.hook(); - - // the animation loop will start the animation... - - return this; - }, - - playing: function playing() { - return this._private.playing; - }, - - apply: function apply() { - var _p = this._private; - - _p.applying = true; - _p.started = false; // needs to be started by animation loop - _p.stopped = false; - - this.hook(); - - // the animation loop will apply the animation at this progress - - return this; - }, - - applying: function applying() { - return this._private.applying; - }, - - pause: function pause() { - var _p = this._private; - - _p.playing = false; - _p.started = false; - - return this; - }, - - stop: function stop() { - var _p = this._private; - - _p.playing = false; - _p.started = false; - _p.stopped = true; // to be removed from animation queues - - return this; - }, - - rewind: function rewind() { - return this.progress(0); - }, - - fastforward: function fastforward() { - return this.progress(1); - }, - - time: function time(t) { - var _p = this._private; - - if (t === undefined) { - return _p.progress * _p.duration; - } else { - return this.progress(t / _p.duration); - } - }, - - progress: function progress(p) { - var _p = this._private; - var wasPlaying = _p.playing; - - if (p === undefined) { - return _p.progress; - } else { - if (wasPlaying) { - this.pause(); - } - - _p.progress = p; - _p.started = false; - - if (wasPlaying) { - this.play(); - } - } - - return this; - }, - - completed: function completed() { - return this._private.progress === 1; - }, - - reverse: function reverse() { - var _p = this._private; - var wasPlaying = _p.playing; - - if (wasPlaying) { - this.pause(); - } - - _p.progress = 1 - _p.progress; - _p.started = false; - - var swap = function swap(a, b) { - var _pa = _p[a]; - - if (_pa == null) { - return; - } - - _p[a] = _p[b]; - _p[b] = _pa; - }; - - swap('zoom', 'startZoom'); - swap('pan', 'startPan'); - swap('position', 'startPosition'); - - // swap styles - if (_p.style) { - for (var i = 0; i < _p.style.length; i++) { - var prop = _p.style[i]; - var name = prop.name; - var startStyleProp = _p.startStyle[name]; - - _p.startStyle[name] = prop; - _p.style[i] = startStyleProp; - } - } - - if (wasPlaying) { - this.play(); - } - - return this; - }, - - promise: function promise(type) { - var _p = this._private; - - var arr = void 0; - - switch (type) { - case 'frame': - arr = _p.frames; - break; - default: - case 'complete': - case 'completed': - arr = _p.completes; - } - - return new Promise(function (resolve, reject) { - arr.push(function () { - resolve(); - }); - }); - } - -}); - -anifn.complete = anifn.completed; - -module.exports = Animation; - -/***/ }), -/* 46 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -var util = __webpack_require__(1); -var is = __webpack_require__(0); - -var define = { - - // access data field - data: function data(params) { - var defaults = { - field: 'data', - bindingEvent: 'data', - allowBinding: false, - allowSetting: false, - allowGetting: false, - settingEvent: 'data', - settingTriggersEvent: false, - triggerFnName: 'trigger', - immutableKeys: {}, // key => true if immutable - updateStyle: false, - beforeGet: function beforeGet(self) {}, - beforeSet: function beforeSet(self, obj) {}, - onSet: function onSet(self) {}, - canSet: function canSet(self) { - return true; - } - }; - params = util.extend({}, defaults, params); - - return function dataImpl(name, value) { - var p = params; - var self = this; - var selfIsArrayLike = self.length !== undefined; - var all = selfIsArrayLike ? self : [self]; // put in array if not array-like - var single = selfIsArrayLike ? self[0] : self; - - // .data('foo', ...) - if (is.string(name)) { - // set or get property - - // .data('foo') - if (p.allowGetting && value === undefined) { - // get - - var ret = void 0; - if (single) { - p.beforeGet(single); - - ret = single._private[p.field][name]; - } - return ret; - - // .data('foo', 'bar') - } else if (p.allowSetting && value !== undefined) { - // set - var valid = !p.immutableKeys[name]; - if (valid) { - var change = _defineProperty({}, name, value); - - p.beforeSet(self, change); - - for (var i = 0, l = all.length; i < l; i++) { - var ele = all[i]; - - if (p.canSet(ele)) { - ele._private[p.field][name] = value; - } - } - - // update mappers if asked - if (p.updateStyle) { - self.updateStyle(); - } - - // call onSet callback - p.onSet(self); - - if (p.settingTriggersEvent) { - self[p.triggerFnName](p.settingEvent); - } - } - } - - // .data({ 'foo': 'bar' }) - } else if (p.allowSetting && is.plainObject(name)) { - // extend - var obj = name; - var k = void 0, - v = void 0; - var keys = Object.keys(obj); - - p.beforeSet(self, obj); - - for (var _i = 0; _i < keys.length; _i++) { - k = keys[_i]; - v = obj[k]; - - var _valid = !p.immutableKeys[k]; - if (_valid) { - for (var j = 0; j < all.length; j++) { - var _ele = all[j]; - - if (p.canSet(_ele)) { - _ele._private[p.field][k] = v; - } - } - } - } - - // update mappers if asked - if (p.updateStyle) { - self.updateStyle(); - } - - // call onSet callback - p.onSet(self); - - if (p.settingTriggersEvent) { - self[p.triggerFnName](p.settingEvent); - } - - // .data(function(){ ... }) - } else if (p.allowBinding && is.fn(name)) { - // bind to event - var fn = name; - self.on(p.bindingEvent, fn); - - // .data() - } else if (p.allowGetting && name === undefined) { - // get whole object - var _ret = void 0; - if (single) { - p.beforeGet(single); - - _ret = single._private[p.field]; - } - return _ret; - } - - return self; // maintain chainability - }; // function - }, // data - - // remove data field - removeData: function removeData(params) { - var defaults = { - field: 'data', - event: 'data', - triggerFnName: 'trigger', - triggerEvent: false, - immutableKeys: {} // key => true if immutable - }; - params = util.extend({}, defaults, params); - - return function removeDataImpl(names) { - var p = params; - var self = this; - var selfIsArrayLike = self.length !== undefined; - var all = selfIsArrayLike ? self : [self]; // put in array if not array-like - - // .removeData('foo bar') - if (is.string(names)) { - // then get the list of keys, and delete them - var keys = names.split(/\s+/); - var l = keys.length; - - for (var i = 0; i < l; i++) { - // delete each non-empty key - var key = keys[i]; - if (is.emptyString(key)) { - continue; - } - - var valid = !p.immutableKeys[key]; // not valid if immutable - if (valid) { - for (var i_a = 0, l_a = all.length; i_a < l_a; i_a++) { - all[i_a]._private[p.field][key] = undefined; - } - } - } - - if (p.triggerEvent) { - self[p.triggerFnName](p.event); - } - - // .removeData() - } else if (names === undefined) { - // then delete all keys - - for (var _i_a = 0, _l_a = all.length; _i_a < _l_a; _i_a++) { - var _privateFields = all[_i_a]._private[p.field]; - var _keys = Object.keys(_privateFields); - - for (var _i2 = 0; _i2 < _keys.length; _i2++) { - var _key = _keys[_i2]; - var validKeyToDelete = !p.immutableKeys[_key]; - - if (validKeyToDelete) { - _privateFields[_key] = undefined; - } - } - } - - if (p.triggerEvent) { - self[p.triggerFnName](p.event); - } - } - - return self; // maintain chaining - }; // function - } // removeData -}; // define - -module.exports = define; - -/***/ }), -/* 47 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Promise = __webpack_require__(5); - -var define = { - - eventAliasesOn: function eventAliasesOn(proto) { - var p = proto; - - p.addListener = p.listen = p.bind = p.on; - p.unlisten = p.unbind = p.off = p.removeListener; - p.trigger = p.emit; - - // this is just a wrapper alias of .on() - p.pon = p.promiseOn = function (events, selector) { - var self = this; - var args = Array.prototype.slice.call(arguments, 0); - - return new Promise(function (resolve, reject) { - var callback = function callback(e) { - self.off.apply(self, offArgs); - - resolve(e); - }; - - var onArgs = args.concat([callback]); - var offArgs = onArgs.concat([]); - - self.on.apply(self, onArgs); - }); - }; - } - -}; // define - -module.exports = define; - -/***/ }), -/* 48 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Set = __webpack_require__(8); - -var elesfn = { - classes: function classes(_classes) { - _classes = (_classes || '').match(/\S+/g) || []; - var self = this; - var changed = []; - var classesMap = new Set(_classes); - - // check and update each ele - - var _loop = function _loop(j) { - var ele = self[j]; - var _p = ele._private; - var eleClasses = _p.classes; - var changedEle = false; - - // check if ele has all of the passed classes - classesMap.forEach(function (cls) { - var eleHasClass = eleClasses.has(cls); - - if (!eleHasClass) { - changedEle = true; - } - }); - - // check if ele has classes outside of those passed - if (!changedEle) { - eleClasses.forEach(function (eleCls) { - var specdClass = classesMap.has(eleCls); - - if (!specdClass) { - changedEle = true; - } - }); - } - - if (changedEle) { - _p.classes = new Set(classesMap); - - changed.push(ele); - } - }; - - for (var j = 0; j < self.length; j++) { - _loop(j); - } - - // trigger update style on those eles that had class changes - if (changed.length > 0) { - this.spawn(changed).updateStyle().emit('class'); - } - - return self; - }, - - addClass: function addClass(classes) { - return this.toggleClass(classes, true); - }, - - hasClass: function hasClass(className) { - var ele = this[0]; - return ele != null && ele._private.classes.has(className); - }, - - toggleClass: function toggleClass(classesStr, toggle) { - var classes = classesStr.match(/\S+/g) || []; - var self = this; - var changed = []; // eles who had classes changed - - for (var i = 0, il = self.length; i < il; i++) { - var _ele = self[i]; - var _changedEle = false; - - for (var j = 0; j < classes.length; j++) { - var cls = classes[j]; - var _eleClasses = _ele._private.classes; - var hasClass = _eleClasses.has(cls); - var shouldAdd = toggle || toggle === undefined && !hasClass; - - if (shouldAdd) { - _eleClasses.add(cls); - - if (!hasClass && !_changedEle) { - changed.push(_ele); - _changedEle = true; - } - } else { - // then remove - _eleClasses.delete(cls); - - if (hasClass && !_changedEle) { - changed.push(_ele); - _changedEle = true; - } - } - } // for j classes - } // for i eles - - // trigger update style on those eles that had class changes - if (changed.length > 0) { - this.spawn(changed).updateStyle().emit('class'); - } - - return self; - }, - - removeClass: function removeClass(classes) { - return this.toggleClass(classes, false); - }, - - flashClass: function flashClass(classes, duration) { - var self = this; - - if (duration == null) { - duration = 250; - } else if (duration === 0) { - return self; // nothing to do really - } - - self.addClass(classes); - setTimeout(function () { - self.removeClass(classes); - }, duration); - - return self; - } -}; - -module.exports = elesfn; - -/***/ }), -/* 49 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var Selector = __webpack_require__(6); - -var elesfn = { - allAre: function allAre(selector) { - var selObj = new Selector(selector); - - return this.every(function (ele) { - return selObj.matches(ele); - }); - }, - - is: function is(selector) { - var selObj = new Selector(selector); - - return this.some(function (ele) { - return selObj.matches(ele); - }); - }, - - some: function some(fn, thisArg) { - for (var i = 0; i < this.length; i++) { - var ret = !thisArg ? fn(this[i], i, this) : fn.apply(thisArg, [this[i], i, this]); - - if (ret) { - return true; - } - } - - return false; - }, - - every: function every(fn, thisArg) { - for (var i = 0; i < this.length; i++) { - var ret = !thisArg ? fn(this[i], i, this) : fn.apply(thisArg, [this[i], i, this]); - - if (!ret) { - return false; - } - } - - return true; - }, - - same: function same(collection) { - collection = this.cy().collection(collection); - - // cheap extra check - if (this.length !== collection.length) { - return false; - } - - return this.every(function (ele) { - return collection.hasElementWithId(ele.id()); - }); - }, - - anySame: function anySame(collection) { - collection = this.cy().collection(collection); - - return this.some(function (ele) { - return collection.hasElementWithId(ele.id()); - }); - }, - - allAreNeighbors: function allAreNeighbors(collection) { - collection = this.cy().collection(collection); - - var nhood = this.neighborhood(); - - return collection.every(function (ele) { - return nhood.hasElementWithId(ele.id()); - }); - }, - - contains: function contains(collection) { - collection = this.cy().collection(collection); - - var self = this; - - return collection.every(function (ele) { - return self.hasElementWithId(ele.id()); - }); - } -}; - -elesfn.allAreNeighbours = elesfn.allAreNeighbors; -elesfn.has = elesfn.contains; - -module.exports = elesfn; - -/***/ }), -/* 50 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var exprs = __webpack_require__(51); -var newQuery = __webpack_require__(10); - -// of all the expressions, find the first match in the remaining text -var consumeExpr = function consumeExpr(remaining) { - var expr = void 0; - var match = void 0; - var name = void 0; - - for (var j = 0; j < exprs.length; j++) { - var e = exprs[j]; - var n = e.name; - - var m = remaining.match(e.regexObj); - - if (m != null) { - match = m; - expr = e; - name = n; - - var consumed = m[0]; - remaining = remaining.substring(consumed.length); - - break; // we've consumed one expr, so we can return now - } - } - - return { - expr: expr, - match: match, - name: name, - remaining: remaining - }; -}; - -// consume all leading whitespace -var consumeWhitespace = function consumeWhitespace(remaining) { - var match = remaining.match(/^\s+/); - - if (match) { - var consumed = match[0]; - remaining = remaining.substring(consumed.length); - } - - return remaining; -}; - -var parse = function parse(selector) { - var self = this; - - var remaining = self._private.selectorText = selector; - - var currentQuery = self[0] = newQuery(); - self.length = 1; - - remaining = consumeWhitespace(remaining); // get rid of leading whitespace - - for (;;) { - var check = consumeExpr(remaining); - - if (check.expr == null) { - util.error('The selector `' + selector + '`is invalid'); - return false; - } else { - var args = check.match.slice(1); - - // let the token populate the selector object in currentQuery - var ret = check.expr.populate(self, currentQuery, args); - - if (ret === false) { - return false; // exit if population failed - } else if (ret != null) { - currentQuery = ret; // change the current query to be filled if the expr specifies - } - } - - remaining = check.remaining; - - // we're done when there's nothing left to parse - if (remaining.match(/^\s*$/)) { - break; - } - } - - // adjust references for subject - for (var j = 0; j < self.length; j++) { - var query = self[j]; - - if (query.subject != null) { - // go up the tree until we reach the subject - for (;;) { - if (query.subject === query) { - break; - } // done if subject is self - - if (query.parent != null) { - // swap parent/child reference - var parent = query.parent; - var child = query; - - child.parent = null; - parent.child = child; - - query = parent; // go up the tree - } else if (query.ancestor != null) { - // swap ancestor/descendant - var ancestor = query.ancestor; - var descendant = query; - - descendant.ancestor = null; - ancestor.descendant = descendant; - - query = ancestor; // go up the tree - } else if (query.source || query.target || query.connectedNodes) { - util.error('The selector `' + self.text() + '` can not contain a subject selector that applies to the source or target of an edge selector'); - return false; - } else { - util.error('When adjusting references for the selector `' + self.text() + '`, neither parent nor ancestor was found'); - return false; - } - } // for - - self[j] = query.subject; // subject should be the root query - } // if - } // for - - return true; // success -}; - -module.exports = { parse: parse }; - -/***/ }), -/* 51 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }(); - -var _require = __webpack_require__(15), - stateSelectorRegex = _require.stateSelectorRegex; - -var tokens = __webpack_require__(52); -var util = __webpack_require__(1); -var newQuery = __webpack_require__(10); - -// when a token like a variable has escaped meta characters, we need to clean the backslashes out -// so that values get compared properly in Selector.filter() -var cleanMetaChars = function cleanMetaChars(str) { - return str.replace(new RegExp('\\\\(' + tokens.metaChar + ')', 'g'), function (match, $1) { - return $1; - }); -}; - -var replaceLastQuery = function replaceLastQuery(selector, examiningQuery, replacementQuery) { - if (examiningQuery === selector[selector.length - 1]) { - selector[selector.length - 1] = replacementQuery; - } -}; - -// NOTE: add new expression syntax here to have it recognised by the parser; -// - a query contains all adjacent (i.e. no separator in between) expressions; -// - the current query is stored in selector[i] --- you can use the reference to `this` in the populate function; -// - you need to check the query objects in Selector.filter() for it actually filter properly, but that's pretty straight forward -// - when you add something here, also add to Selector.toString() -var exprs = [{ - name: 'group', - query: true, - regex: '(' + tokens.group + ')', - populate: function populate(selector, query, _ref) { - var _ref2 = _slicedToArray(_ref, 1), - group = _ref2[0]; - - query.group = group === '*' ? group : group + 's'; - } -}, { - name: 'state', - query: true, - regex: stateSelectorRegex, - populate: function populate(selector, query, _ref3) { - var _ref4 = _slicedToArray(_ref3, 1), - state = _ref4[0]; - - query.colonSelectors.push(state); - } -}, { - name: 'id', - query: true, - regex: '\\#(' + tokens.id + ')', - populate: function populate(selector, query, _ref5) { - var _ref6 = _slicedToArray(_ref5, 1), - id = _ref6[0]; - - query.ids.push(cleanMetaChars(id)); - } -}, { - name: 'className', - query: true, - regex: '\\.(' + tokens.className + ')', - populate: function populate(selector, query, _ref7) { - var _ref8 = _slicedToArray(_ref7, 1), - className = _ref8[0]; - - query.classes.push(cleanMetaChars(className)); - } -}, { - name: 'dataExists', - query: true, - regex: '\\[\\s*(' + tokens.variable + ')\\s*\\]', - populate: function populate(selector, query, _ref9) { - var _ref10 = _slicedToArray(_ref9, 1), - variable = _ref10[0]; - - query.data.push({ - field: cleanMetaChars(variable) - }); - } -}, { - name: 'dataCompare', - query: true, - regex: '\\[\\s*(' + tokens.variable + ')\\s*(' + tokens.comparatorOp + ')\\s*(' + tokens.value + ')\\s*\\]', - populate: function populate(selector, query, _ref11) { - var _ref12 = _slicedToArray(_ref11, 3), - variable = _ref12[0], - comparatorOp = _ref12[1], - value = _ref12[2]; - - var valueIsString = new RegExp('^' + tokens.string + '$').exec(value) != null; - - if (valueIsString) { - value = value.substring(1, value.length - 1); - } else { - value = parseFloat(value); - } - - query.data.push({ - field: cleanMetaChars(variable), - operator: comparatorOp, - value: value - }); - } -}, { - name: 'dataBool', - query: true, - regex: '\\[\\s*(' + tokens.boolOp + ')\\s*(' + tokens.variable + ')\\s*\\]', - populate: function populate(selector, query, _ref13) { - var _ref14 = _slicedToArray(_ref13, 2), - boolOp = _ref14[0], - variable = _ref14[1]; - - query.data.push({ - field: cleanMetaChars(variable), - operator: boolOp - }); - } -}, { - name: 'metaCompare', - query: true, - regex: '\\[\\[\\s*(' + tokens.meta + ')\\s*(' + tokens.comparatorOp + ')\\s*(' + tokens.number + ')\\s*\\]\\]', - populate: function populate(selector, query, _ref15) { - var _ref16 = _slicedToArray(_ref15, 3), - meta = _ref16[0], - comparatorOp = _ref16[1], - number = _ref16[2]; - - query.meta.push({ - field: cleanMetaChars(meta), - operator: comparatorOp, - value: parseFloat(number) - }); - } -}, { - name: 'nextQuery', - separator: true, - regex: tokens.separator, - populate: function populate(selector) { - // go on to next query - var nextQuery = selector[selector.length++] = newQuery(); - selector.currentSubject = null; - - return nextQuery; - } -}, { - name: 'directedEdge', - separator: true, - regex: tokens.directedEdge, - populate: function populate(selector, query) { - var edgeQuery = newQuery(); - var source = query; - var target = newQuery(); - - edgeQuery.group = 'edges'; - edgeQuery.target = target; - edgeQuery.source = source; - edgeQuery.subject = selector.currentSubject; - - // the query in the selector should be the edge rather than the source - replaceLastQuery(selector, query, edgeQuery); - - // we're now populating the target query with expressions that follow - return target; - } -}, { - name: 'undirectedEdge', - separator: true, - regex: tokens.undirectedEdge, - populate: function populate(selector, query) { - var edgeQuery = newQuery(); - var source = query; - var target = newQuery(); - - edgeQuery.group = 'edges'; - edgeQuery.connectedNodes = [source, target]; - edgeQuery.subject = selector.currentSubject; - - // the query in the selector should be the edge rather than the source - replaceLastQuery(selector, query, edgeQuery); - - // we're now populating the target query with expressions that follow - return target; - } -}, { - name: 'child', - separator: true, - regex: tokens.child, - populate: function populate(selector, query) { - // this query is the parent of the following query - var childQuery = newQuery(); - childQuery.parent = query; - childQuery.subject = selector.currentSubject; - - // it's cheaper to compare children first and go up so replace the parent - replaceLastQuery(selector, query, childQuery); - - // we're now populating the child query with expressions that follow - return childQuery; - } -}, { - name: 'descendant', - separator: true, - regex: tokens.descendant, - populate: function populate(selector, query) { - // this query is the ancestor of the following query - var descendantQuery = newQuery(); - descendantQuery.ancestor = query; - descendantQuery.subject = selector.currentSubject; - - // it's cheaper to compare descendants first and go up so replace the ancestor - replaceLastQuery(selector, query, descendantQuery); - - // we're now populating the descendant query with expressions that follow - return descendantQuery; - } -}, { - name: 'subject', - modifier: true, - regex: tokens.subject, - populate: function populate(selector, query) { - if (selector.currentSubject != null && query.subject != query) { - util.error('Redefinition of subject in selector `' + selector.toString() + '`'); - return false; - } - - selector.currentSubject = query; - query.subject = query; - selector[selector.length - 1].subject = query; - } -}]; - -exprs.forEach(function (e) { - return e.regexObj = new RegExp('^' + e.regex); -}); - -module.exports = exprs; - -/***/ }), -/* 52 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -// tokens in the query language -var tokens = { - metaChar: '[\\!\\"\\#\\$\\%\\&\\\'\\(\\)\\*\\+\\,\\.\\/\\:\\;\\<\\=\\>\\?\\@\\[\\]\\^\\`\\{\\|\\}\\~]', // chars we need to escape in let names, etc - comparatorOp: '=|\\!=|>|>=|<|<=|\\$=|\\^=|\\*=', // binary comparison op (used in data selectors) - boolOp: '\\?|\\!|\\^', // boolean (unary) operators (used in data selectors) - string: '"(?:\\\\"|[^"])*"' + '|' + "'(?:\\\\'|[^'])*'", // string literals (used in data selectors) -- doublequotes | singlequotes - number: util.regex.number, // number literal (used in data selectors) --- e.g. 0.1234, 1234, 12e123 - meta: 'degree|indegree|outdegree', // allowed metadata fields (i.e. allowed functions to use from Collection) - separator: '\\s*,\\s*', // queries are separated by commas, e.g. edge[foo = 'bar'], node.someClass - descendant: '\\s+', - child: '\\s+>\\s+', - subject: '\\$', - group: 'node|edge|\\*', - directedEdge: '\\s+->\\s+', - undirectedEdge: '\\s+<->\\s+' -}; -tokens.variable = '(?:[\\w-]|(?:\\\\' + tokens.metaChar + '))+'; // a variable name -tokens.value = tokens.string + '|' + tokens.number; // a value literal, either a string or number -tokens.className = tokens.variable; // a class name (follows variable conventions) -tokens.id = tokens.variable; // an element id (follows variable conventions) - -(function () { - var ops = void 0, - op = void 0, - i = void 0; - - // add @ variants to comparatorOp - ops = tokens.comparatorOp.split('|'); - for (i = 0; i < ops.length; i++) { - op = ops[i]; - tokens.comparatorOp += '|@' + op; - } - - // add ! variants to comparatorOp - ops = tokens.comparatorOp.split('|'); - for (i = 0; i < ops.length; i++) { - op = ops[i]; - - if (op.indexOf('!') >= 0) { - continue; - } // skip ops that explicitly contain ! - if (op === '=') { - continue; - } // skip = b/c != is explicitly defined - - tokens.comparatorOp += '|\\!' + op; - } -})(); - -module.exports = tokens; - -/***/ }), -/* 53 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var _require = __webpack_require__(15), - stateSelectorMatches = _require.stateSelectorMatches; - -var is = __webpack_require__(0); - -// generic checking for data/metadata -var operandsMatch = function operandsMatch(query, params) { - var allDataMatches = true; - for (var k = 0; k < query[params.name].length; k++) { - var data = query[params.name][k]; - var operator = data.operator; - var value = data.value; - var field = data.field; - var _matches = void 0; - var fieldVal = params.fieldValue(field); - - if (operator != null && value != null) { - var fieldStr = !is.string(fieldVal) && !is.number(fieldVal) ? '' : '' + fieldVal; - var valStr = '' + value; - - var caseInsensitive = false; - if (operator.indexOf('@') >= 0) { - fieldStr = fieldStr.toLowerCase(); - valStr = valStr.toLowerCase(); - - operator = operator.replace('@', ''); - caseInsensitive = true; - } - - var notExpr = false; - if (operator.indexOf('!') >= 0) { - operator = operator.replace('!', ''); - notExpr = true; - } - - // if we're doing a case insensitive comparison, then we're using a STRING comparison - // even if we're comparing numbers - if (caseInsensitive) { - value = valStr.toLowerCase(); - fieldVal = fieldStr.toLowerCase(); - } - - var isIneqCmp = false; - - switch (operator) { - case '*=': - _matches = fieldStr.indexOf(valStr) >= 0; - break; - case '$=': - _matches = fieldStr.indexOf(valStr, fieldStr.length - valStr.length) >= 0; - break; - case '^=': - _matches = fieldStr.indexOf(valStr) === 0; - break; - case '=': - _matches = fieldVal === value; - break; - case '>': - isIneqCmp = true; - _matches = fieldVal > value; - break; - case '>=': - isIneqCmp = true; - _matches = fieldVal >= value; - break; - case '<': - isIneqCmp = true; - _matches = fieldVal < value; - break; - case '<=': - isIneqCmp = true; - _matches = fieldVal <= value; - break; - default: - _matches = false; - break; - } - - // apply the not op, but null vals for inequalities should always stay non-matching - if (notExpr && (fieldVal != null || !isIneqCmp)) { - _matches = !_matches; - } - } else if (operator != null) { - switch (operator) { - case '?': - _matches = fieldVal ? true : false; - break; - case '!': - _matches = fieldVal ? false : true; - break; - case '^': - _matches = fieldVal === undefined; - break; - } - } else { - _matches = fieldVal !== undefined; - } - - if (!_matches) { - allDataMatches = false; - break; - } - } // for - - return allDataMatches; -}; // operandsMatch - -// check parent/child relations -var confirmRelations = function confirmRelations(query, isNecessary, eles) { - if (query != null) { - var _matches2 = false; - - if (!isNecessary) { - return false; - } - - eles = eles(); // save cycles if query == null - - // query must match for at least one element (may be recursive) - for (var i = 0; i < eles.length; i++) { - if (queryMatches(query, eles[i])) { - _matches2 = true; - break; - } - } - - return _matches2; - } else { - return true; - } -}; - -var queryMatches = function queryMatches(query, ele) { - // make single group-only selectors really cheap to check since they're the most common ones - if (query.groupOnly) { - return query.group === '*' || query.group === ele.group(); - } - - // check group - if (query.group != null && query.group != '*' && query.group != ele.group()) { - return false; - } - - var cy = ele.cy(); - var k = void 0; - - // check colon selectors - var allColonSelectorsMatch = true; - for (k = 0; k < query.colonSelectors.length; k++) { - var sel = query.colonSelectors[k]; - - allColonSelectorsMatch = stateSelectorMatches(sel, ele); - - if (!allColonSelectorsMatch) break; - } - if (!allColonSelectorsMatch) return false; - - // check id - var allIdsMatch = true; - for (k = 0; k < query.ids.length; k++) { - var id = query.ids[k]; - var actualId = ele.id(); - - allIdsMatch = allIdsMatch && id == actualId; - - if (!allIdsMatch) break; - } - if (!allIdsMatch) return false; - - // check classes - var allClassesMatch = true; - for (k = 0; k < query.classes.length; k++) { - var cls = query.classes[k]; - - allClassesMatch = allClassesMatch && ele.hasClass(cls); - - if (!allClassesMatch) break; - } - if (!allClassesMatch) return false; - - // check data matches - var allDataMatches = operandsMatch(query, { - name: 'data', - fieldValue: function fieldValue(field) { - return ele.data(field); - } - }); - - if (!allDataMatches) { - return false; - } - - // check metadata matches - var allMetaMatches = operandsMatch(query, { - name: 'meta', - fieldValue: function fieldValue(field) { - return ele[field](); - } - }); - - if (!allMetaMatches) { - return false; - } - - // check collection - if (query.collection != null) { - var matchesAny = query.collection.hasElementWithId(ele.id()); - - if (!matchesAny) { - return false; - } - } - - // check filter function - if (query.filter != null && ele.collection().some(query.filter)) { - return false; - } - - var isCompound = cy.hasCompoundNodes(); - var getSource = function getSource() { - return ele.source(); - }; - var getTarget = function getTarget() { - return ele.target(); - }; - - if (!confirmRelations(query.parent, isCompound, function () { - return ele.parent(); - })) { - return false; - } - - if (!confirmRelations(query.ancestor, isCompound, function () { - return ele.parents(); - })) { - return false; - } - - if (!confirmRelations(query.child, isCompound, function () { - return ele.children(); - })) { - return false; - } - - if (!confirmRelations(query.descendant, isCompound, function () { - return ele.descendants(); - })) { - return false; - } - - if (!confirmRelations(query.source, true, getSource)) { - return false; - } - - if (!confirmRelations(query.target, true, getTarget)) { - return false; - } - - if (query.connectedNodes) { - var q0 = query.connectedNodes[0]; - var q1 = query.connectedNodes[1]; - - if (confirmRelations(q0, true, getSource) && confirmRelations(q1, true, getTarget)) { - // match - } else if (confirmRelations(q0, true, getTarget) && confirmRelations(q1, true, getSource)) { - // match - } else { - return false; - } - } - - // we've reached the end, so we've matched everything for this query - return true; -}; // queryMatches - -// filter an existing collection -var filter = function filter(collection) { - var self = this; - var cy = collection.cy(); - - // don't bother trying if it's invalid - if (self.invalid()) { - return cy.collection(); - } - - // for 1 id #foo queries, just get the element - if (self.length === 1 && self[0].length === 1 && self[0].ids.length === 1) { - return collection.getElementById(self[0].ids[0]).collection(); - } - - var selectorFunction = function selectorFunction(element) { - for (var j = 0; j < self.length; j++) { - var query = self[j]; - - if (queryMatches(query, element)) { - return true; - } - } - - return false; - }; - - if (self.text() == null) { - selectorFunction = function selectorFunction() { - return true; - }; - } - - var filteredCollection = collection.filter(selectorFunction); - - return filteredCollection; -}; // filter - -// does selector match a single element? -var matches = function matches(ele) { - var self = this; - - // don't bother trying if it's invalid - if (self.invalid()) { - return false; - } - - for (var j = 0; j < self.length; j++) { - var query = self[j]; - - if (queryMatches(query, ele)) { - return true; - } - } - - return false; -}; // filter - -module.exports = { matches: matches, filter: filter }; - -/***/ }), -/* 54 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Set = __webpack_require__(8); - -var elesfn = { - parent: function parent(selector) { - var parents = []; - - // optimisation for single ele call - if (this.length === 1) { - var parent = this[0]._private.parent; - - if (parent) { - return parent; - } - } - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var _parent = ele._private.parent; - - if (_parent) { - parents.push(_parent); - } - } - - return this.spawn(parents, { unique: true }).filter(selector); - }, - - parents: function parents(selector) { - var parents = []; - - var eles = this.parent(); - while (eles.nonempty()) { - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - parents.push(ele); - } - - eles = eles.parent(); - } - - return this.spawn(parents, { unique: true }).filter(selector); - }, - - commonAncestors: function commonAncestors(selector) { - var ancestors = void 0; - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var parents = ele.parents(); - - ancestors = ancestors || parents; - - ancestors = ancestors.intersect(parents); // current list must be common with current ele parents set - } - - return ancestors.filter(selector); - }, - - orphans: function orphans(selector) { - return this.stdFilter(function (ele) { - return ele.isOrphan(); - }).filter(selector); - }, - - nonorphans: function nonorphans(selector) { - return this.stdFilter(function (ele) { - return ele.isChild(); - }).filter(selector); - }, - - children: function children(selector) { - var children = []; - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - children = children.concat(ele._private.children); - } - - return this.spawn(children, { unique: true }).filter(selector); - }, - - siblings: function siblings(selector) { - return this.parent().children().not(this).filter(selector); - }, - - isParent: function isParent() { - var ele = this[0]; - - if (ele) { - return ele.isNode() && ele._private.children.length !== 0; - } - }, - - isChildless: function isChildless() { - var ele = this[0]; - - if (ele) { - return ele.isNode() && ele._private.children.length === 0; - } - }, - - isChild: function isChild() { - var ele = this[0]; - - if (ele) { - return ele.isNode() && ele._private.parent != null; - } - }, - - isOrphan: function isOrphan() { - var ele = this[0]; - - if (ele) { - return ele.isNode() && ele._private.parent == null; - } - }, - - descendants: function descendants(selector) { - var elements = []; - - function add(eles) { - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - elements.push(ele); - - if (ele.children().nonempty()) { - add(ele.children()); - } - } - } - - add(this.children()); - - return this.spawn(elements, { unique: true }).filter(selector); - } -}; - -function forEachCompound(eles, fn, includeSelf, recursiveStep) { - var q = []; - var did = new Set(); - var cy = eles.cy(); - var hasCompounds = cy.hasCompoundNodes(); - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - if (includeSelf) { - q.push(ele); - } else if (hasCompounds) { - recursiveStep(q, did, ele); - } - } - - while (q.length > 0) { - var _ele = q.shift(); - - fn(_ele); - - did.add(_ele.id()); - - if (hasCompounds) { - recursiveStep(q, did, _ele); - } - } - - return eles; -} - -function addChildren(q, did, ele) { - if (ele.isParent()) { - var children = ele._private.children; - - for (var i = 0; i < children.length; i++) { - var child = children[i]; - - if (!did.has(child.id())) { - q.push(child); - } - } - } -} - -// very efficient version of eles.add( eles.descendants() ).forEach() -// for internal use -elesfn.forEachDown = function (fn) { - var includeSelf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; - - return forEachCompound(this, fn, includeSelf, addChildren); -}; - -function addParent(q, did, ele) { - if (ele.isChild()) { - var parent = ele._private.parent; - - if (!did.has(parent.id())) { - q.push(parent); - } - } -} - -elesfn.forEachUp = function (fn) { - var includeSelf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; - - return forEachCompound(this, fn, includeSelf, addParent); -}; - -function addParentAndChildren(q, did, ele) { - addParent(q, did, ele); - addChildren(q, did, ele); -} - -elesfn.forEachUpAndDown = function (fn) { - var includeSelf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; - - return forEachCompound(this, fn, includeSelf, addParentAndChildren); -}; - -// aliases -elesfn.ancestors = elesfn.parents; - -module.exports = elesfn; - -/***/ }), -/* 55 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var define = __webpack_require__(4); -var fn = void 0, - elesfn = void 0; - -fn = elesfn = { - - data: define.data({ - field: 'data', - bindingEvent: 'data', - allowBinding: true, - allowSetting: true, - settingEvent: 'data', - settingTriggersEvent: true, - triggerFnName: 'trigger', - allowGetting: true, - immutableKeys: { - 'id': true, - 'source': true, - 'target': true, - 'parent': true - }, - updateStyle: true - }), - - removeData: define.removeData({ - field: 'data', - event: 'data', - triggerFnName: 'trigger', - triggerEvent: true, - immutableKeys: { - 'id': true, - 'source': true, - 'target': true, - 'parent': true - }, - updateStyle: true - }), - - scratch: define.data({ - field: 'scratch', - bindingEvent: 'scratch', - allowBinding: true, - allowSetting: true, - settingEvent: 'scratch', - settingTriggersEvent: true, - triggerFnName: 'trigger', - allowGetting: true, - updateStyle: true - }), - - removeScratch: define.removeData({ - field: 'scratch', - event: 'scratch', - triggerFnName: 'trigger', - triggerEvent: true, - updateStyle: true - }), - - rscratch: define.data({ - field: 'rscratch', - allowBinding: false, - allowSetting: true, - settingTriggersEvent: false, - allowGetting: true - }), - - removeRscratch: define.removeData({ - field: 'rscratch', - triggerEvent: false - }), - - id: function id() { - var ele = this[0]; - - if (ele) { - return ele._private.data.id; - } - } - -}; - -// aliases -fn.attr = fn.data; -fn.removeAttr = fn.removeData; - -module.exports = elesfn; - -/***/ }), -/* 56 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var elesfn = {}; - -function defineDegreeFunction(callback) { - return function (includeLoops) { - var self = this; - - if (includeLoops === undefined) { - includeLoops = true; - } - - if (self.length === 0) { - return; - } - - if (self.isNode() && !self.removed()) { - var degree = 0; - var node = self[0]; - var connectedEdges = node._private.edges; - - for (var i = 0; i < connectedEdges.length; i++) { - var edge = connectedEdges[i]; - - if (!includeLoops && edge.isLoop()) { - continue; - } - - degree += callback(node, edge); - } - - return degree; - } else { - return; - } - }; -} - -util.extend(elesfn, { - degree: defineDegreeFunction(function (node, edge) { - if (edge.source().same(edge.target())) { - return 2; - } else { - return 1; - } - }), - - indegree: defineDegreeFunction(function (node, edge) { - if (edge.target().same(node)) { - return 1; - } else { - return 0; - } - }), - - outdegree: defineDegreeFunction(function (node, edge) { - if (edge.source().same(node)) { - return 1; - } else { - return 0; - } - }) -}); - -function defineDegreeBoundsFunction(degreeFn, callback) { - return function (includeLoops) { - var ret = void 0; - var nodes = this.nodes(); - - for (var i = 0; i < nodes.length; i++) { - var ele = nodes[i]; - var degree = ele[degreeFn](includeLoops); - if (degree !== undefined && (ret === undefined || callback(degree, ret))) { - ret = degree; - } - } - - return ret; - }; -} - -util.extend(elesfn, { - minDegree: defineDegreeBoundsFunction('degree', function (degree, min) { - return degree < min; - }), - - maxDegree: defineDegreeBoundsFunction('degree', function (degree, max) { - return degree > max; - }), - - minIndegree: defineDegreeBoundsFunction('indegree', function (degree, min) { - return degree < min; - }), - - maxIndegree: defineDegreeBoundsFunction('indegree', function (degree, max) { - return degree > max; - }), - - minOutdegree: defineDegreeBoundsFunction('outdegree', function (degree, min) { - return degree < min; - }), - - maxOutdegree: defineDegreeBoundsFunction('outdegree', function (degree, max) { - return degree > max; - }) -}); - -util.extend(elesfn, { - totalDegree: function totalDegree(includeLoops) { - var total = 0; - var nodes = this.nodes(); - - for (var i = 0; i < nodes.length; i++) { - total += nodes[i].degree(includeLoops); - } - - return total; - } -}); - -module.exports = elesfn; - -/***/ }), -/* 57 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var position = __webpack_require__(58); -var bounds = __webpack_require__(59); -var widthHeight = __webpack_require__(60); -var edgePoints = __webpack_require__(61); - -module.exports = util.assign({}, position, bounds, widthHeight, edgePoints); - -/***/ }), -/* 58 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var define = __webpack_require__(4); -var is = __webpack_require__(0); -var math = __webpack_require__(2); -var fn = void 0, - elesfn = void 0; - -var beforePositionSet = function beforePositionSet(eles, newPos) { - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - if (ele.isParent() && !ele.locked()) { - var oldPos = ele._private.position; - var delta = { - x: newPos.x - oldPos.x, - y: newPos.y - oldPos.y - }; - - eles.children().shift(delta); - } - } -}; - -fn = elesfn = { - - position: define.data({ - field: 'position', - bindingEvent: 'position', - allowBinding: true, - allowSetting: true, - settingEvent: 'position', - settingTriggersEvent: true, - triggerFnName: 'emitAndNotify', - allowGetting: true, - validKeys: ['x', 'y'], - beforeGet: function beforeGet(ele) { - ele.updateCompoundBounds(); - }, - beforeSet: beforePositionSet, - onSet: function onSet(eles) { - eles.dirtyCompoundBoundsCache(); - }, - canSet: function canSet(ele) { - return !ele.locked(); - } - }), - - // position but no notification to renderer - silentPosition: define.data({ - field: 'position', - bindingEvent: 'position', - allowBinding: false, - allowSetting: true, - settingEvent: 'position', - settingTriggersEvent: false, - triggerFnName: 'trigger', - allowGetting: false, - validKeys: ['x', 'y'], - beforeSet: beforePositionSet, - onSet: function onSet(eles) { - eles.dirtyCompoundBoundsCache(); - }, - canSet: function canSet(ele) { - return !ele.locked(); - } - }), - - positions: function positions(pos, silent) { - if (is.plainObject(pos)) { - if (silent) { - this.silentPosition(pos); - } else { - this.position(pos); - } - } else if (is.fn(pos)) { - var _fn = pos; - var cy = this.cy(); - - cy.startBatch(); - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var _pos = void 0; - - if (_pos = _fn(ele, i)) { - if (silent) { - ele.silentPosition(_pos); - } else { - ele.position(_pos); - } - } - } - - cy.endBatch(); - } - - return this; // chaining - }, - - silentPositions: function silentPositions(pos) { - return this.positions(pos, true); - }, - - shift: function shift(dim, val) { - var delta = void 0; - - if (is.plainObject(dim)) { - delta = dim; - } else if (is.string(dim) && is.number(val)) { - delta = { x: 0, y: 0 }; - - delta[dim] = val; - } - - if (delta != null) { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var pos = ele.position(); - - ele.position({ - x: pos.x + delta.x, - y: pos.y + delta.y - }); - } - } - - return this; - }, - - // get/set the rendered (i.e. on screen) positon of the element - renderedPosition: function renderedPosition(dim, val) { - var ele = this[0]; - var cy = this.cy(); - var zoom = cy.zoom(); - var pan = cy.pan(); - var rpos = is.plainObject(dim) ? dim : undefined; - var setting = rpos !== undefined || val !== undefined && is.string(dim); - - if (ele && ele.isNode()) { - // must have an element and must be a node to return position - if (setting) { - for (var i = 0; i < this.length; i++) { - var _ele = this[i]; - - if (val !== undefined) { - // set one dimension - _ele.position(dim, (val - pan[dim]) / zoom); - } else if (rpos !== undefined) { - // set whole position - _ele.position(math.renderedToModelPosition(rpos, zoom, pan)); - } - } - } else { - // getting - var pos = ele.position(); - rpos = math.modelToRenderedPosition(pos, zoom, pan); - - if (dim === undefined) { - // then return the whole rendered position - return rpos; - } else { - // then return the specified dimension - return rpos[dim]; - } - } - } else if (!setting) { - return undefined; // for empty collection case - } - - return this; // chaining - }, - - // get/set the position relative to the parent - relativePosition: function relativePosition(dim, val) { - var ele = this[0]; - var cy = this.cy(); - var ppos = is.plainObject(dim) ? dim : undefined; - var setting = ppos !== undefined || val !== undefined && is.string(dim); - var hasCompoundNodes = cy.hasCompoundNodes(); - - if (ele && ele.isNode()) { - // must have an element and must be a node to return position - if (setting) { - for (var i = 0; i < this.length; i++) { - var _ele2 = this[i]; - var parent = hasCompoundNodes ? _ele2.parent() : null; - var hasParent = parent && parent.length > 0; - var relativeToParent = hasParent; - - if (hasParent) { - parent = parent[0]; - } - - var origin = relativeToParent ? parent.position() : { x: 0, y: 0 }; - - if (val !== undefined) { - // set one dimension - _ele2.position(dim, val + origin[dim]); - } else if (ppos !== undefined) { - // set whole position - _ele2.position({ - x: ppos.x + origin.x, - y: ppos.y + origin.y - }); - } - } - } else { - // getting - var pos = ele.position(); - var _parent = hasCompoundNodes ? ele.parent() : null; - var _hasParent = _parent && _parent.length > 0; - var _relativeToParent = _hasParent; - - if (_hasParent) { - _parent = _parent[0]; - } - - var _origin = _relativeToParent ? _parent.position() : { x: 0, y: 0 }; - - ppos = { - x: pos.x - _origin.x, - y: pos.y - _origin.y - }; - - if (dim === undefined) { - // then return the whole rendered position - return ppos; - } else { - // then return the specified dimension - return ppos[dim]; - } - } - } else if (!setting) { - return undefined; // for empty collection case - } - - return this; // chaining - } -}; - -// aliases -fn.modelPosition = fn.point = fn.position; -fn.modelPositions = fn.points = fn.positions; -fn.renderedPoint = fn.renderedPosition; -fn.relativePoint = fn.relativePosition; - -module.exports = elesfn; - -/***/ }), -/* 59 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var math = __webpack_require__(2); -var fn = void 0, - elesfn = void 0; - -fn = elesfn = {}; - -elesfn.renderedBoundingBox = function (options) { - var bb = this.boundingBox(options); - var cy = this.cy(); - var zoom = cy.zoom(); - var pan = cy.pan(); - - var x1 = bb.x1 * zoom + pan.x; - var x2 = bb.x2 * zoom + pan.x; - var y1 = bb.y1 * zoom + pan.y; - var y2 = bb.y2 * zoom + pan.y; - - return { - x1: x1, - x2: x2, - y1: y1, - y2: y2, - w: x2 - x1, - h: y2 - y1 - }; -}; - -elesfn.dirtyCompoundBoundsCache = function () { - var cy = this.cy(); - - if (!cy.styleEnabled() || !cy.hasCompoundNodes()) { - return this; - } - - this.forEachUp(function (ele) { - ele._private.compoundBoundsClean = false; - - if (ele.isParent()) { - ele.emit('bounds'); - } - }); - - return this; -}; - -elesfn.updateCompoundBounds = function () { - var cy = this.cy(); - - // save cycles for non compound graphs or when style disabled - if (!cy.styleEnabled() || !cy.hasCompoundNodes()) { - return this; - } - - // save cycles when batching -- but bounds will be stale (or not exist yet) - if (cy.batching()) { - return this; - } - - var updated = []; - - function update(parent) { - if (!parent.isParent()) { - return; - } - - var _p = parent._private; - var children = parent.children(); - var includeLabels = parent.pstyle('compound-sizing-wrt-labels').value === 'include'; - - var min = { - width: { - val: parent.pstyle('min-width').pfValue, - left: parent.pstyle('min-width-bias-left'), - right: parent.pstyle('min-width-bias-right') - }, - height: { - val: parent.pstyle('min-height').pfValue, - top: parent.pstyle('min-height-bias-top'), - bottom: parent.pstyle('min-height-bias-bottom') - } - }; - - var bb = children.boundingBox({ - includeLabels: includeLabels, - includeOverlays: false, - - // updating the compound bounds happens outside of the regular - // cache cycle (i.e. before fired events) - useCache: false - }); - var pos = _p.position; - - // if children take up zero area then keep position and fall back on stylesheet w/h - if (bb.w === 0 || bb.h === 0) { - bb = { - w: parent.pstyle('width').pfValue, - h: parent.pstyle('height').pfValue - }; - - bb.x1 = pos.x - bb.w / 2; - bb.x2 = pos.x + bb.w / 2; - bb.y1 = pos.y - bb.h / 2; - bb.y2 = pos.y + bb.h / 2; - } - - function computeBiasValues(propDiff, propBias, propBiasComplement) { - var biasDiff = 0; - var biasComplementDiff = 0; - var biasTotal = propBias + propBiasComplement; - - if (propDiff > 0 && biasTotal > 0) { - biasDiff = propBias / biasTotal * propDiff; - biasComplementDiff = propBiasComplement / biasTotal * propDiff; - } - return { - biasDiff: biasDiff, - biasComplementDiff: biasComplementDiff - }; - } - - function computePaddingValues(width, height, paddingObject, relativeTo) { - // Assuming percentage is number from 0 to 1 - if (paddingObject.units === '%') { - switch (relativeTo) { - case 'width': - return width > 0 ? paddingObject.pfValue * width : 0; - case 'height': - return height > 0 ? paddingObject.pfValue * height : 0; - case 'average': - return width > 0 && height > 0 ? paddingObject.pfValue * (width + height) / 2 : 0; - case 'min': - return width > 0 && height > 0 ? width > height ? paddingObject.pfValue * height : paddingObject.pfValue * width : 0; - case 'max': - return width > 0 && height > 0 ? width > height ? paddingObject.pfValue * width : paddingObject.pfValue * height : 0; - default: - return 0; - } - } else if (paddingObject.units === 'px') { - return paddingObject.pfValue; - } else { - return 0; - } - } - - var leftVal = min.width.left.value; - if (min.width.left.units === 'px' && min.width.val > 0) { - leftVal = leftVal * 100 / min.width.val; - } - var rightVal = min.width.right.value; - if (min.width.right.units === 'px' && min.width.val > 0) { - rightVal = rightVal * 100 / min.width.val; - } - - var topVal = min.height.top.value; - if (min.height.top.units === 'px' && min.height.val > 0) { - topVal = topVal * 100 / min.height.val; - } - - var bottomVal = min.height.bottom.value; - if (min.height.bottom.units === 'px' && min.height.val > 0) { - bottomVal = bottomVal * 100 / min.height.val; - } - - var widthBiasDiffs = computeBiasValues(min.width.val - bb.w, leftVal, rightVal); - var diffLeft = widthBiasDiffs.biasDiff; - var diffRight = widthBiasDiffs.biasComplementDiff; - - var heightBiasDiffs = computeBiasValues(min.height.val - bb.h, topVal, bottomVal); - var diffTop = heightBiasDiffs.biasDiff; - var diffBottom = heightBiasDiffs.biasComplementDiff; - - _p.autoPadding = computePaddingValues(bb.w, bb.h, parent.pstyle('padding'), parent.pstyle('padding-relative-to').value); - - _p.autoWidth = Math.max(bb.w, min.width.val); - pos.x = (-diffLeft + bb.x1 + bb.x2 + diffRight) / 2; - - _p.autoHeight = Math.max(bb.h, min.height.val); - pos.y = (-diffTop + bb.y1 + bb.y2 + diffBottom) / 2; - - updated.push(parent); - } - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var _p = ele._private; - - if (!_p.compoundBoundsClean) { - update(ele); - - if (!cy._private.batchingStyle) { - _p.compoundBoundsClean = true; - } - } - } - - return this; -}; - -var noninf = function noninf(x) { - if (x === Infinity || x === -Infinity) { - return 0; - } - - return x; -}; - -var updateBounds = function updateBounds(b, x1, y1, x2, y2) { - // don't update with zero area boxes - if (x2 - x1 === 0 || y2 - y1 === 0) { - return; - } - - // don't update with null dim - if (x1 == null || y1 == null || x2 == null || y2 == null) { - return; - } - - b.x1 = x1 < b.x1 ? x1 : b.x1; - b.x2 = x2 > b.x2 ? x2 : b.x2; - b.y1 = y1 < b.y1 ? y1 : b.y1; - b.y2 = y2 > b.y2 ? y2 : b.y2; -}; - -var updateBoundsFromBox = function updateBoundsFromBox(b, b2) { - return updateBounds(b, b2.x1, b2.y1, b2.x2, b2.y2); -}; - -var prefixedProperty = function prefixedProperty(obj, field, prefix) { - return util.getPrefixedProperty(obj, field, prefix); -}; - -var updateBoundsFromArrow = function updateBoundsFromArrow(bounds, ele, prefix) { - if (ele.cy().headless()) { - return; - } - - var _p = ele._private; - var rstyle = _p.rstyle; - var halfArW = rstyle.arrowWidth / 2; - var arrowType = ele.pstyle(prefix + '-arrow-shape').value; - var x = void 0; - var y = void 0; - - if (arrowType !== 'none') { - if (prefix === 'source') { - x = rstyle.srcX; - y = rstyle.srcY; - } else if (prefix === 'target') { - x = rstyle.tgtX; - y = rstyle.tgtY; - } else { - x = rstyle.midX; - y = rstyle.midY; - } - - updateBounds(bounds, x - halfArW, y - halfArW, x + halfArW, y + halfArW); - } -}; - -var updateBoundsFromLabel = function updateBoundsFromLabel(bounds, ele, prefix) { - if (ele.cy().headless()) { - return; - } - - var prefixDash = void 0; - - if (prefix) { - prefixDash = prefix + '-'; - } else { - prefixDash = ''; - } - - var _p = ele._private; - var rstyle = _p.rstyle; - var label = ele.pstyle(prefixDash + 'label').strValue; - - if (label) { - var halign = ele.pstyle('text-halign'); - var valign = ele.pstyle('text-valign'); - var labelWidth = prefixedProperty(rstyle, 'labelWidth', prefix); - var labelHeight = prefixedProperty(rstyle, 'labelHeight', prefix); - var labelX = prefixedProperty(rstyle, 'labelX', prefix); - var labelY = prefixedProperty(rstyle, 'labelY', prefix); - var marginX = ele.pstyle(prefixDash + 'text-margin-x').pfValue; - var marginY = ele.pstyle(prefixDash + 'text-margin-y').pfValue; - var isEdge = ele.isEdge(); - var rotation = ele.pstyle(prefixDash + 'text-rotation'); - var outlineWidth = ele.pstyle('text-outline-width').pfValue; - var borderWidth = ele.pstyle('text-border-width').pfValue; - var halfBorderWidth = borderWidth / 2; - var padding = ele.pstyle('text-background-padding').pfValue; - - var lh = labelHeight + 2 * padding; - var lw = labelWidth + 2 * padding; - var lw_2 = lw / 2; - var lh_2 = lh / 2; - var lx1 = void 0, - lx2 = void 0, - ly1 = void 0, - ly2 = void 0; - - if (isEdge) { - lx1 = labelX - lw_2; - lx2 = labelX + lw_2; - ly1 = labelY - lh_2; - ly2 = labelY + lh_2; - } else { - switch (halign.value) { - case 'left': - lx1 = labelX - lw; - lx2 = labelX; - break; - - case 'center': - lx1 = labelX - lw_2; - lx2 = labelX + lw_2; - break; - - case 'right': - lx1 = labelX; - lx2 = labelX + lw; - break; - } - - switch (valign.value) { - case 'top': - ly1 = labelY - lh; - ly2 = labelY; - break; - - case 'center': - ly1 = labelY - lh_2; - ly2 = labelY + lh_2; - break; - - case 'bottom': - ly1 = labelY; - ly2 = labelY + lh; - break; - } - } - - var isAutorotate = isEdge && rotation.strValue === 'autorotate'; - var isPfValue = rotation.pfValue != null && rotation.pfValue !== 0; - - if (isAutorotate || isPfValue) { - var theta = isAutorotate ? prefixedProperty(_p.rstyle, 'labelAngle', prefix) : rotation.pfValue; - var cos = Math.cos(theta); - var sin = Math.sin(theta); - - var rotate = function rotate(x, y) { - x = x - labelX; - y = y - labelY; - - return { - x: x * cos - y * sin + labelX, - y: x * sin + y * cos + labelY - }; - }; - - var px1y1 = rotate(lx1, ly1); - var px1y2 = rotate(lx1, ly2); - var px2y1 = rotate(lx2, ly1); - var px2y2 = rotate(lx2, ly2); - - lx1 = Math.min(px1y1.x, px1y2.x, px2y1.x, px2y2.x); - lx2 = Math.max(px1y1.x, px1y2.x, px2y1.x, px2y2.x); - ly1 = Math.min(px1y1.y, px1y2.y, px2y1.y, px2y2.y); - ly2 = Math.max(px1y1.y, px1y2.y, px2y1.y, px2y2.y); - } - - lx1 += marginX - Math.max(outlineWidth, halfBorderWidth); - lx2 += marginX + Math.max(outlineWidth, halfBorderWidth); - ly1 += marginY - Math.max(outlineWidth, halfBorderWidth); - ly2 += marginY + Math.max(outlineWidth, halfBorderWidth); - - updateBounds(bounds, lx1, ly1, lx2, ly2); - } - - return bounds; -}; - -// get the bounding box of the elements (in raw model position) -var boundingBoxImpl = function boundingBoxImpl(ele, options) { - var cy = ele._private.cy; - var styleEnabled = cy.styleEnabled(); - var headless = cy.headless(); - - var bounds = { - x1: Infinity, - y1: Infinity, - x2: -Infinity, - y2: -Infinity - }; - - var _p = ele._private; - var display = styleEnabled ? ele.pstyle('display').value : 'element'; - var isNode = ele.isNode(); - var isEdge = ele.isEdge(); - var ex1 = void 0, - ex2 = void 0, - ey1 = void 0, - ey2 = void 0; // extrema of body / lines - var x = void 0, - y = void 0; // node pos - var displayed = display !== 'none'; - - if (displayed) { - var overlayOpacity = 0; - var overlayPadding = 0; - - if (styleEnabled && options.includeOverlays) { - overlayOpacity = ele.pstyle('overlay-opacity').value; - - if (overlayOpacity !== 0) { - overlayPadding = ele.pstyle('overlay-padding').value; - } - } - - var w = 0; - var wHalf = 0; - - if (styleEnabled) { - w = ele.pstyle('width').pfValue; - wHalf = w / 2; - } - - if (isNode && options.includeNodes) { - var pos = ele.position(); - x = pos.x; - y = pos.y; - var _w = ele.outerWidth(); - var halfW = _w / 2; - var h = ele.outerHeight(); - var halfH = h / 2; - - // handle node dimensions - ///////////////////////// - - ex1 = x - halfW - overlayPadding; - ex2 = x + halfW + overlayPadding; - ey1 = y - halfH - overlayPadding; - ey2 = y + halfH + overlayPadding; - - updateBounds(bounds, ex1, ey1, ex2, ey2); - } else if (isEdge && options.includeEdges) { - var rstyle = _p.rstyle || {}; - - // handle edge dimensions (rough box estimate) - ////////////////////////////////////////////// - if (styleEnabled && !headless) { - ex1 = Math.min(rstyle.srcX, rstyle.midX, rstyle.tgtX); - ex2 = Math.max(rstyle.srcX, rstyle.midX, rstyle.tgtX); - ey1 = Math.min(rstyle.srcY, rstyle.midY, rstyle.tgtY); - ey2 = Math.max(rstyle.srcY, rstyle.midY, rstyle.tgtY); - - // take into account edge width - ex1 -= wHalf; - ex2 += wHalf; - ey1 -= wHalf; - ey2 += wHalf; - - updateBounds(bounds, ex1, ey1, ex2, ey2); - } - - // precise haystacks - //////////////////// - if (styleEnabled && !headless && ele.pstyle('curve-style').strValue === 'haystack') { - var hpts = rstyle.haystackPts || []; - - ex1 = hpts[0].x; - ey1 = hpts[0].y; - ex2 = hpts[1].x; - ey2 = hpts[1].y; - - if (ex1 > ex2) { - var temp = ex1; - ex1 = ex2; - ex2 = temp; - } - - if (ey1 > ey2) { - var _temp = ey1; - ey1 = ey2; - ey2 = _temp; - } - - updateBounds(bounds, ex1 - wHalf, ey1 - wHalf, ex2 + wHalf, ey2 + wHalf); - - // handle points along edge - /////////////////////////// - } else { - var pts = rstyle.bezierPts || rstyle.linePts || []; - - for (var j = 0; j < pts.length; j++) { - var pt = pts[j]; - - ex1 = pt.x - wHalf; - ex2 = pt.x + wHalf; - ey1 = pt.y - wHalf; - ey2 = pt.y + wHalf; - - updateBounds(bounds, ex1, ey1, ex2, ey2); - } - - // fallback on source and target positions - ////////////////////////////////////////// - if (pts.length === 0) { - var n1 = ele.source(); - var n1pos = n1.position(); - - var n2 = ele.target(); - var n2pos = n2.position(); - - ex1 = n1pos.x; - ex2 = n2pos.x; - ey1 = n1pos.y; - ey2 = n2pos.y; - - if (ex1 > ex2) { - var _temp2 = ex1; - ex1 = ex2; - ex2 = _temp2; - } - - if (ey1 > ey2) { - var _temp3 = ey1; - ey1 = ey2; - ey2 = _temp3; - } - - // take into account edge width - ex1 -= wHalf; - ex2 += wHalf; - ey1 -= wHalf; - ey2 += wHalf; - - updateBounds(bounds, ex1, ey1, ex2, ey2); - } - } - } // edges - - - // handle edge arrow size - ///////////////////////// - - if (styleEnabled && options.includeEdges && isEdge) { - updateBoundsFromArrow(bounds, ele, 'mid-source', options); - updateBoundsFromArrow(bounds, ele, 'mid-target', options); - updateBoundsFromArrow(bounds, ele, 'source', options); - updateBoundsFromArrow(bounds, ele, 'target', options); - } - - // ghost - //////// - - if (styleEnabled) { - var ghost = ele.pstyle('ghost').value === 'yes'; - - if (ghost) { - var gx = ele.pstyle('ghost-offset-x').pfValue; - var gy = ele.pstyle('ghost-offset-y').pfValue; - - updateBounds(bounds, bounds.x1 + gx, bounds.y1 + gy, bounds.x2 + gx, bounds.y2 + gy); - } - } - - // overlay - ////////// - - if (styleEnabled) { - - ex1 = bounds.x1; - ex2 = bounds.x2; - ey1 = bounds.y1; - ey2 = bounds.y2; - - updateBounds(bounds, ex1 - overlayPadding, ey1 - overlayPadding, ex2 + overlayPadding, ey2 + overlayPadding); - } - - // handle label dimensions - ////////////////////////// - - if (styleEnabled && options.includeLabels) { - updateBoundsFromLabel(bounds, ele, null, options); - - if (isEdge) { - updateBoundsFromLabel(bounds, ele, 'source', options); - updateBoundsFromLabel(bounds, ele, 'target', options); - } - } // style enabled for labels - } // if displayed - - bounds.x1 = noninf(bounds.x1); - bounds.y1 = noninf(bounds.y1); - bounds.x2 = noninf(bounds.x2); - bounds.y2 = noninf(bounds.y2); - bounds.w = noninf(bounds.x2 - bounds.x1); - bounds.h = noninf(bounds.y2 - bounds.y1); - - // expand bounds by 1 because antialiasing can increase the visual/effective size by 1 on all sides - if (bounds.w > 0 && bounds.h > 0 && displayed) { - math.expandBoundingBox(bounds, 1); - } - - return bounds; -}; - -var tf = function tf(val) { - if (val) { - return 't'; - } else { - return 'f'; - } -}; - -var getKey = function getKey(opts) { - var key = ''; - - key += tf(opts.incudeNodes); - key += tf(opts.includeEdges); - key += tf(opts.includeLabels); - key += tf(opts.includeOverlays); - - return key; -}; - -var cachedBoundingBoxImpl = function cachedBoundingBoxImpl(ele, opts) { - var _p = ele._private; - var bb = void 0; - var headless = ele.cy().headless(); - var key = opts === defBbOpts ? defBbOptsKey : getKey(opts); - - if (!opts.useCache || headless || !_p.bbCache || !_p.bbCache[key]) { - bb = boundingBoxImpl(ele, opts); - - if (!headless) { - _p.bbCache = _p.bbCache || {}; - _p.bbCache[key] = bb; - } - } else { - bb = _p.bbCache[key]; - } - - return bb; -}; - -var defBbOpts = { - includeNodes: true, - includeEdges: true, - includeLabels: true, - includeOverlays: true, - useCache: true -}; - -var defBbOptsKey = getKey(defBbOpts); - -function filledBbOpts(options) { - return { - includeNodes: util.default(options.includeNodes, defBbOpts.includeNodes), - includeEdges: util.default(options.includeEdges, defBbOpts.includeEdges), - includeLabels: util.default(options.includeLabels, defBbOpts.includeLabels), - includeOverlays: util.default(options.includeOverlays, defBbOpts.includeOverlays), - useCache: util.default(options.useCache, defBbOpts.useCache) - }; -} - -elesfn.boundingBox = function (options) { - // the main usecase is ele.boundingBox() for a single element with no/def options - // specified s.t. the cache is used, so check for this case to make it faster by - // avoiding the overhead of the rest of the function - if (this.length === 1 && this[0]._private.bbCache && (options === undefined || options.useCache === undefined || options.useCache === true)) { - if (options === undefined) { - options = defBbOpts; - } else { - options = filledBbOpts(options); - } - - return cachedBoundingBoxImpl(this[0], options); - } - - var bounds = { - x1: Infinity, - y1: Infinity, - x2: -Infinity, - y2: -Infinity - }; - - options = options || util.staticEmptyObject(); - - var opts = filledBbOpts(options); - - var eles = this; - var cy = eles.cy(); - var styleEnabled = cy.styleEnabled(); - - if (styleEnabled) { - this.recalculateRenderedStyle(opts.useCache); - } - - this.updateCompoundBounds(); - - var updatedEdge = {}; // use to avoid duplicated edge updates - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - if (styleEnabled && ele.isEdge() && ele.pstyle('curve-style').strValue === 'bezier' && !updatedEdge[ele.id()]) { - var edges = ele.parallelEdges(); - - for (var j = 0; j < edges.length; j++) { - // make all as updated - updatedEdge[edges[j].id()] = true; - } - - edges.recalculateRenderedStyle(opts.useCache); // n.b. ele.parallelEdges() single is cached - } - - updateBoundsFromBox(bounds, cachedBoundingBoxImpl(ele, opts)); - } - - bounds.x1 = noninf(bounds.x1); - bounds.y1 = noninf(bounds.y1); - bounds.x2 = noninf(bounds.x2); - bounds.y2 = noninf(bounds.y2); - bounds.w = noninf(bounds.x2 - bounds.x1); - bounds.h = noninf(bounds.y2 - bounds.y1); - - return bounds; -}; - -// private helper to get bounding box for custom node positions -// - good for perf in certain cases but currently requires dirtying the rendered style -// - would be better to not modify the nodes but the nodes are read directly everywhere in the renderer... -// - try to use for only things like discrete layouts where the node position would change anyway -elesfn.boundingBoxAt = function (fn) { - var nodes = this.nodes(); - - if (is.plainObject(fn)) { - var obj = fn; - - fn = function fn() { - return obj; - }; - } - - // save the current position and set the new one, per node - for (var i = 0; i < nodes.length; i++) { - var n = nodes[i]; - var _p = n._private; - var pos = _p.position; - var newPos = fn.call(n, n, i); - - _p.bbAtOldPos = { x: pos.x, y: pos.y }; - - if (newPos) { - pos.x = newPos.x; - pos.y = newPos.y; - } - } - - this.emit('dirty'); // let the renderer know we've manually dirtied rendered dim calcs - - nodes.dirtyCompoundBoundsCache().updateCompoundBounds(); - - var bb = this.boundingBox({ useCache: false }); - - // restore the original position, per node - for (var _i = 0; _i < nodes.length; _i++) { - var _n = nodes[_i]; - var _p2 = _n._private; - var _pos = _n._private.position; - var old = _p2.bbAtOldPos; - - _pos.x = old.x; - _pos.y = old.y; - } - - nodes.dirtyCompoundBoundsCache(); - - this.emit('dirty'); // let the renderer know we've manually dirtied rendered dim calcs - - return bb; -}; - -fn.boundingbox = fn.boundingBox; -fn.renderedBoundingbox = fn.renderedBoundingBox; - -module.exports = elesfn; - -/***/ }), -/* 60 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var fn = void 0, - elesfn = void 0; - -fn = elesfn = {}; - -var defineDimFns = function defineDimFns(opts) { - opts.uppercaseName = util.capitalize(opts.name); - opts.autoName = 'auto' + opts.uppercaseName; - opts.labelName = 'label' + opts.uppercaseName; - opts.outerName = 'outer' + opts.uppercaseName; - opts.uppercaseOuterName = util.capitalize(opts.outerName); - - fn[opts.name] = function dimImpl() { - var ele = this[0]; - var _p = ele._private; - var cy = _p.cy; - var styleEnabled = cy._private.styleEnabled; - - if (ele) { - if (styleEnabled) { - if (ele.isParent()) { - ele.updateCompoundBounds(); - - return _p[opts.autoName] || 0; - } - - var d = ele.pstyle(opts.name); - - switch (d.strValue) { - case 'label': - ele.recalculateRenderedStyle(); - - return _p.rstyle[opts.labelName] || 0; - - default: - return d.pfValue; - } - } else { - return 1; - } - } - }; - - fn['outer' + opts.uppercaseName] = function outerDimImpl() { - var ele = this[0]; - var _p = ele._private; - var cy = _p.cy; - var styleEnabled = cy._private.styleEnabled; - - if (ele) { - if (styleEnabled) { - var dim = ele[opts.name](); - var border = ele.pstyle('border-width').pfValue; // n.b. 1/2 each side - var padding = 2 * ele.padding(); - - return dim + border + padding; - } else { - return 1; - } - } - }; - - fn['rendered' + opts.uppercaseName] = function renderedDimImpl() { - var ele = this[0]; - - if (ele) { - var d = ele[opts.name](); - return d * this.cy().zoom(); - } - }; - - fn['rendered' + opts.uppercaseOuterName] = function renderedOuterDimImpl() { - var ele = this[0]; - - if (ele) { - var od = ele[opts.outerName](); - return od * this.cy().zoom(); - } - }; -}; - -defineDimFns({ - name: 'width' -}); - -defineDimFns({ - name: 'height' -}); - -elesfn.padding = function () { - var ele = this[0]; - var _p = ele._private; - if (ele.isParent()) { - ele.updateCompoundBounds(); - - if (_p.autoPadding !== undefined) { - return _p.autoPadding; - } else { - return ele.pstyle('padding').pfValue; - } - } else { - return ele.pstyle('padding').pfValue; - } -}; - -module.exports = elesfn; - -/***/ }), -/* 61 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var ifEdge = function ifEdge(self, then) { - if (self.isEdge()) { - return then(self.renderer()); - } -}; - -module.exports = { - controlPoints: function controlPoints() { - var _this = this; - - return ifEdge(this, function (renderer) { - return renderer.getControlPoints(_this); - }); - }, - segmentPoints: function segmentPoints() { - var _this2 = this; - - return ifEdge(this, function (renderer) { - return renderer.getSegmentPoints(_this2); - }); - }, - sourceEndpoint: function sourceEndpoint() { - var _this3 = this; - - return ifEdge(this, function (renderer) { - return renderer.getSourceEndpoint(_this3); - }); - }, - targetEndpoint: function targetEndpoint() { - var _this4 = this; - - return ifEdge(this, function (renderer) { - return renderer.getTargetEndpoint(_this4); - }); - }, - midpoint: function midpoint() { - var _this5 = this; - - return ifEdge(this, function (renderer) { - return renderer.getEdgeMidpoint(_this5); - }); - } -}; - -/***/ }), -/* 62 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Emitter = __webpack_require__(11); -var define = __webpack_require__(4); -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var Selector = __webpack_require__(6); - -var emitterOptions = { - qualifierCompare: function qualifierCompare(selector1, selector2) { - if (selector1 == null || selector2 == null) { - return selector1 == null && selector2 == null; - } else { - return selector1.sameText(selector2); - } - }, - eventMatches: function eventMatches(ele, listener, eventObj) { - var selector = listener.qualifier; - - if (selector != null) { - return ele !== eventObj.target && is.element(eventObj.target) && selector.matches(eventObj.target); - } - - return true; - }, - eventFields: function eventFields(ele) { - return { - cy: ele.cy(), - target: ele - }; - }, - callbackContext: function callbackContext(ele, listener, eventObj) { - return listener.qualifier != null ? eventObj.target : ele; - }, - beforeEmit: function beforeEmit(context, listener /*, eventObj*/) { - if (listener.conf && listener.conf.once) { - listener.conf.onceCollection.removeListener(listener.event, listener.qualifier, listener.callback); - } - }, - bubble: function bubble() { - return true; - }, - parent: function parent(ele) { - return ele.isChild() ? ele.parent() : ele.cy(); - } -}; - -var argSelector = function argSelector(arg) { - if (is.string(arg)) { - return new Selector(arg); - } else { - return arg; - } -}; - -var elesfn = { - createEmitter: function createEmitter() { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var _p = ele._private; - - if (!_p.emitter) { - _p.emitter = new Emitter(util.assign({ - context: ele - }, emitterOptions)); - } - } - - return this; - }, - - emitter: function emitter() { - return this._private.emitter; - }, - - on: function on(events, selector, callback) { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - - ele.emitter().on(events, argSelector(selector), callback); - } - - return this; - }, - - removeListener: function removeListener(events, selector, callback) { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - - ele.emitter().removeListener(events, argSelector(selector), callback); - } - - return this; - }, - - one: function one(events, selector, callback) { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - - ele.emitter().one(events, argSelector(selector), callback); - } - - return this; - }, - - once: function once(events, selector, callback) { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - - ele.emitter().on(events, argSelector(selector), callback, { - once: true, - onceCollection: this - }); - } - }, - - emit: function emit(events, extraParams) { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - - ele.emitter().emit(events, extraParams); - } - - return this; - }, - - emitAndNotify: function emitAndNotify(event, extraParams) { - // for internal use only - if (this.length === 0) { - return; - } // empty collections don't need to notify anything - - // notify renderer - this.cy().notify({ - type: event, - eles: this - }); - - this.emit(event, extraParams); - - return this; - } -}; - -define.eventAliasesOn(elesfn); - -module.exports = elesfn; - -/***/ }), -/* 63 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var Selector = __webpack_require__(6); - -var elesfn = { - nodes: function nodes(selector) { - return this.filter(function (ele) { - return ele.isNode(); - }).filter(selector); - }, - - edges: function edges(selector) { - return this.filter(function (ele) { - return ele.isEdge(); - }).filter(selector); - }, - - filter: function filter(_filter, thisArg) { - if (_filter === undefined) { - // check this first b/c it's the most common/performant case - return this; - } else if (is.string(_filter) || is.elementOrCollection(_filter)) { - return new Selector(_filter).filter(this); - } else if (is.fn(_filter)) { - var filterEles = this.spawn(); - var eles = this; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var include = thisArg ? _filter.apply(thisArg, [ele, i, eles]) : _filter(ele, i, eles); - - if (include) { - filterEles.merge(ele); - } - } - - return filterEles; - } - - return this.spawn(); // if not handled by above, give 'em an empty collection - }, - - not: function not(toRemove) { - if (!toRemove) { - return this; - } else { - - if (is.string(toRemove)) { - toRemove = this.filter(toRemove); - } - - var elements = []; - var rMap = toRemove._private.map; - - for (var i = 0; i < this.length; i++) { - var element = this[i]; - - var remove = rMap.has(element.id()); - if (!remove) { - elements.push(element); - } - } - - return this.spawn(elements); - } - }, - - absoluteComplement: function absoluteComplement() { - var cy = this.cy(); - - return cy.mutableElements().not(this); - }, - - intersect: function intersect(other) { - // if a selector is specified, then filter by it instead - if (is.string(other)) { - var selector = other; - return this.filter(selector); - } - - var elements = []; - var col1 = this; - var col2 = other; - var col1Smaller = this.length < other.length; - var map2 = col1Smaller ? col2._private.map : col1._private.map; - var col = col1Smaller ? col1 : col2; - - for (var i = 0; i < col.length; i++) { - var id = col[i]._private.data.id; - var entry = map2.get(id); - - if (entry) { - elements.push(entry.ele); - } - } - - return this.spawn(elements); - }, - - xor: function xor(other) { - var cy = this._private.cy; - - if (is.string(other)) { - other = cy.$(other); - } - - var elements = []; - var col1 = this; - var col2 = other; - - var add = function add(col, other) { - for (var i = 0; i < col.length; i++) { - var ele = col[i]; - var id = ele._private.data.id; - var inOther = other.hasElementWithId(id); - - if (!inOther) { - elements.push(ele); - } - } - }; - - add(col1, col2); - add(col2, col1); - - return this.spawn(elements); - }, - - diff: function diff(other) { - var cy = this._private.cy; - - if (is.string(other)) { - other = cy.$(other); - } - - var left = []; - var right = []; - var both = []; - var col1 = this; - var col2 = other; - - var add = function add(col, other, retEles) { - - for (var i = 0; i < col.length; i++) { - var ele = col[i]; - var id = ele._private.data.id; - var inOther = other.hasElementWithId(id); - - if (inOther) { - both.push(ele); - } else { - retEles.push(ele); - } - } - }; - - add(col1, col2, left); - add(col2, col1, right); - - return { - left: this.spawn(left, { unique: true }), - right: this.spawn(right, { unique: true }), - both: this.spawn(both, { unique: true }) - }; - }, - - add: function add(toAdd) { - var cy = this._private.cy; - - if (!toAdd) { - return this; - } - - if (is.string(toAdd)) { - var selector = toAdd; - toAdd = cy.mutableElements().filter(selector); - } - - var elements = []; - - for (var i = 0; i < this.length; i++) { - elements.push(this[i]); - } - - var map = this._private.map; - - for (var _i = 0; _i < toAdd.length; _i++) { - - var add = !map.has(toAdd[_i].id()); - if (add) { - elements.push(toAdd[_i]); - } - } - - return this.spawn(elements); - }, - - // in place merge on calling collection - merge: function merge(toAdd) { - var _p = this._private; - var cy = _p.cy; - - if (!toAdd) { - return this; - } - - if (toAdd && is.string(toAdd)) { - var selector = toAdd; - toAdd = cy.mutableElements().filter(selector); - } - - var map = _p.map; - - for (var i = 0; i < toAdd.length; i++) { - var toAddEle = toAdd[i]; - var id = toAddEle._private.data.id; - var add = !map.has(id); - - if (add) { - var index = this.length++; - - this[index] = toAddEle; - - map.set(id, { ele: toAddEle, index: index }); - } else { - // replace - var _index = map.get(id).index; - - this[_index] = toAddEle; - map.set(id, { ele: toAddEle, index: _index }); - } - } - - return this; // chaining - }, - - // remove single ele in place in calling collection - unmergeOne: function unmergeOne(ele) { - ele = ele[0]; - - var _p = this._private; - var id = ele._private.data.id; - var map = _p.map; - var entry = map.get(id); - - if (!entry) { - return this; // no need to remove - } - - var i = entry.index; - - // remove ele - this[i] = undefined; - map.delete(id); - - var unmergedLastEle = i === this.length - 1; - - // replace empty spot with last ele in collection - if (this.length > 1 && !unmergedLastEle) { - var lastEleI = this.length - 1; - var lastEle = this[lastEleI]; - var lastEleId = lastEle._private.data.id; - - this[lastEleI] = undefined; - this[i] = lastEle; - map.set(lastEleId, { ele: lastEle, index: i }); - } - - // the collection is now 1 ele smaller - this.length--; - - return this; - }, - - // remove eles in place on calling collection - unmerge: function unmerge(toRemove) { - var cy = this._private.cy; - - if (!toRemove) { - return this; - } - - if (toRemove && is.string(toRemove)) { - var selector = toRemove; - toRemove = cy.mutableElements().filter(selector); - } - - for (var i = 0; i < toRemove.length; i++) { - this.unmergeOne(toRemove[i]); - } - - return this; // chaining - }, - - map: function map(mapFn, thisArg) { - var arr = []; - var eles = this; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var ret = thisArg ? mapFn.apply(thisArg, [ele, i, eles]) : mapFn(ele, i, eles); - - arr.push(ret); - } - - return arr; - }, - - reduce: function reduce(fn, initialValue) { - var val = initialValue; - var eles = this; - - for (var i = 0; i < eles.length; i++) { - val = fn(val, eles[i], i, eles); - } - - return val; - }, - - max: function max(valFn, thisArg) { - var max = -Infinity; - var maxEle = void 0; - var eles = this; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var val = thisArg ? valFn.apply(thisArg, [ele, i, eles]) : valFn(ele, i, eles); - - if (val > max) { - max = val; - maxEle = ele; - } - } - - return { - value: max, - ele: maxEle - }; - }, - - min: function min(valFn, thisArg) { - var min = Infinity; - var minEle = void 0; - var eles = this; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var val = thisArg ? valFn.apply(thisArg, [ele, i, eles]) : valFn(ele, i, eles); - - if (val < min) { - min = val; - minEle = ele; - } - } - - return { - value: min, - ele: minEle - }; - } -}; - -// aliases -var fn = elesfn; -fn['u'] = fn['|'] = fn['+'] = fn.union = fn.or = fn.add; -fn['\\'] = fn['!'] = fn['-'] = fn.difference = fn.relativeComplement = fn.subtract = fn.not; -fn['n'] = fn['&'] = fn['.'] = fn.and = fn.intersection = fn.intersect; -fn['^'] = fn['(+)'] = fn['(-)'] = fn.symmetricDifference = fn.symdiff = fn.xor; -fn.fnFilter = fn.filterFn = fn.stdFilter = fn.filter; -fn.complement = fn.abscomp = fn.absoluteComplement; - -module.exports = elesfn; - -/***/ }), -/* 64 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var elesfn = { - isNode: function isNode() { - return this.group() === 'nodes'; - }, - - isEdge: function isEdge() { - return this.group() === 'edges'; - }, - - isLoop: function isLoop() { - return this.isEdge() && this.source().id() === this.target().id(); - }, - - isSimple: function isSimple() { - return this.isEdge() && this.source().id() !== this.target().id(); - }, - - group: function group() { - var ele = this[0]; - - if (ele) { - return ele._private.group; - } - } -}; - -module.exports = elesfn; - -/***/ }), -/* 65 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var zIndexSort = __webpack_require__(17); -var util = __webpack_require__(1); - -var elesfn = { - forEach: function forEach(fn, thisArg) { - if (is.fn(fn)) { - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var ret = thisArg ? fn.apply(thisArg, [ele, i, this]) : fn(ele, i, this); - - if (ret === false) { - break; - } // exit each early on return false - } - } - - return this; - }, - - toArray: function toArray() { - var array = []; - - for (var i = 0; i < this.length; i++) { - array.push(this[i]); - } - - return array; - }, - - slice: function slice(start, end) { - var array = []; - var thisSize = this.length; - - if (end == null) { - end = thisSize; - } - - if (start == null) { - start = 0; - } - - if (start < 0) { - start = thisSize + start; - } - - if (end < 0) { - end = thisSize + end; - } - - for (var i = start; i >= 0 && i < end && i < thisSize; i++) { - array.push(this[i]); - } - - return this.spawn(array); - }, - - size: function size() { - return this.length; - }, - - eq: function eq(i) { - return this[i] || this.spawn(); - }, - - first: function first() { - return this[0] || this.spawn(); - }, - - last: function last() { - return this[this.length - 1] || this.spawn(); - }, - - empty: function empty() { - return this.length === 0; - }, - - nonempty: function nonempty() { - return !this.empty(); - }, - - sort: function sort(sortFn) { - if (!is.fn(sortFn)) { - return this; - } - - var sorted = this.toArray().sort(sortFn); - - return this.spawn(sorted); - }, - - sortByZIndex: function sortByZIndex() { - return this.sort(zIndexSort); - }, - - zDepth: function zDepth() { - var ele = this[0]; - if (!ele) { - return undefined; - } - - // let cy = ele.cy(); - var _p = ele._private; - var group = _p.group; - - if (group === 'nodes') { - var depth = _p.data.parent ? ele.parents().size() : 0; - - if (!ele.isParent()) { - return util.MAX_INT - 1; // childless nodes always on top - } - - return depth; - } else { - var src = _p.source; - var tgt = _p.target; - var srcDepth = src.zDepth(); - var tgtDepth = tgt.zDepth(); - - return Math.max(srcDepth, tgtDepth, 0); // depth of deepest parent - } - } -}; - -elesfn.each = elesfn.forEach; - -module.exports = elesfn; - -/***/ }), -/* 66 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var Promise = __webpack_require__(5); -var math = __webpack_require__(2); - -var elesfn = { - // Calculates and returns node dimensions { x, y } based on options given - layoutDimensions: function layoutDimensions(options) { - options = util.assign({ - nodeDimensionsIncludeLabels: true - }, options); - - if (options.nodeDimensionsIncludeLabels) { - var bbDim = this.boundingBox(); - return { - w: bbDim.w, - h: bbDim.h - }; - } else { - return { - w: this.outerWidth(), - h: this.outerHeight() - }; - } - }, - - // using standard layout options, apply position function (w/ or w/o animation) - layoutPositions: function layoutPositions(layout, options, fn) { - var nodes = this.nodes(); - var cy = this.cy(); - var layoutEles = options.eles; // nodes & edges - var getMemoizeKey = function getMemoizeKey(node, i) { - return node.id() + '$' + i; - }; - var fnMem = util.memoize(fn, getMemoizeKey); // memoized version of position function - - layout.emit({ type: 'layoutstart', layout: layout }); - - layout.animations = []; - - var calculateSpacing = function calculateSpacing(spacing, nodesBb, pos) { - var center = { - x: nodesBb.x1 + nodesBb.w / 2, - y: nodesBb.y1 + nodesBb.h / 2 - }; - - var spacingVector = { // scale from center of bounding box (not necessarily 0,0) - x: (pos.x - center.x) * spacing, - y: (pos.y - center.y) * spacing - }; - - return { - x: center.x + spacingVector.x, - y: center.y + spacingVector.y - }; - }; - - var useSpacingFactor = options.spacingFactor && options.spacingFactor !== 1; - - var spacingBb = function spacingBb() { - if (!useSpacingFactor) { - return null; - } - - var bb = math.makeBoundingBox(); - - for (var i = 0; i < nodes.length; i++) { - var node = nodes[i]; - var pos = fnMem(node, i); - - math.expandBoundingBoxByPoint(bb, pos.x, pos.y); - } - - return bb; - }; - - var bb = spacingBb(); - - var getFinalPos = util.memoize(function (node, i) { - var newPos = fnMem(node, i); - var pos = node.position(); - - if (!is.number(pos.x) || !is.number(pos.y)) { - node.silentPosition({ x: 0, y: 0 }); - } - - if (useSpacingFactor) { - var spacing = Math.abs(options.spacingFactor); - - newPos = calculateSpacing(spacing, bb, newPos); - } - - if (options.transform != null) { - newPos = options.transform(node, newPos); - } - - return newPos; - }, getMemoizeKey); - - if (options.animate) { - for (var i = 0; i < nodes.length; i++) { - var node = nodes[i]; - var newPos = getFinalPos(node, i); - var animateNode = options.animateFilter == null || options.animateFilter(node, i); - - if (animateNode) { - var ani = node.animation({ - position: newPos, - duration: options.animationDuration, - easing: options.animationEasing - }); - - layout.animations.push(ani); - - ani.play(); - } else { - node.position(newPos); - } - } - - if (options.fit) { - var fitAni = cy.animation({ - fit: { - boundingBox: layoutEles.boundingBoxAt(getFinalPos), - padding: options.padding - }, - duration: options.animationDuration, - easing: options.animationEasing - }); - - layout.animations.push(fitAni); - - fitAni.play(); - } else if (options.zoom !== undefined && options.pan !== undefined) { - var zoomPanAni = cy.animation({ - zoom: options.zoom, - pan: options.pan, - duration: options.animationDuration, - easing: options.animationEasing - }); - - layout.animations.push(zoomPanAni); - - zoomPanAni.play(); - } - - layout.one('layoutready', options.ready); - layout.emit({ type: 'layoutready', layout: layout }); - - Promise.all(layout.animations.map(function (ani) { - return ani.promise(); - })).then(function () { - layout.one('layoutstop', options.stop); - layout.emit({ type: 'layoutstop', layout: layout }); - }); - } else { - - nodes.positions(getFinalPos); - - if (options.fit) { - cy.fit(options.eles, options.padding); - } - - if (options.zoom != null) { - cy.zoom(options.zoom); - } - - if (options.pan) { - cy.pan(options.pan); - } - - layout.one('layoutready', options.ready); - layout.emit({ type: 'layoutready', layout: layout }); - - layout.one('layoutstop', options.stop); - layout.emit({ type: 'layoutstop', layout: layout }); - } - - return this; // chaining - }, - - layout: function layout(options) { - var cy = this.cy(); - - return cy.makeLayout(util.extend({}, options, { - eles: this - })); - } - -}; - -// aliases: -elesfn.createLayout = elesfn.makeLayout = elesfn.layout; - -module.exports = elesfn; - -/***/ }), -/* 67 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -function styleCache(key, fn, ele) { - var _p = ele._private; - var cache = _p.styleCache = _p.styleCache || {}; - var val; - - if ((val = cache[key]) != null) { - return val; - } else { - val = cache[key] = fn(ele); - - return val; - } -} - -function cacheStyleFunction(key, fn) { - return function cachedStyleFunction(ele) { - return styleCache(key, fn, ele); - }; -} - -function cachePrototypeStyleFunction(key, fn) { - var selfFn = function selfFn(ele) { - return fn.call(ele); - }; - - return function cachedPrototypeStyleFunction() { - var ele = this[0]; - - if (ele) { - return styleCache(key, selfFn, ele); - } - }; -} - -var elesfn = { - - recalculateRenderedStyle: function recalculateRenderedStyle(useCache) { - var cy = this.cy(); - var renderer = cy.renderer(); - var styleEnabled = cy.styleEnabled(); - - if (renderer && styleEnabled) { - renderer.recalculateRenderedStyle(this, useCache); - } - - return this; - }, - - dirtyStyleCache: function dirtyStyleCache() { - var cy = this.cy(); - var dirty = function dirty(ele) { - return ele._private.styleCache = {}; - }; - - if (cy.hasCompoundNodes()) { - var eles = void 0; - - eles = this.spawnSelf().merge(this.descendants()).merge(this.parents()); - - eles.merge(eles.connectedEdges()); - - eles.forEach(dirty); - } else { - this.forEach(function (ele) { - dirty(ele); - - ele.connectedEdges().forEach(dirty); - }); - } - - return this; - }, - - // fully updates (recalculates) the style for the elements - updateStyle: function updateStyle(notifyRenderer) { - var cy = this._private.cy; - - if (!cy.styleEnabled()) { - return this; - } - - if (cy._private.batchingStyle) { - var bEles = cy._private.batchStyleEles; - - bEles.merge(this); - - return this; // chaining and exit early when batching - } - - var hasCompounds = cy.hasCompoundNodes(); - var style = cy.style(); - var updatedEles = this; - - notifyRenderer = notifyRenderer || notifyRenderer === undefined ? true : false; - - if (hasCompounds) { - // then add everything up and down for compound selector checks - updatedEles = this.spawnSelf().merge(this.descendants()).merge(this.parents()); - } - - var changedEles = style.apply(updatedEles); - - changedEles.dirtyStyleCache(); - changedEles.dirtyCompoundBoundsCache(); - - if (notifyRenderer) { - changedEles.emitAndNotify('style'); // let renderer know we changed style - } else { - changedEles.emit('style'); // just fire the event - } - - return this; // chaining - }, - - // just update the mappers in the elements' styles; cheaper than eles.updateStyle() - updateMappers: function updateMappers(notifyRenderer) { - var cy = this._private.cy; - var style = cy.style(); - notifyRenderer = notifyRenderer || notifyRenderer === undefined ? true : false; - - if (!cy.styleEnabled()) { - return this; - } - - var changedEles = style.updateMappers(this); - - changedEles.dirtyStyleCache(); - changedEles.dirtyCompoundBoundsCache(); - - if (notifyRenderer) { - changedEles.emitAndNotify('style'); // let renderer know we changed style - } else { - changedEles.emit('style'); // just fire the event - } - return this; // chaining - }, - - // get the internal parsed style object for the specified property - parsedStyle: function parsedStyle(property) { - var ele = this[0]; - var cy = ele.cy(); - - if (!cy.styleEnabled()) { - return; - } - - if (ele) { - return ele._private.style[property] || cy.style().getDefaultProperty(property); - } - }, - - numericStyle: function numericStyle(property) { - var ele = this[0]; - - if (!ele.cy().styleEnabled()) { - return; - } - - if (ele) { - var pstyle = ele.pstyle(property); - - return pstyle.pfValue !== undefined ? pstyle.pfValue : pstyle.value; - } - }, - - numericStyleUnits: function numericStyleUnits(property) { - var ele = this[0]; - - if (!ele.cy().styleEnabled()) { - return; - } - - if (ele) { - return ele.pstyle(property).units; - } - }, - - // get the specified css property as a rendered value (i.e. on-screen value) - // or get the whole rendered style if no property specified (NB doesn't allow setting) - renderedStyle: function renderedStyle(property) { - var cy = this.cy(); - if (!cy.styleEnabled()) { - return this; - } - - var ele = this[0]; - - if (ele) { - return cy.style().getRenderedStyle(ele, property); - } - }, - - // read the calculated css style of the element or override the style (via a bypass) - style: function style(name, value) { - var cy = this.cy(); - - if (!cy.styleEnabled()) { - return this; - } - - var updateTransitions = false; - var style = cy.style(); - - if (is.plainObject(name)) { - // then extend the bypass - var props = name; - style.applyBypass(this, props, updateTransitions); - - this.dirtyStyleCache(); - this.dirtyCompoundBoundsCache(); - - this.emitAndNotify('style'); // let the renderer know we've updated style - } else if (is.string(name)) { - - if (value === undefined) { - // then get the property from the style - var ele = this[0]; - - if (ele) { - return style.getStylePropertyValue(ele, name); - } else { - // empty collection => can't get any value - return; - } - } else { - // then set the bypass with the property value - style.applyBypass(this, name, value, updateTransitions); - - this.dirtyStyleCache(); - this.dirtyCompoundBoundsCache(); - - this.emitAndNotify('style'); // let the renderer know we've updated style - } - } else if (name === undefined) { - var _ele = this[0]; - - if (_ele) { - return style.getRawStyle(_ele); - } else { - // empty collection => can't get any value - return; - } - } - - return this; // chaining - }, - - removeStyle: function removeStyle(names) { - var cy = this.cy(); - - if (!cy.styleEnabled()) { - return this; - } - - var updateTransitions = false; - var style = cy.style(); - var eles = this; - - if (names === undefined) { - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - style.removeAllBypasses(ele, updateTransitions); - } - } else { - names = names.split(/\s+/); - - for (var _i = 0; _i < eles.length; _i++) { - var _ele2 = eles[_i]; - - style.removeBypasses(_ele2, names, updateTransitions); - } - } - - this.dirtyStyleCache(); - this.dirtyCompoundBoundsCache(); - - this.emitAndNotify('style'); // let the renderer know we've updated style - - return this; // chaining - }, - - show: function show() { - this.css('display', 'element'); - return this; // chaining - }, - - hide: function hide() { - this.css('display', 'none'); - return this; // chaining - }, - - effectiveOpacity: function effectiveOpacity() { - var cy = this.cy(); - if (!cy.styleEnabled()) { - return 1; - } - - var hasCompoundNodes = cy.hasCompoundNodes(); - var ele = this[0]; - - if (ele) { - var _p = ele._private; - var parentOpacity = ele.pstyle('opacity').value; - - if (!hasCompoundNodes) { - return parentOpacity; - } - - var parents = !_p.data.parent ? null : ele.parents(); - - if (parents) { - for (var i = 0; i < parents.length; i++) { - var parent = parents[i]; - var opacity = parent.pstyle('opacity').value; - - parentOpacity = opacity * parentOpacity; - } - } - - return parentOpacity; - } - }, - - transparent: function transparent() { - var cy = this.cy(); - if (!cy.styleEnabled()) { - return false; - } - - var ele = this[0]; - var hasCompoundNodes = ele.cy().hasCompoundNodes(); - - if (ele) { - if (!hasCompoundNodes) { - return ele.pstyle('opacity').value === 0; - } else { - return ele.effectiveOpacity() === 0; - } - } - }, - - backgrounding: function backgrounding() { - var cy = this.cy(); - if (!cy.styleEnabled()) { - return false; - } - - var ele = this[0]; - - return ele._private.backgrounding ? true : false; - } - -}; - -function checkCompound(ele, parentOk) { - var _p = ele._private; - var parents = _p.data.parent ? ele.parents() : null; - - if (parents) { - for (var i = 0; i < parents.length; i++) { - var parent = parents[i]; - - if (!parentOk(parent)) { - return false; - } - } - } - - return true; -} - -function defineDerivedStateFunction(specs) { - var ok = specs.ok; - var edgeOkViaNode = specs.edgeOkViaNode || specs.ok; - var parentOk = specs.parentOk || specs.ok; - - return function () { - var cy = this.cy(); - if (!cy.styleEnabled()) { - return true; - } - - var ele = this[0]; - var hasCompoundNodes = cy.hasCompoundNodes(); - - if (ele) { - var _p = ele._private; - - if (!ok(ele)) { - return false; - } - - if (ele.isNode()) { - return !hasCompoundNodes || checkCompound(ele, parentOk); - } else { - var src = _p.source; - var tgt = _p.target; - - return edgeOkViaNode(src) && (!hasCompoundNodes || checkCompound(src, edgeOkViaNode)) && (src === tgt || edgeOkViaNode(tgt) && (!hasCompoundNodes || checkCompound(tgt, edgeOkViaNode))); - } - } - }; -} - -var eleTakesUpSpace = cacheStyleFunction('eleTakesUpSpace', function (ele) { - return ele.pstyle('display').value === 'element' && ele.width() !== 0 && (ele.isNode() ? ele.height() !== 0 : true); -}); - -elesfn.takesUpSpace = cachePrototypeStyleFunction('takesUpSpace', defineDerivedStateFunction({ - ok: eleTakesUpSpace -})); - -var eleInteractive = cacheStyleFunction('eleInteractive', function (ele) { - return ele.pstyle('events').value === 'yes' && ele.pstyle('visibility').value === 'visible' && eleTakesUpSpace(ele); -}); - -var parentInteractive = cacheStyleFunction('parentInteractive', function (parent) { - return parent.pstyle('visibility').value === 'visible' && eleTakesUpSpace(parent); -}); - -elesfn.interactive = cachePrototypeStyleFunction('interactive', defineDerivedStateFunction({ - ok: eleInteractive, - parentOk: parentInteractive, - edgeOkViaNode: eleTakesUpSpace -})); - -elesfn.noninteractive = function () { - var ele = this[0]; - - if (ele) { - return !ele.interactive(); - } -}; - -var eleVisible = cacheStyleFunction('eleVisible', function (ele) { - return ele.pstyle('visibility').value === 'visible' && ele.pstyle('opacity').pfValue !== 0 && eleTakesUpSpace(ele); -}); - -var edgeVisibleViaNode = eleTakesUpSpace; - -elesfn.visible = cachePrototypeStyleFunction('visible', defineDerivedStateFunction({ - ok: eleVisible, - edgeOkViaNode: edgeVisibleViaNode -})); - -elesfn.hidden = function () { - var ele = this[0]; - - if (ele) { - return !ele.visible(); - } -}; - -elesfn.bypass = elesfn.css = elesfn.style; -elesfn.renderedCss = elesfn.renderedStyle; -elesfn.removeBypass = elesfn.removeCss = elesfn.removeStyle; -elesfn.pstyle = elesfn.parsedStyle; - -module.exports = elesfn; - -/***/ }), -/* 68 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var elesfn = {}; - -function defineSwitchFunction(params) { - return function () { - var args = arguments; - var changedEles = []; - - // e.g. cy.nodes().select( data, handler ) - if (args.length === 2) { - var data = args[0]; - var handler = args[1]; - this.on(params.event, data, handler); - } - - // e.g. cy.nodes().select( handler ) - else if (args.length === 1) { - var _handler = args[0]; - this.on(params.event, _handler); - } - - // e.g. cy.nodes().select() - else if (args.length === 0) { - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var able = !params.ableField || ele._private[params.ableField]; - var changed = ele._private[params.field] != params.value; - - if (params.overrideAble) { - var overrideAble = params.overrideAble(ele); - - if (overrideAble !== undefined) { - able = overrideAble; - - if (!overrideAble) { - return this; - } // to save cycles assume not able for all on override - } - } - - if (able) { - ele._private[params.field] = params.value; - - if (changed) { - changedEles.push(ele); - } - } - } - - var changedColl = this.spawn(changedEles); - changedColl.updateStyle(); // change of state => possible change of style - changedColl.emit(params.event); - } - - return this; - }; -} - -function defineSwitchSet(params) { - elesfn[params.field] = function () { - var ele = this[0]; - - if (ele) { - if (params.overrideField) { - var val = params.overrideField(ele); - - if (val !== undefined) { - return val; - } - } - - return ele._private[params.field]; - } - }; - - elesfn[params.on] = defineSwitchFunction({ - event: params.on, - field: params.field, - ableField: params.ableField, - overrideAble: params.overrideAble, - value: true - }); - - elesfn[params.off] = defineSwitchFunction({ - event: params.off, - field: params.field, - ableField: params.ableField, - overrideAble: params.overrideAble, - value: false - }); -} - -defineSwitchSet({ - field: 'locked', - overrideField: function overrideField(ele) { - return ele.cy().autolock() ? true : undefined; - }, - on: 'lock', - off: 'unlock' -}); - -defineSwitchSet({ - field: 'grabbable', - overrideField: function overrideField(ele) { - return ele.cy().autoungrabify() ? false : undefined; - }, - on: 'grabify', - off: 'ungrabify' -}); - -defineSwitchSet({ - field: 'selected', - ableField: 'selectable', - overrideAble: function overrideAble(ele) { - return ele.cy().autounselectify() ? false : undefined; - }, - on: 'select', - off: 'unselect' -}); - -defineSwitchSet({ - field: 'selectable', - overrideField: function overrideField(ele) { - return ele.cy().autounselectify() ? false : undefined; - }, - on: 'selectify', - off: 'unselectify' -}); - -elesfn.deselect = elesfn.unselect; - -elesfn.grabbed = function () { - var ele = this[0]; - if (ele) { - return ele._private.grabbed; - } -}; - -defineSwitchSet({ - field: 'active', - on: 'activate', - off: 'unactivate' -}); - -elesfn.inactive = function () { - var ele = this[0]; - if (ele) { - return !ele._private.active; - } -}; - -module.exports = elesfn; - -/***/ }), -/* 69 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); - -var elesfn = {}; - -var cache = function cache(fn, name) { - return function traversalCache(arg1, arg2, arg3, arg4) { - var selectorOrEles = arg1; - var eles = this; - var key = void 0; - - if (selectorOrEles == null) { - key = 'null'; - } else if (is.elementOrCollection(selectorOrEles) && selectorOrEles.length === 1) { - key = '#' + selectorOrEles.id(); - } - - if (eles.length === 1 && key) { - var _p = eles[0]._private; - var tch = _p.traversalCache = _p.traversalCache || {}; - var ch = tch[name] = tch[name] || {}; - var cacheHit = ch[key]; - - if (cacheHit) { - return cacheHit; - } else { - return ch[key] = fn.call(eles, arg1, arg2, arg3, arg4); - } - } else { - return fn.call(eles, arg1, arg2, arg3, arg4); - } - }; -}; - -// DAG functions -//////////////// - -var defineDagExtremity = function defineDagExtremity(params) { - return function dagExtremityImpl(selector) { - var eles = this; - var ret = []; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - if (!ele.isNode()) { - continue; - } - - var disqualified = false; - var edges = ele.connectedEdges(); - - for (var j = 0; j < edges.length; j++) { - var edge = edges[j]; - var src = edge.source(); - var tgt = edge.target(); - - if (params.noIncomingEdges && tgt === ele && src !== ele || params.noOutgoingEdges && src === ele && tgt !== ele) { - disqualified = true; - break; - } - } - - if (!disqualified) { - ret.push(ele); - } - } - - return this.spawn(ret, { unique: true }).filter(selector); - }; -}; - -var defineDagOneHop = function defineDagOneHop(params) { - return function (selector) { - var eles = this; - var oEles = []; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - if (!ele.isNode()) { - continue; - } - - var edges = ele.connectedEdges(); - for (var j = 0; j < edges.length; j++) { - var edge = edges[j]; - var src = edge.source(); - var tgt = edge.target(); - - if (params.outgoing && src === ele) { - oEles.push(edge); - oEles.push(tgt); - } else if (params.incoming && tgt === ele) { - oEles.push(edge); - oEles.push(src); - } - } - } - - return this.spawn(oEles, { unique: true }).filter(selector); - }; -}; - -var defineDagAllHops = function defineDagAllHops(params) { - return function (selector) { - var eles = this; - var sEles = []; - var sElesIds = {}; - - for (;;) { - var next = params.outgoing ? eles.outgoers() : eles.incomers(); - - if (next.length === 0) { - break; - } // done if none left - - var newNext = false; - for (var i = 0; i < next.length; i++) { - var n = next[i]; - var nid = n.id(); - - if (!sElesIds[nid]) { - sElesIds[nid] = true; - sEles.push(n); - newNext = true; - } - } - - if (!newNext) { - break; - } // done if touched all outgoers already - - eles = next; - } - - return this.spawn(sEles, { unique: true }).filter(selector); - }; -}; - -elesfn.clearTraversalCache = function () { - for (var i = 0; i < this.length; i++) { - this[i]._private.traversalCache = null; - } -}; - -util.extend(elesfn, { - // get the root nodes in the DAG - roots: defineDagExtremity({ noIncomingEdges: true }), - - // get the leaf nodes in the DAG - leaves: defineDagExtremity({ noOutgoingEdges: true }), - - // normally called children in graph theory - // these nodes =edges=> outgoing nodes - outgoers: cache(defineDagOneHop({ outgoing: true }), 'outgoers'), - - // aka DAG descendants - successors: defineDagAllHops({ outgoing: true }), - - // normally called parents in graph theory - // these nodes <=edges= incoming nodes - incomers: cache(defineDagOneHop({ incoming: true }), 'incomers'), - - // aka DAG ancestors - predecessors: defineDagAllHops({ incoming: true }) -}); - -// Neighbourhood functions -////////////////////////// - -util.extend(elesfn, { - neighborhood: cache(function (selector) { - var elements = []; - var nodes = this.nodes(); - - for (var i = 0; i < nodes.length; i++) { - // for all nodes - var node = nodes[i]; - var connectedEdges = node.connectedEdges(); - - // for each connected edge, add the edge and the other node - for (var j = 0; j < connectedEdges.length; j++) { - var edge = connectedEdges[j]; - var src = edge.source(); - var tgt = edge.target(); - var otherNode = node === src ? tgt : src; - - // need check in case of loop - if (otherNode.length > 0) { - elements.push(otherNode[0]); // add node 1 hop away - } - - // add connected edge - elements.push(edge[0]); - } - } - - return this.spawn(elements, { unique: true }).filter(selector); - }, 'neighborhood'), - - closedNeighborhood: function closedNeighborhood(selector) { - return this.neighborhood().add(this).filter(selector); - }, - - openNeighborhood: function openNeighborhood(selector) { - return this.neighborhood(selector); - } -}); - -// aliases -elesfn.neighbourhood = elesfn.neighborhood; -elesfn.closedNeighbourhood = elesfn.closedNeighborhood; -elesfn.openNeighbourhood = elesfn.openNeighborhood; - -// Edge functions -///////////////// - -util.extend(elesfn, { - source: cache(function sourceImpl(selector) { - var ele = this[0]; - var src = void 0; - - if (ele) { - src = ele._private.source || ele.cy().collection(); - } - - return src && selector ? src.filter(selector) : src; - }, 'source'), - - target: cache(function targetImpl(selector) { - var ele = this[0]; - var tgt = void 0; - - if (ele) { - tgt = ele._private.target || ele.cy().collection(); - } - - return tgt && selector ? tgt.filter(selector) : tgt; - }, 'target'), - - sources: defineSourceFunction({ - attr: 'source' - }), - - targets: defineSourceFunction({ - attr: 'target' - }) -}); - -function defineSourceFunction(params) { - return function sourceImpl(selector) { - var sources = []; - - for (var i = 0; i < this.length; i++) { - var ele = this[i]; - var src = ele._private[params.attr]; - - if (src) { - sources.push(src); - } - } - - return this.spawn(sources, { unique: true }).filter(selector); - }; -} - -util.extend(elesfn, { - edgesWith: cache(defineEdgesWithFunction(), 'edgesWith'), - - edgesTo: cache(defineEdgesWithFunction({ - thisIsSrc: true - }), 'edgesTo') -}); - -function defineEdgesWithFunction(params) { - - return function edgesWithImpl(otherNodes) { - var elements = []; - var cy = this._private.cy; - var p = params || {}; - - // get elements if a selector is specified - if (is.string(otherNodes)) { - otherNodes = cy.$(otherNodes); - } - - for (var h = 0; h < otherNodes.length; h++) { - var edges = otherNodes[h]._private.edges; - - for (var i = 0; i < edges.length; i++) { - var edge = edges[i]; - var edgeData = edge._private.data; - var thisToOther = this.hasElementWithId(edgeData.source) && otherNodes.hasElementWithId(edgeData.target); - var otherToThis = otherNodes.hasElementWithId(edgeData.source) && this.hasElementWithId(edgeData.target); - var edgeConnectsThisAndOther = thisToOther || otherToThis; - - if (!edgeConnectsThisAndOther) { - continue; - } - - if (p.thisIsSrc || p.thisIsTgt) { - if (p.thisIsSrc && !thisToOther) { - continue; - } - - if (p.thisIsTgt && !otherToThis) { - continue; - } - } - - elements.push(edge); - } - } - - return this.spawn(elements, { unique: true }); - }; -} - -util.extend(elesfn, { - connectedEdges: cache(function (selector) { - var retEles = []; - - var eles = this; - for (var i = 0; i < eles.length; i++) { - var node = eles[i]; - if (!node.isNode()) { - continue; - } - - var edges = node._private.edges; - - for (var j = 0; j < edges.length; j++) { - var edge = edges[j]; - retEles.push(edge); - } - } - - return this.spawn(retEles, { unique: true }).filter(selector); - }, 'connectedEdges'), - - connectedNodes: cache(function (selector) { - var retEles = []; - - var eles = this; - for (var i = 0; i < eles.length; i++) { - var edge = eles[i]; - if (!edge.isEdge()) { - continue; - } - - retEles.push(edge.source()[0]); - retEles.push(edge.target()[0]); - } - - return this.spawn(retEles, { unique: true }).filter(selector); - }, 'connectedNodes'), - - parallelEdges: cache(defineParallelEdgesFunction(), 'parallelEdges'), - - codirectedEdges: cache(defineParallelEdgesFunction({ - codirected: true - }), 'codirectedEdges') -}); - -function defineParallelEdgesFunction(params) { - var defaults = { - codirected: false - }; - params = util.extend({}, defaults, params); - - return function parallelEdgesImpl(selector) { - // micro-optimised for renderer - var elements = []; - var edges = this.edges(); - var p = params; - - // look at all the edges in the collection - for (var i = 0; i < edges.length; i++) { - var edge1 = edges[i]; - var edge1_p = edge1._private; - var src1 = edge1_p.source; - var srcid1 = src1._private.data.id; - var tgtid1 = edge1_p.data.target; - var srcEdges1 = src1._private.edges; - - // look at edges connected to the src node of this edge - for (var j = 0; j < srcEdges1.length; j++) { - var edge2 = srcEdges1[j]; - var edge2data = edge2._private.data; - var tgtid2 = edge2data.target; - var srcid2 = edge2data.source; - - var codirected = tgtid2 === tgtid1 && srcid2 === srcid1; - var oppdirected = srcid1 === tgtid2 && tgtid1 === srcid2; - - if (p.codirected && codirected || !p.codirected && (codirected || oppdirected)) { - elements.push(edge2); - } - } - } - - return this.spawn(elements, { unique: true }).filter(selector); - }; -} - -// Misc functions -///////////////// - -util.extend(elesfn, { - components: function components() { - var self = this; - var cy = self.cy(); - var visited = self.spawn(); - var unvisited = self.nodes().spawnSelf(); - var components = []; - - var visitInComponent = function visitInComponent(node, component) { - visited.merge(node); - unvisited.unmerge(node); - component.merge(node); - }; - - if (unvisited.empty()) { - return self.spawn(); - } - - var _loop = function _loop() { - var component = cy.collection(); - components.push(component); - - var root = unvisited[0]; - visitInComponent(root, component); - - self.bfs({ - directed: false, - roots: root, - visit: function visit(v, e, u, i, depth) { - visitInComponent(v, component); - } - }); - }; - - do { - _loop(); - } while (unvisited.length > 0); - - return components.map(function (component) { - var connectedEdges = component.connectedEdges().stdFilter(function (edge) { - return component.anySame(edge.source()) && component.anySame(edge.target()); - }); - - return component.union(connectedEdges); - }); - } -}); - -module.exports = elesfn; - -/***/ }), -/* 70 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var Collection = __webpack_require__(7); -var Element = __webpack_require__(14); - -var corefn = { - add: function add(opts) { - - var elements = void 0; - var cy = this; - - // add the elements - if (is.elementOrCollection(opts)) { - var eles = opts; - - if (eles._private.cy === cy) { - // same instance => just restore - elements = eles.restore(); - } else { - // otherwise, copy from json - var jsons = []; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - jsons.push(ele.json()); - } - - elements = new Collection(cy, jsons); - } - } - - // specify an array of options - else if (is.array(opts)) { - var _jsons = opts; - - elements = new Collection(cy, _jsons); - } - - // specify via opts.nodes and opts.edges - else if (is.plainObject(opts) && (is.array(opts.nodes) || is.array(opts.edges))) { - var elesByGroup = opts; - var _jsons2 = []; - - var grs = ['nodes', 'edges']; - for (var _i = 0, il = grs.length; _i < il; _i++) { - var group = grs[_i]; - var elesArray = elesByGroup[group]; - - if (is.array(elesArray)) { - - for (var j = 0, jl = elesArray.length; j < jl; j++) { - var json = util.extend({ group: group }, elesArray[j]); - - _jsons2.push(json); - } - } - } - - elements = new Collection(cy, _jsons2); - } - - // specify options for one element - else { - var _json = opts; - elements = new Element(cy, _json).collection(); - } - - return elements; - }, - - remove: function remove(collection) { - if (is.elementOrCollection(collection)) { - // already have right ref - } else if (is.string(collection)) { - var selector = collection; - collection = this.$(selector); - } - - return collection.remove(); - } -}; - -module.exports = corefn; - -/***/ }), -/* 71 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var define = __webpack_require__(4); -var util = __webpack_require__(1); -var stepAll = __webpack_require__(72); - -var corefn = { - - // pull in animation functions - animate: define.animate(), - animation: define.animation(), - animated: define.animated(), - clearQueue: define.clearQueue(), - delay: define.delay(), - delayAnimation: define.delayAnimation(), - stop: define.stop(), - - addToAnimationPool: function addToAnimationPool(eles) { - var cy = this; - - if (!cy.styleEnabled()) { - return; - } // save cycles when no style used - - cy._private.aniEles.merge(eles); - }, - - stopAnimationLoop: function stopAnimationLoop() { - this._private.animationsRunning = false; - }, - - startAnimationLoop: function startAnimationLoop() { - var cy = this; - - cy._private.animationsRunning = true; - - if (!cy.styleEnabled()) { - return; - } // save cycles when no style used - - // NB the animation loop will exec in headless environments if style enabled - // and explicit cy.destroy() is necessary to stop the loop - - function headlessStep() { - if (!cy._private.animationsRunning) { - return; - } - - util.requestAnimationFrame(function animationStep(now) { - stepAll(now, cy); - headlessStep(); - }); - } - - var renderer = cy.renderer(); - - if (renderer && renderer.beforeRender) { - // let the renderer schedule animations - renderer.beforeRender(function rendererAnimationStep(willDraw, now) { - stepAll(now, cy); - }, renderer.beforeRenderPriorities.animations); - } else { - // manage the animation loop ourselves - headlessStep(); // first call - } - } - -}; - -module.exports = corefn; - -/***/ }), -/* 72 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var step = __webpack_require__(73); -var startAnimation = __webpack_require__(78); - -function stepAll(now, cy) { - var eles = cy._private.aniEles; - var doneEles = []; - - function stepOne(ele, isCore) { - var _p = ele._private; - var current = _p.animation.current; - var queue = _p.animation.queue; - var ranAnis = false; - - // cancel all animations on display:none ele - if (!isCore && ele.pstyle('display').value === 'none') { - // put all current and queue animations in this tick's current list - // and empty the lists for the element - current = current.splice(0, current.length).concat(queue.splice(0, queue.length)); - - // stop all animations - for (var i = 0; i < current.length; i++) { - current[i].stop(); - } - } - - // if nothing currently animating, get something from the queue - if (current.length === 0) { - var next = queue.shift(); - - if (next) { - current.push(next); - } - } - - var callbacks = function callbacks(_callbacks) { - for (var j = _callbacks.length - 1; j >= 0; j--) { - var cb = _callbacks[j]; - - cb(); - } - - _callbacks.splice(0, _callbacks.length); - }; - - // step and remove if done - for (var _i = current.length - 1; _i >= 0; _i--) { - var ani = current[_i]; - var ani_p = ani._private; - - if (ani_p.stopped) { - current.splice(_i, 1); - - ani_p.hooked = false; - ani_p.playing = false; - ani_p.started = false; - - callbacks(ani_p.frames); - - continue; - } - - if (!ani_p.playing && !ani_p.applying) { - continue; - } - - // an apply() while playing shouldn't do anything - if (ani_p.playing && ani_p.applying) { - ani_p.applying = false; - } - - if (!ani_p.started) { - startAnimation(ele, ani, now, isCore); - } - - step(ele, ani, now, isCore); - - if (ani_p.applying) { - ani_p.applying = false; - } - - callbacks(ani_p.frames); - - if (ani.completed()) { - current.splice(_i, 1); - - ani_p.hooked = false; - ani_p.playing = false; - ani_p.started = false; - - callbacks(ani_p.completes); - } - - ranAnis = true; - } - - if (!isCore && current.length === 0 && queue.length === 0) { - doneEles.push(ele); - } - - return ranAnis; - } // stepElement - - // handle all eles - var ranEleAni = false; - for (var e = 0; e < eles.length; e++) { - var ele = eles[e]; - var handledThisEle = stepOne(ele); - - ranEleAni = ranEleAni || handledThisEle; - } // each element - - var ranCoreAni = stepOne(cy, true); - - // notify renderer - if (ranEleAni || ranCoreAni) { - if (eles.length > 0) { - eles.dirtyCompoundBoundsCache(); - - cy.notify({ - type: 'draw', - eles: eles - }); - } else { - cy.notify({ - type: 'draw' - }); - } - } - - // remove elements from list of currently animating if its queues are empty - eles.unmerge(doneEles); - - cy.emit('step'); -} // stepAll - -module.exports = stepAll; - -/***/ }), -/* 73 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var easings = __webpack_require__(74); -var ease = __webpack_require__(77); -var is = __webpack_require__(0); - -function step(self, ani, now, isCore) { - var isEles = !isCore; - var _p = self._private; - var ani_p = ani._private; - var pEasing = ani_p.easing; - var startTime = ani_p.startTime; - var cy = isCore ? self : self.cy(); - var style = cy.style(); - - if (!ani_p.easingImpl) { - - if (pEasing == null) { - // use default - ani_p.easingImpl = easings['linear']; - } else { - // then define w/ name - var easingVals = void 0; - - if (is.string(pEasing)) { - var easingProp = style.parse('transition-timing-function', pEasing); - - easingVals = easingProp.value; - } else { - // then assume preparsed array - easingVals = pEasing; - } - - var name = void 0, - args = void 0; - - if (is.string(easingVals)) { - name = easingVals; - args = []; - } else { - name = easingVals[1]; - args = easingVals.slice(2).map(function (n) { - return +n; - }); - } - - if (args.length > 0) { - // create with args - if (name === 'spring') { - args.push(ani_p.duration); // need duration to generate spring - } - - ani_p.easingImpl = easings[name].apply(null, args); - } else { - // static impl by name - ani_p.easingImpl = easings[name]; - } - } - } - - var easing = ani_p.easingImpl; - var percent = void 0; - - if (ani_p.duration === 0) { - percent = 1; - } else { - percent = (now - startTime) / ani_p.duration; - } - - if (ani_p.applying) { - percent = ani_p.progress; - } - - if (percent < 0) { - percent = 0; - } else if (percent > 1) { - percent = 1; - } - - if (ani_p.delay == null) { - // then update - - var startPos = ani_p.startPosition; - var endPos = ani_p.position; - - if (endPos && isEles && !self.locked()) { - var pos = self.position(); - - if (valid(startPos.x, endPos.x)) { - pos.x = ease(startPos.x, endPos.x, percent, easing); - } - - if (valid(startPos.y, endPos.y)) { - pos.y = ease(startPos.y, endPos.y, percent, easing); - } - - self.emit('position'); - } - - var startPan = ani_p.startPan; - var endPan = ani_p.pan; - var pan = _p.pan; - var animatingPan = endPan != null && isCore; - if (animatingPan) { - if (valid(startPan.x, endPan.x)) { - pan.x = ease(startPan.x, endPan.x, percent, easing); - } - - if (valid(startPan.y, endPan.y)) { - pan.y = ease(startPan.y, endPan.y, percent, easing); - } - - self.emit('pan'); - } - - var startZoom = ani_p.startZoom; - var endZoom = ani_p.zoom; - var animatingZoom = endZoom != null && isCore; - if (animatingZoom) { - if (valid(startZoom, endZoom)) { - _p.zoom = ease(startZoom, endZoom, percent, easing); - } - - self.emit('zoom'); - } - - if (animatingPan || animatingZoom) { - self.emit('viewport'); - } - - var props = ani_p.style; - if (props && props.length > 0 && isEles) { - for (var i = 0; i < props.length; i++) { - var prop = props[i]; - var _name = prop.name; - var end = prop; - var start = ani_p.startStyle[_name]; - var propSpec = style.properties[start.name]; - var easedVal = ease(start, end, percent, easing, propSpec); - - style.overrideBypass(self, _name, easedVal); - } // for props - - self.emit('style'); - } // if - } - - ani_p.progress = percent; - - return percent; -} - -function valid(start, end) { - if (start == null || end == null) { - return false; - } - - if (is.number(start) && is.number(end)) { - return true; - } else if (start && end) { - return true; - } - - return false; -} - -module.exports = step; - -/***/ }), -/* 74 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var generateCubicBezier = __webpack_require__(75); -var generateSpringRK4 = __webpack_require__(76); - -var cubicBezier = function cubicBezier(t1, p1, t2, p2) { - var bezier = generateCubicBezier(t1, p1, t2, p2); - - return function (start, end, percent) { - return start + (end - start) * bezier(percent); - }; -}; - -var easings = { - 'linear': function linear(start, end, percent) { - return start + (end - start) * percent; - }, - - // default easings - 'ease': cubicBezier(0.25, 0.1, 0.25, 1), - 'ease-in': cubicBezier(0.42, 0, 1, 1), - 'ease-out': cubicBezier(0, 0, 0.58, 1), - 'ease-in-out': cubicBezier(0.42, 0, 0.58, 1), - - // sine - 'ease-in-sine': cubicBezier(0.47, 0, 0.745, 0.715), - 'ease-out-sine': cubicBezier(0.39, 0.575, 0.565, 1), - 'ease-in-out-sine': cubicBezier(0.445, 0.05, 0.55, 0.95), - - // quad - 'ease-in-quad': cubicBezier(0.55, 0.085, 0.68, 0.53), - 'ease-out-quad': cubicBezier(0.25, 0.46, 0.45, 0.94), - 'ease-in-out-quad': cubicBezier(0.455, 0.03, 0.515, 0.955), - - // cubic - 'ease-in-cubic': cubicBezier(0.55, 0.055, 0.675, 0.19), - 'ease-out-cubic': cubicBezier(0.215, 0.61, 0.355, 1), - 'ease-in-out-cubic': cubicBezier(0.645, 0.045, 0.355, 1), - - // quart - 'ease-in-quart': cubicBezier(0.895, 0.03, 0.685, 0.22), - 'ease-out-quart': cubicBezier(0.165, 0.84, 0.44, 1), - 'ease-in-out-quart': cubicBezier(0.77, 0, 0.175, 1), - - // quint - 'ease-in-quint': cubicBezier(0.755, 0.05, 0.855, 0.06), - 'ease-out-quint': cubicBezier(0.23, 1, 0.32, 1), - 'ease-in-out-quint': cubicBezier(0.86, 0, 0.07, 1), - - // expo - 'ease-in-expo': cubicBezier(0.95, 0.05, 0.795, 0.035), - 'ease-out-expo': cubicBezier(0.19, 1, 0.22, 1), - 'ease-in-out-expo': cubicBezier(1, 0, 0, 1), - - // circ - 'ease-in-circ': cubicBezier(0.6, 0.04, 0.98, 0.335), - 'ease-out-circ': cubicBezier(0.075, 0.82, 0.165, 1), - 'ease-in-out-circ': cubicBezier(0.785, 0.135, 0.15, 0.86), - - // user param easings... - - 'spring': function spring(tension, friction, duration) { - if (duration === 0) { - // can't get a spring w/ duration 0 - return easings.linear; // duration 0 => jump to end so impl doesn't matter - } - - var spring = generateSpringRK4(tension, friction, duration); - - return function (start, end, percent) { - return start + (end - start) * spring(percent); - }; - }, - - 'cubic-bezier': cubicBezier -}; - -module.exports = easings; - -/***/ }), -/* 75 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/* global Float32Array */ - -/*! Bezier curve function generator. Copyright Gaetan Renaudeau. MIT License: http://en.wikipedia.org/wiki/MIT_License */ -function generateCubicBezier(mX1, mY1, mX2, mY2) { - var NEWTON_ITERATIONS = 4, - NEWTON_MIN_SLOPE = 0.001, - SUBDIVISION_PRECISION = 0.0000001, - SUBDIVISION_MAX_ITERATIONS = 10, - kSplineTableSize = 11, - kSampleStepSize = 1.0 / (kSplineTableSize - 1.0), - float32ArraySupported = typeof Float32Array !== 'undefined'; - - /* Must contain four arguments. */ - if (arguments.length !== 4) { - return false; - } - - /* Arguments must be numbers. */ - for (var i = 0; i < 4; ++i) { - if (typeof arguments[i] !== "number" || isNaN(arguments[i]) || !isFinite(arguments[i])) { - return false; - } - } - - /* X values must be in the [0, 1] range. */ - mX1 = Math.min(mX1, 1); - mX2 = Math.min(mX2, 1); - mX1 = Math.max(mX1, 0); - mX2 = Math.max(mX2, 0); - - var mSampleValues = float32ArraySupported ? new Float32Array(kSplineTableSize) : new Array(kSplineTableSize); - - function A(aA1, aA2) { - return 1.0 - 3.0 * aA2 + 3.0 * aA1; - } - - function B(aA1, aA2) { - return 3.0 * aA2 - 6.0 * aA1; - } - - function C(aA1) { - return 3.0 * aA1; - } - - function calcBezier(aT, aA1, aA2) { - return ((A(aA1, aA2) * aT + B(aA1, aA2)) * aT + C(aA1)) * aT; - } - - function getSlope(aT, aA1, aA2) { - return 3.0 * A(aA1, aA2) * aT * aT + 2.0 * B(aA1, aA2) * aT + C(aA1); - } - - function newtonRaphsonIterate(aX, aGuessT) { - for (var _i = 0; _i < NEWTON_ITERATIONS; ++_i) { - var currentSlope = getSlope(aGuessT, mX1, mX2); - - if (currentSlope === 0.0) { - return aGuessT; - } - - var currentX = calcBezier(aGuessT, mX1, mX2) - aX; - aGuessT -= currentX / currentSlope; - } - - return aGuessT; - } - - function calcSampleValues() { - for (var _i2 = 0; _i2 < kSplineTableSize; ++_i2) { - mSampleValues[_i2] = calcBezier(_i2 * kSampleStepSize, mX1, mX2); - } - } - - function binarySubdivide(aX, aA, aB) { - var currentX = void 0, - currentT = void 0, - i = 0; - - do { - currentT = aA + (aB - aA) / 2.0; - currentX = calcBezier(currentT, mX1, mX2) - aX; - if (currentX > 0.0) { - aB = currentT; - } else { - aA = currentT; - } - } while (Math.abs(currentX) > SUBDIVISION_PRECISION && ++i < SUBDIVISION_MAX_ITERATIONS); - - return currentT; - } - - function getTForX(aX) { - var intervalStart = 0.0, - currentSample = 1, - lastSample = kSplineTableSize - 1; - - for (; currentSample !== lastSample && mSampleValues[currentSample] <= aX; ++currentSample) { - intervalStart += kSampleStepSize; - } - - --currentSample; - - var dist = (aX - mSampleValues[currentSample]) / (mSampleValues[currentSample + 1] - mSampleValues[currentSample]), - guessForT = intervalStart + dist * kSampleStepSize, - initialSlope = getSlope(guessForT, mX1, mX2); - - if (initialSlope >= NEWTON_MIN_SLOPE) { - return newtonRaphsonIterate(aX, guessForT); - } else if (initialSlope === 0.0) { - return guessForT; - } else { - return binarySubdivide(aX, intervalStart, intervalStart + kSampleStepSize); - } - } - - var _precomputed = false; - - function precompute() { - _precomputed = true; - if (mX1 !== mY1 || mX2 !== mY2) { - calcSampleValues(); - } - } - - var f = function f(aX) { - if (!_precomputed) { - precompute(); - } - if (mX1 === mY1 && mX2 === mY2) { - return aX; - } - if (aX === 0) { - return 0; - } - if (aX === 1) { - return 1; - } - - return calcBezier(getTForX(aX), mY1, mY2); - }; - - f.getControlPoints = function () { - return [{ - x: mX1, - y: mY1 - }, { - x: mX2, - y: mY2 - }]; - }; - - var str = "generateBezier(" + [mX1, mY1, mX2, mY2] + ")"; - f.toString = function () { - return str; - }; - - return f; -} - -module.exports = generateCubicBezier; - -/***/ }), -/* 76 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/*! Runge-Kutta spring physics function generator. Adapted from Framer.js, copyright Koen Bok. MIT License: http://en.wikipedia.org/wiki/MIT_License */ -/* Given a tension, friction, and duration, a simulation at 60FPS will first run without a defined duration in order to calculate the full path. A second pass - then adjusts the time delta -- using the relation between actual time and duration -- to calculate the path for the duration-constrained animation. */ -var generateSpringRK4 = function () { - function springAccelerationForState(state) { - return -state.tension * state.x - state.friction * state.v; - } - - function springEvaluateStateWithDerivative(initialState, dt, derivative) { - var state = { - x: initialState.x + derivative.dx * dt, - v: initialState.v + derivative.dv * dt, - tension: initialState.tension, - friction: initialState.friction - }; - - return { dx: state.v, dv: springAccelerationForState(state) }; - } - - function springIntegrateState(state, dt) { - var a = { - dx: state.v, - dv: springAccelerationForState(state) - }, - b = springEvaluateStateWithDerivative(state, dt * 0.5, a), - c = springEvaluateStateWithDerivative(state, dt * 0.5, b), - d = springEvaluateStateWithDerivative(state, dt, c), - dxdt = 1.0 / 6.0 * (a.dx + 2.0 * (b.dx + c.dx) + d.dx), - dvdt = 1.0 / 6.0 * (a.dv + 2.0 * (b.dv + c.dv) + d.dv); - - state.x = state.x + dxdt * dt; - state.v = state.v + dvdt * dt; - - return state; - } - - return function springRK4Factory(tension, friction, duration) { - - var initState = { - x: -1, - v: 0, - tension: null, - friction: null - }, - path = [0], - time_lapsed = 0, - tolerance = 1 / 10000, - DT = 16 / 1000, - have_duration = void 0, - dt = void 0, - last_state = void 0; - - tension = parseFloat(tension) || 500; - friction = parseFloat(friction) || 20; - duration = duration || null; - - initState.tension = tension; - initState.friction = friction; - - have_duration = duration !== null; - - /* Calculate the actual time it takes for this animation to complete with the provided conditions. */ - if (have_duration) { - /* Run the simulation without a duration. */ - time_lapsed = springRK4Factory(tension, friction); - /* Compute the adjusted time delta. */ - dt = time_lapsed / duration * DT; - } else { - dt = DT; - } - - for (;;) { - /* Next/step function .*/ - last_state = springIntegrateState(last_state || initState, dt); - /* Store the position. */ - path.push(1 + last_state.x); - time_lapsed += 16; - /* If the change threshold is reached, break. */ - if (!(Math.abs(last_state.x) > tolerance && Math.abs(last_state.v) > tolerance)) { - break; - } - } - - /* If duration is not defined, return the actual time required for completing this animation. Otherwise, return a closure that holds the - computed path and returns a snapshot of the position according to a given percentComplete. */ - return !have_duration ? time_lapsed : function (percentComplete) { - return path[percentComplete * (path.length - 1) | 0]; - }; - }; -}(); - -module.exports = generateSpringRK4; - -/***/ }), -/* 77 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -function getEasedValue(type, start, end, percent, easingFn) { - if (percent === 1) { - return end; - } - - var val = easingFn(start, end, percent); - - if (type == null) { - return val; - } - - if (type.roundValue || type.color) { - val = Math.round(val); - } - - if (type.min !== undefined) { - val = Math.max(val, type.min); - } - - if (type.max !== undefined) { - val = Math.min(val, type.max); - } - - return val; -} - -function getValue(prop, spec) { - if (prop.pfValue != null || prop.value != null) { - if (prop.pfValue != null && (spec == null || spec.type.units !== '%')) { - return prop.pfValue; - } else { - return prop.value; - } - } else { - return prop; - } -} - -function ease(startProp, endProp, percent, easingFn, propSpec) { - var type = propSpec != null ? propSpec.type : null; - - if (percent < 0) { - percent = 0; - } else if (percent > 1) { - percent = 1; - } - - var start = getValue(startProp, propSpec); - var end = getValue(endProp, propSpec); - - if (is.number(start) && is.number(end)) { - return getEasedValue(type, start, end, percent, easingFn); - } else if (is.array(start) && is.array(end)) { - var easedArr = []; - - for (var i = 0; i < end.length; i++) { - var si = start[i]; - var ei = end[i]; - - if (si != null && ei != null) { - var val = getEasedValue(type, si, ei, percent, easingFn); - - easedArr.push(val); - } else { - easedArr.push(ei); - } - } - - return easedArr; - } - - return undefined; -} - -module.exports = ease; - -/***/ }), -/* 78 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -function startAnimation(self, ani, now, isCore) { - var isEles = !isCore; - var ele = self; - var ani_p = ani._private; - var cy = isCore ? self : self.cy(); - var style = cy.style(); - - if (isEles) { - var pos = ele.position(); - - ani_p.startPosition = ani_p.startPosition || { - x: pos.x, - y: pos.y - }; - - ani_p.startStyle = ani_p.startStyle || style.getAnimationStartStyle(ele, ani_p.style); - } - - if (isCore) { - var pan = cy._private.pan; - - ani_p.startPan = ani_p.startPan || { - x: pan.x, - y: pan.y - }; - - ani_p.startZoom = ani_p.startZoom != null ? ani_p.startZoom : cy._private.zoom; - } - - ani_p.started = true; - ani_p.startTime = now - ani_p.progress * ani_p.duration; -} - -module.exports = startAnimation; - -/***/ }), -/* 79 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Emitter = __webpack_require__(11); -var define = __webpack_require__(4); -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var Selector = __webpack_require__(6); - -var emitterOptions = { - qualifierCompare: function qualifierCompare(selector1, selector2) { - if (selector1 == null || selector2 == null) { - return selector1 == null && selector2 == null; - } else { - return selector1.sameText(selector2); - } - }, - eventMatches: function eventMatches(cy, listener, eventObj) { - var selector = listener.qualifier; - - if (selector != null) { - return cy !== eventObj.target && is.element(eventObj.target) && selector.matches(eventObj.target); - } - - return true; - }, - eventFields: function eventFields(cy) { - return { - cy: cy, - target: cy - }; - }, - callbackContext: function callbackContext(cy, listener, eventObj) { - return listener.qualifier != null ? eventObj.target : cy; - } -}; - -var argSelector = function argSelector(arg) { - if (is.string(arg)) { - return new Selector(arg); - } else { - return arg; - } -}; - -var elesfn = { - createEmitter: function createEmitter() { - var _p = this._private; - - if (!_p.emitter) { - _p.emitter = new Emitter(util.assign({ - context: this - }, emitterOptions)); - } - - return this; - }, - - emitter: function emitter() { - return this._private.emitter; - }, - - on: function on(events, selector, callback) { - this.emitter().on(events, argSelector(selector), callback); - - return this; - }, - - removeListener: function removeListener(events, selector, callback) { - this.emitter().removeListener(events, argSelector(selector), callback); - - return this; - }, - - one: function one(events, selector, callback) { - this.emitter().one(events, argSelector(selector), callback); - - return this; - }, - - once: function once(events, selector, callback) { - this.emitter().one(events, argSelector(selector), callback); - - return this; - }, - - emit: function emit(events, extraParams) { - this.emitter().emit(events, extraParams); - - return this; - } -}; - -define.eventAliasesOn(elesfn); - -module.exports = elesfn; - -/***/ }), -/* 80 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var corefn = { - - png: function png(options) { - var renderer = this._private.renderer; - options = options || {}; - - return renderer.png(options); - }, - - jpg: function jpg(options) { - var renderer = this._private.renderer; - options = options || {}; - - options.bg = options.bg || '#fff'; - - return renderer.jpg(options); - } - -}; - -corefn.jpeg = corefn.jpg; - -module.exports = corefn; - -/***/ }), -/* 81 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); - -var corefn = { - - layout: function layout(options) { - var cy = this; - - if (options == null) { - util.error('Layout options must be specified to make a layout'); - return; - } - - if (options.name == null) { - util.error('A `name` must be specified to make a layout'); - return; - } - - var name = options.name; - var Layout = cy.extension('layout', name); - - if (Layout == null) { - util.error('Can not apply layout: No such layout `' + name + '` found; did you include its JS file?'); - return; - } - - var eles = void 0; - if (is.string(options.eles)) { - eles = cy.$(options.eles); - } else { - eles = options.eles != null ? options.eles : cy.$(); - } - - var layout = new Layout(util.extend({}, options, { - cy: cy, - eles: eles - })); - - return layout; - } - -}; - -corefn.createLayout = corefn.makeLayout = corefn.layout; - -module.exports = corefn; - -/***/ }), -/* 82 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var corefn = { - notify: function notify(params) { - var _p = this._private; - - if (_p.batchingNotify) { - var bEles = _p.batchNotifyEles; - var bTypes = _p.batchNotifyTypes; - - if (params.eles) { - bEles.merge(params.eles); - } - - if (!bTypes.ids[params.type]) { - bTypes.push(params.type); - bTypes.ids[params.type] = true; - } - - return; // notifications are disabled during batching - } - - if (!_p.notificationsEnabled) { - return; - } // exit on disabled - - var renderer = this.renderer(); - - // exit if destroy() called on core or renderer in between frames #1499 #1528 - if (this.isDestroyed() || !renderer) { - return; - } - - renderer.notify(params); - }, - - notifications: function notifications(bool) { - var p = this._private; - - if (bool === undefined) { - return p.notificationsEnabled; - } else { - p.notificationsEnabled = bool ? true : false; - } - }, - - noNotifications: function noNotifications(callback) { - this.notifications(false); - callback(); - this.notifications(true); - }, - - batching: function batching() { - return this._private.batchCount > 0; - }, - - startBatch: function startBatch() { - var _p = this._private; - - if (_p.batchCount == null) { - _p.batchCount = 0; - } - - if (_p.batchCount === 0) { - _p.batchingStyle = _p.batchingNotify = true; - _p.batchStyleEles = this.collection(); - _p.batchNotifyEles = this.collection(); - _p.batchNotifyTypes = []; - _p.batchNotifyTypes.ids = {}; - } - - _p.batchCount++; - - return this; - }, - - endBatch: function endBatch() { - var _p = this._private; - - _p.batchCount--; - - if (_p.batchCount === 0) { - // update style for dirty eles - _p.batchingStyle = false; - _p.batchStyleEles.updateStyle(); - - // notify the renderer of queued eles and event types - _p.batchingNotify = false; - this.notify({ - type: _p.batchNotifyTypes, - eles: _p.batchNotifyEles - }); - } - - return this; - }, - - batch: function batch(callback) { - this.startBatch(); - callback(); - this.endBatch(); - - return this; - }, - - // for backwards compatibility - batchData: function batchData(map) { - var cy = this; - - return this.batch(function () { - var ids = Object.keys(map); - - for (var i = 0; i < ids.length; i++) { - var id = ids[i]; - var data = map[id]; - var ele = cy.getElementById(id); - - ele.data(data); - } - }); - } -}; - -module.exports = corefn; - -/***/ }), -/* 83 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var corefn = { - - renderTo: function renderTo(context, zoom, pan, pxRatio) { - var r = this._private.renderer; - - r.renderTo(context, zoom, pan, pxRatio); - return this; - }, - - renderer: function renderer() { - return this._private.renderer; - }, - - forceRender: function forceRender() { - this.notify({ - type: 'draw' - }); - - return this; - }, - - resize: function resize() { - this.invalidateSize(); - - this.notify({ - type: 'resize' - }); - - this.emit('resize'); - - return this; - }, - - initRenderer: function initRenderer(options) { - var cy = this; - - var RendererProto = cy.extension('renderer', options.name); - if (RendererProto == null) { - util.error('Can not initialise: No such renderer `%s` found; did you include its JS file?', options.name); - return; - } - - cy._private.renderer = new RendererProto(util.extend({}, options, { cy: cy })); - - this.notify({ type: 'init' }); - }, - - destroyRenderer: function destroyRenderer() { - var cy = this; - - cy.notify({ type: 'destroy' }); // destroy the renderer - - var domEle = cy.container(); - if (domEle) { - domEle._cyreg = null; - - while (domEle.childNodes.length > 0) { - domEle.removeChild(domEle.childNodes[0]); - } - } - - cy._private.renderer = null; // to be extra safe, remove the ref - }, - - onRender: function onRender(fn) { - return this.on('render', fn); - }, - - offRender: function offRender(fn) { - return this.off('render', fn); - } - -}; - -corefn.invalidateDimensions = corefn.resize; - -module.exports = corefn; - -/***/ }), -/* 84 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var Collection = __webpack_require__(7); - -var corefn = { - - // get a collection - // - empty collection on no args - // - collection of elements in the graph on selector arg - // - guarantee a returned collection when elements or collection specified - collection: function collection(eles, opts) { - - if (is.string(eles)) { - return this.$(eles); - } else if (is.elementOrCollection(eles)) { - return eles.collection(); - } else if (is.array(eles)) { - return new Collection(this, eles, opts); - } - - return new Collection(this); - }, - - nodes: function nodes(selector) { - var nodes = this.$(function (ele) { - return ele.isNode(); - }); - - if (selector) { - return nodes.filter(selector); - } - - return nodes; - }, - - edges: function edges(selector) { - var edges = this.$(function (ele) { - return ele.isEdge(); - }); - - if (selector) { - return edges.filter(selector); - } - - return edges; - }, - - // search the graph like jQuery - $: function $(selector) { - var eles = this._private.elements; - - if (selector) { - return eles.filter(selector); - } else { - return eles.spawnSelf(); - } - }, - - mutableElements: function mutableElements() { - return this._private.elements; - } - -}; - -// aliases -corefn.elements = corefn.filter = corefn.$; - -module.exports = corefn; - -/***/ }), -/* 85 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var Style = __webpack_require__(18); - -var corefn = { - - style: function style(newStyle) { - if (newStyle) { - var s = this.setStyle(newStyle); - - s.update(); - } - - return this._private.style; - }, - - setStyle: function setStyle(style) { - var _p = this._private; - - if (is.stylesheet(style)) { - _p.style = style.generateStyle(this); - } else if (is.array(style)) { - _p.style = Style.fromJson(this, style); - } else if (is.string(style)) { - _p.style = Style.fromString(this, style); - } else { - _p.style = Style(this); - } - - return _p.style; - } -}; - -module.exports = corefn; - -/***/ }), -/* 86 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); -var Promise = __webpack_require__(5); - -var styfn = {}; - -// (potentially expensive calculation) -// apply the style to the element based on -// - its bypass -// - what selectors match it -styfn.apply = function (eles) { - var self = this; - var _p = self._private; - var cy = _p.cy; - var updatedEles = cy.collection(); - - if (_p.newStyle) { - // clear style caches - _p.contextStyles = {}; - _p.propDiffs = {}; - - self.cleanElements(eles, true); - } - - for (var ie = 0; ie < eles.length; ie++) { - var ele = eles[ie]; - - var cxtMeta = self.getContextMeta(ele); - - if (cxtMeta.empty) { - continue; - } else { - updatedEles.merge(ele); - } - - var cxtStyle = self.getContextStyle(cxtMeta); - var app = self.applyContextStyle(cxtMeta, cxtStyle, ele); - - if (!_p.newStyle) { - self.updateTransitions(ele, app.diffProps); - } - - self.updateStyleHints(ele); - } // for elements - - _p.newStyle = false; - - return updatedEles; -}; - -styfn.getPropertiesDiff = function (oldCxtKey, newCxtKey) { - var self = this; - var cache = self._private.propDiffs = self._private.propDiffs || {}; - var dualCxtKey = oldCxtKey + '-' + newCxtKey; - var cachedVal = cache[dualCxtKey]; - - if (cachedVal) { - return cachedVal; - } - - var diffProps = []; - var addedProp = {}; - - for (var i = 0; i < self.length; i++) { - var cxt = self[i]; - var oldHasCxt = oldCxtKey[i] === 't'; - var newHasCxt = newCxtKey[i] === 't'; - var cxtHasDiffed = oldHasCxt !== newHasCxt; - var cxtHasMappedProps = cxt.mappedProperties.length > 0; - - if (cxtHasDiffed || cxtHasMappedProps) { - var props = void 0; - - if (cxtHasDiffed && cxtHasMappedProps) { - props = cxt.properties; // suffices b/c mappedProperties is a subset of properties - } else if (cxtHasDiffed) { - props = cxt.properties; // need to check them all - } else if (cxtHasMappedProps) { - props = cxt.mappedProperties; // only need to check mapped - } - - for (var j = 0; j < props.length; j++) { - var prop = props[j]; - var name = prop.name; - - // if a later context overrides this property, then the fact that this context has switched/diffed doesn't matter - // (semi expensive check since it makes this function O(n^2) on context length, but worth it since overall result - // is cached) - var laterCxtOverrides = false; - for (var k = i + 1; k < self.length; k++) { - var laterCxt = self[k]; - var hasLaterCxt = newCxtKey[k] === 't'; - - if (!hasLaterCxt) { - continue; - } // can't override unless the context is active - - laterCxtOverrides = laterCxt.properties[prop.name] != null; - - if (laterCxtOverrides) { - break; - } // exit early as long as one later context overrides - } - - if (!addedProp[name] && !laterCxtOverrides) { - addedProp[name] = true; - diffProps.push(name); - } - } // for props - } // if - } // for contexts - - cache[dualCxtKey] = diffProps; - return diffProps; -}; - -styfn.getContextMeta = function (ele) { - var self = this; - var cxtKey = ''; - var diffProps = void 0; - var prevKey = ele._private.styleCxtKey || ''; - - if (self._private.newStyle) { - prevKey = ''; // since we need to apply all style if a fresh stylesheet - } - - // get the cxt key - for (var i = 0; i < self.length; i++) { - var context = self[i]; - var contextSelectorMatches = context.selector && context.selector.matches(ele); // NB: context.selector may be null for 'core' - - if (contextSelectorMatches) { - cxtKey += 't'; - } else { - cxtKey += 'f'; - } - } // for context - - diffProps = self.getPropertiesDiff(prevKey, cxtKey); - - ele._private.styleCxtKey = cxtKey; - - return { - key: cxtKey, - diffPropNames: diffProps, - empty: diffProps.length === 0 - }; -}; - -// gets a computed ele style object based on matched contexts -styfn.getContextStyle = function (cxtMeta) { - var cxtKey = cxtMeta.key; - var self = this; - var cxtStyles = this._private.contextStyles = this._private.contextStyles || {}; - - // if already computed style, returned cached copy - if (cxtStyles[cxtKey]) { - return cxtStyles[cxtKey]; - } - - var style = { - _private: { - key: cxtKey - } - }; - - for (var i = 0; i < self.length; i++) { - var cxt = self[i]; - var hasCxt = cxtKey[i] === 't'; - - if (!hasCxt) { - continue; - } - - for (var j = 0; j < cxt.properties.length; j++) { - var prop = cxt.properties[j]; - - style[prop.name] = prop; - } - } - - cxtStyles[cxtKey] = style; - return style; -}; - -styfn.applyContextStyle = function (cxtMeta, cxtStyle, ele) { - var self = this; - var diffProps = cxtMeta.diffPropNames; - var retDiffProps = {}; - - for (var i = 0; i < diffProps.length; i++) { - var diffPropName = diffProps[i]; - var cxtProp = cxtStyle[diffPropName]; - var eleProp = ele.pstyle(diffPropName); - - if (!cxtProp) { - // no context prop means delete - if (!eleProp) { - continue; // no existing prop means nothing needs to be removed - // nb affects initial application on mapped values like control-point-distances - } else if (eleProp.bypass) { - cxtProp = { name: diffPropName, deleteBypassed: true }; - } else { - cxtProp = { name: diffPropName, delete: true }; - } - } - - // save cycles when the context prop doesn't need to be applied - if (eleProp === cxtProp) { - continue; - } - - var retDiffProp = retDiffProps[diffPropName] = { - prev: eleProp - }; - - self.applyParsedProperty(ele, cxtProp); - - retDiffProp.next = ele.pstyle(diffPropName); - - if (retDiffProp.next && retDiffProp.next.bypass) { - retDiffProp.next = retDiffProp.next.bypassed; - } - } - - return { - diffProps: retDiffProps - }; -}; - -styfn.updateStyleHints = function (ele) { - var _p = ele._private; - var self = this; - - if (ele.removed()) { - return; - } - - // set whether has pie or not; for greater efficiency - var hasPie = false; - if (_p.group === 'nodes') { - for (var i = 1; i <= self.pieBackgroundN; i++) { - // 1..N - var _size = ele.pstyle('pie-' + i + '-background-size').value; - - if (_size > 0) { - hasPie = true; - break; - } - } - } - - _p.hasPie = hasPie; - - var transform = ele.pstyle('text-transform').strValue; - var content = ele.pstyle('label').strValue; - var srcContent = ele.pstyle('source-label').strValue; - var tgtContent = ele.pstyle('target-label').strValue; - var fStyle = ele.pstyle('font-style').strValue; - var size = ele.pstyle('font-size').pfValue + 'px'; - var family = ele.pstyle('font-family').strValue; - // let letiant = style['font-letiant'].strValue; - var weight = ele.pstyle('font-weight').strValue; - var valign = ele.pstyle('text-valign').strValue; - var halign = ele.pstyle('text-valign').strValue; - var oWidth = ele.pstyle('text-outline-width').pfValue; - var wrap = ele.pstyle('text-wrap').strValue; - var wrapW = ele.pstyle('text-max-width').pfValue; - var labelStyleKey = fStyle + '$' + size + '$' + family + '$' + weight + '$' + transform + '$' + valign + '$' + halign + '$' + oWidth + '$' + wrap + '$' + wrapW; - _p.labelStyleKey = labelStyleKey; - _p.sourceLabelKey = labelStyleKey + '$' + srcContent; - _p.targetLabelKey = labelStyleKey + '$' + tgtContent; - _p.labelKey = labelStyleKey + '$' + content; - _p.fontKey = fStyle + '$' + weight + '$' + size + '$' + family; - - _p.styleKey = Date.now(); -}; - -// apply a property to the style (for internal use) -// returns whether application was successful -// -// now, this function flattens the property, and here's how: -// -// for parsedProp:{ bypass: true, deleteBypass: true } -// no property is generated, instead the bypass property in the -// element's style is replaced by what's pointed to by the `bypassed` -// field in the bypass property (i.e. restoring the property the -// bypass was overriding) -// -// for parsedProp:{ mapped: truthy } -// the generated flattenedProp:{ mapping: prop } -// -// for parsedProp:{ bypass: true } -// the generated flattenedProp:{ bypassed: parsedProp } -styfn.applyParsedProperty = function (ele, parsedProp) { - var self = this; - var prop = parsedProp; - var style = ele._private.style; - var fieldVal = void 0, - flatProp = void 0; - var types = self.types; - var type = self.properties[prop.name].type; - var propIsBypass = prop.bypass; - var origProp = style[prop.name]; - var origPropIsBypass = origProp && origProp.bypass; - var _p = ele._private; - var flatPropMapping = 'mapping'; - - var checkZOrder = function checkZOrder() { - self.checkZOrderTrigger(ele, prop.name, origProp ? origProp.value : null, prop.value); - }; - - // edges connected to compound nodes can not be haystacks - if (parsedProp.name === 'curve-style' && parsedProp.value === 'haystack' && ele.isEdge() && (ele.isLoop() || ele.source().isParent() || ele.target().isParent())) { - prop = parsedProp = this.parse(parsedProp.name, 'bezier', propIsBypass); - } - - if (prop.delete) { - // delete the property and use the default value on falsey value - style[prop.name] = undefined; - - checkZOrder(); - - return true; - } - - if (prop.deleteBypassed) { - // delete the property that the - if (!origProp) { - checkZOrder(); - - return true; // can't delete if no prop - } else if (origProp.bypass) { - // delete bypassed - origProp.bypassed = undefined; - - checkZOrder(); - - return true; - } else { - return false; // we're unsuccessful deleting the bypassed - } - } - - // check if we need to delete the current bypass - if (prop.deleteBypass) { - // then this property is just here to indicate we need to delete - if (!origProp) { - checkZOrder(); - - return true; // property is already not defined - } else if (origProp.bypass) { - // then replace the bypass property with the original - // because the bypassed property was already applied (and therefore parsed), we can just replace it (no reapplying necessary) - style[prop.name] = origProp.bypassed; - - checkZOrder(); - - return true; - } else { - return false; // we're unsuccessful deleting the bypass - } - } - - var printMappingErr = function printMappingErr() { - util.error('Do not assign mappings to elements without corresponding data (e.g. ele `' + ele.id() + '` for property `' + prop.name + '` with data field `' + prop.field + '`); try a `[' + prop.field + ']` selector to limit scope to elements with `' + prop.field + '` defined'); - }; - - // put the property in the style objects - switch (prop.mapped) {// flatten the property if mapped - case types.mapData: - { - // flatten the field (e.g. data.foo.bar) - var fields = prop.field.split('.'); - var _fieldVal = _p.data; - - for (var i = 0; i < fields.length && _fieldVal; i++) { - var field = fields[i]; - _fieldVal = _fieldVal[field]; - } - - var percent = void 0; - if (!is.number(_fieldVal)) { - // then keep the mapping but assume 0% for now - percent = 0; - } else { - percent = (_fieldVal - prop.fieldMin) / (prop.fieldMax - prop.fieldMin); - } - - // make sure to bound percent value - if (percent < 0) { - percent = 0; - } else if (percent > 1) { - percent = 1; - } - - if (type.color) { - var r1 = prop.valueMin[0]; - var r2 = prop.valueMax[0]; - var g1 = prop.valueMin[1]; - var g2 = prop.valueMax[1]; - var b1 = prop.valueMin[2]; - var b2 = prop.valueMax[2]; - var a1 = prop.valueMin[3] == null ? 1 : prop.valueMin[3]; - var a2 = prop.valueMax[3] == null ? 1 : prop.valueMax[3]; - - var clr = [Math.round(r1 + (r2 - r1) * percent), Math.round(g1 + (g2 - g1) * percent), Math.round(b1 + (b2 - b1) * percent), Math.round(a1 + (a2 - a1) * percent)]; - - flatProp = { // colours are simple, so just create the flat property instead of expensive string parsing - bypass: prop.bypass, // we're a bypass if the mapping property is a bypass - name: prop.name, - value: clr, - strValue: 'rgb(' + clr[0] + ', ' + clr[1] + ', ' + clr[2] + ')' - }; - } else if (type.number) { - var calcValue = prop.valueMin + (prop.valueMax - prop.valueMin) * percent; - flatProp = this.parse(prop.name, calcValue, prop.bypass, flatPropMapping); - } else { - return false; // can only map to colours and numbers - } - - if (!flatProp) { - // if we can't flatten the property, then use the origProp so we still keep the mapping itself - flatProp = this.parse(prop.name, origProp.strValue, prop.bypass, flatPropMapping); - } - - if (!flatProp) { - printMappingErr(); - } - flatProp.mapping = prop; // keep a reference to the mapping - prop = flatProp; // the flattened (mapped) property is the one we want - - break; - } - - // direct mapping - case types.data: - { - // flatten the field (e.g. data.foo.bar) - var _fields = prop.field.split('.'); - var _fieldVal2 = _p.data; - - if (_fieldVal2) { - for (var _i = 0; _i < _fields.length; _i++) { - var _field = _fields[_i]; - _fieldVal2 = _fieldVal2[_field]; - } - } - - flatProp = this.parse(prop.name, _fieldVal2, prop.bypass, flatPropMapping); - - if (!flatProp) { - // if we can't flatten the property, then use the origProp so we still keep the mapping itself - var flatPropVal = origProp ? origProp.strValue : ''; - - flatProp = this.parse(prop.name, flatPropVal, prop.bypass, flatPropMapping); - } - - if (!flatProp) { - printMappingErr(); - } - flatProp.mapping = prop; // keep a reference to the mapping - prop = flatProp; // the flattened (mapped) property is the one we want - - break; - } - - case types.fn: - { - var fn = prop.value; - var fnRetVal = fn(ele); - - flatProp = this.parse(prop.name, fnRetVal, prop.bypass, flatPropMapping); - flatProp.mapping = prop; // keep a reference to the mapping - prop = flatProp; // the flattened (mapped) property is the one we want - - break; - } - - case undefined: - break; // just set the property - - default: - return false; // not a valid mapping - } - - // if the property is a bypass property, then link the resultant property to the original one - if (propIsBypass) { - if (origPropIsBypass) { - // then this bypass overrides the existing one - prop.bypassed = origProp.bypassed; // steal bypassed prop from old bypass - } else { - // then link the orig prop to the new bypass - prop.bypassed = origProp; - } - - style[prop.name] = prop; // and set - } else { - // prop is not bypass - if (origPropIsBypass) { - // then keep the orig prop (since it's a bypass) and link to the new prop - origProp.bypassed = prop; - } else { - // then just replace the old prop with the new one - style[prop.name] = prop; - } - } - - checkZOrder(); - - return true; -}; - -styfn.cleanElements = function (eles, keepBypasses) { - var self = this; - var props = self.properties; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - if (!keepBypasses) { - ele._private.style = {}; - } else { - var style = ele._private.style; - - for (var j = 0; j < props.length; j++) { - var prop = props[j]; - var eleProp = style[prop.name]; - - if (eleProp) { - if (eleProp.bypass) { - eleProp.bypassed = null; - } else { - style[prop.name] = null; - } - } - } - } - } -}; - -// updates the visual style for all elements (useful for manual style modification after init) -styfn.update = function () { - var cy = this._private.cy; - var eles = cy.mutableElements(); - - eles.updateStyle(); -}; - -// just update the functional properties (i.e. mappings) in the elements' -// styles (less expensive than recalculation) -styfn.updateMappers = function (eles) { - var self = this; - var cy = this._private.cy; - var updatedEles = cy.collection(); - - for (var i = 0; i < eles.length; i++) { - // for each ele - var ele = eles[i]; - var style = ele._private.style; - var updatedEle = false; - - for (var j = 0; j < self.properties.length; j++) { - // for each prop - var prop = self.properties[j]; - var propInStyle = style[prop.name]; - - if (propInStyle && propInStyle.mapping) { - var mapping = propInStyle.mapping; - - this.applyParsedProperty(ele, mapping); // reapply the mapping property - - updatedEle = true; - } - } - - if (updatedEle) { - this.updateStyleHints(ele); - - updatedEles.merge(ele); - } - } - - return updatedEles; -}; - -// diffProps : { name => { prev, next } } -styfn.updateTransitions = function (ele, diffProps, isBypass) { - var self = this; - var _p = ele._private; - var props = ele.pstyle('transition-property').value; - var duration = ele.pstyle('transition-duration').pfValue; - var delay = ele.pstyle('transition-delay').pfValue; - - if (props.length > 0 && duration > 0) { - - var style = {}; - - // build up the style to animate towards - var anyPrev = false; - for (var i = 0; i < props.length; i++) { - var prop = props[i]; - var styProp = ele.pstyle(prop); - var diffProp = diffProps[prop]; - - if (!diffProp) { - continue; - } - - var prevProp = diffProp.prev; - var fromProp = prevProp; - var toProp = diffProp.next != null ? diffProp.next : styProp; - var diff = false; - var initVal = void 0; - var initDt = 0.000001; // delta time % value for initVal (allows animating out of init zero opacity) - - if (!fromProp) { - continue; - } - - // consider px values - if (is.number(fromProp.pfValue) && is.number(toProp.pfValue)) { - diff = toProp.pfValue - fromProp.pfValue; // nonzero is truthy - initVal = fromProp.pfValue + initDt * diff; - - // consider numerical values - } else if (is.number(fromProp.value) && is.number(toProp.value)) { - diff = toProp.value - fromProp.value; // nonzero is truthy - initVal = fromProp.value + initDt * diff; - - // consider colour values - } else if (is.array(fromProp.value) && is.array(toProp.value)) { - diff = fromProp.value[0] !== toProp.value[0] || fromProp.value[1] !== toProp.value[1] || fromProp.value[2] !== toProp.value[2]; - - initVal = fromProp.strValue; - } - - // the previous value is good for an animation only if it's different - if (diff) { - style[prop] = toProp.strValue; // to val - this.applyBypass(ele, prop, initVal); // from val - anyPrev = true; - } - } // end if props allow ani - - // can't transition if there's nothing previous to transition from - if (!anyPrev) { - return; - } - - _p.transitioning = true; - - new Promise(function (resolve) { - if (delay > 0) { - ele.delayAnimation(delay).play().promise().then(resolve); - } else { - resolve(); - } - }).then(function () { - return ele.animation({ - style: style, - duration: duration, - easing: ele.pstyle('transition-timing-function').value, - queue: false - }).play().promise(); - }).then(function () { - // if( !isBypass ){ - self.removeBypasses(ele, props); - ele.emitAndNotify('style'); - // } - - _p.transitioning = false; - }); - } else if (_p.transitioning) { - this.removeBypasses(ele, props); - ele.emitAndNotify('style'); - - _p.transitioning = false; - } -}; - -styfn.checkZOrderTrigger = function (ele, name, fromValue, toValue) { - var prop = this.properties[name]; - - if (prop.triggersZOrder != null && (fromValue == null || prop.triggersZOrder(fromValue, toValue))) { - this._private.cy.notify({ - type: 'zorder', - eles: ele - }); - } -}; - -module.exports = styfn; - -/***/ }), -/* 87 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); - -var styfn = {}; - -// bypasses are applied to an existing style on an element, and just tacked on temporarily -// returns true iff application was successful for at least 1 specified property -styfn.applyBypass = function (eles, name, value, updateTransitions) { - var self = this; - var props = []; - var isBypass = true; - - // put all the properties (can specify one or many) in an array after parsing them - if (name === '*' || name === '**') { - // apply to all property names - - if (value !== undefined) { - for (var i = 0; i < self.properties.length; i++) { - var prop = self.properties[i]; - var _name = prop.name; - - var parsedProp = this.parse(_name, value, true); - - if (parsedProp) { - props.push(parsedProp); - } - } - } - } else if (is.string(name)) { - // then parse the single property - var _parsedProp = this.parse(name, value, true); - - if (_parsedProp) { - props.push(_parsedProp); - } - } else if (is.plainObject(name)) { - // then parse each property - var specifiedProps = name; - updateTransitions = value; - - var names = Object.keys(specifiedProps); - - for (var _i = 0; _i < names.length; _i++) { - var _name2 = names[_i]; - var _prop = self.properties[_name2]; - var _value = specifiedProps[_name2]; - - if (_value === undefined) { - // try camel case name too - _value = specifiedProps[util.dash2camel(_name2)]; - } - - if (_value !== undefined) { - var _parsedProp2 = this.parse(_name2, _value, true); - - if (_parsedProp2) { - props.push(_parsedProp2); - } - } - } - } else { - // can't do anything without well defined properties - return false; - } - - // we've failed if there are no valid properties - if (props.length === 0) { - return false; - } - - // now, apply the bypass properties on the elements - var ret = false; // return true if at least one succesful bypass applied - for (var _i2 = 0; _i2 < eles.length; _i2++) { - // for each ele - var ele = eles[_i2]; - var diffProps = {}; - var diffProp = void 0; - - for (var j = 0; j < props.length; j++) { - // for each prop - var _prop2 = props[j]; - - if (updateTransitions) { - var prevProp = ele.pstyle(_prop2.name); - diffProp = diffProps[_prop2.name] = { prev: prevProp }; - } - - ret = this.applyParsedProperty(ele, _prop2) || ret; - - if (updateTransitions) { - diffProp.next = ele.pstyle(_prop2.name); - } - } // for props - - if (ret) { - this.updateStyleHints(ele); - } - - if (updateTransitions) { - this.updateTransitions(ele, diffProps, isBypass); - } - } // for eles - - return ret; -}; - -// only useful in specific cases like animation -styfn.overrideBypass = function (eles, name, value) { - name = util.camel2dash(name); - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var prop = ele._private.style[name]; - var type = this.properties[name].type; - var isColor = type.color; - var isMulti = type.mutiple; - - if (!prop || !prop.bypass) { - // need a bypass if one doesn't exist - this.applyBypass(ele, name, value); - continue; - } - - var oldValue = prop.pfValue != null ? prop.pfValue : prop.value; - - prop.value = value; - - if (prop.pfValue != null) { - prop.pfValue = value; - } - - if (isColor) { - prop.strValue = 'rgb(' + value.join(',') + ')'; - } else if (isMulti) { - prop.strValue = value.join(' '); - } else { - prop.strValue = '' + value; - } - - this.checkZOrderTrigger(ele, name, oldValue, value); - } -}; - -styfn.removeAllBypasses = function (eles, updateTransitions) { - return this.removeBypasses(eles, this.propertyNames, updateTransitions); -}; - -styfn.removeBypasses = function (eles, props, updateTransitions) { - var isBypass = true; - - for (var j = 0; j < eles.length; j++) { - var ele = eles[j]; - var diffProps = {}; - - for (var i = 0; i < props.length; i++) { - var name = props[i]; - var prop = this.properties[name]; - var prevProp = ele.pstyle(prop.name); - - if (!prevProp || !prevProp.bypass) { - // if a bypass doesn't exist for the prop, nothing needs to be removed - continue; - } - - var value = ''; // empty => remove bypass - var parsedProp = this.parse(name, value, true); - var diffProp = diffProps[prop.name] = { prev: prevProp }; - - this.applyParsedProperty(ele, parsedProp); - - diffProp.next = ele.pstyle(prop.name); - } // for props - - this.updateStyleHints(ele); - - if (updateTransitions) { - this.updateTransitions(ele, diffProps, isBypass); - } - } // for eles -}; - -module.exports = styfn; - -/***/ }), -/* 88 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var window = __webpack_require__(3); - -var styfn = {}; - -// gets what an em size corresponds to in pixels relative to a dom element -styfn.getEmSizeInPixels = function () { - var px = this.containerCss('font-size'); - - if (px != null) { - return parseFloat(px); - } else { - return 1; // for headless - } -}; - -// gets css property from the core container -styfn.containerCss = function (propName) { - var cy = this._private.cy; - var domElement = cy.container(); - - if (window && domElement && window.getComputedStyle) { - return window.getComputedStyle(domElement).getPropertyValue(propName); - } -}; - -module.exports = styfn; - -/***/ }), -/* 89 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); - -var styfn = {}; - -// gets the rendered style for an element -styfn.getRenderedStyle = function (ele, prop) { - if (prop) { - return this.getStylePropertyValue(ele, prop, true); - } else { - return this.getRawStyle(ele, true); - } -}; - -// gets the raw style for an element -styfn.getRawStyle = function (ele, isRenderedVal) { - var self = this; - - ele = ele[0]; // insure it's an element - - if (ele) { - var rstyle = {}; - - for (var i = 0; i < self.properties.length; i++) { - var prop = self.properties[i]; - var val = self.getStylePropertyValue(ele, prop.name, isRenderedVal); - - if (val != null) { - rstyle[prop.name] = val; - rstyle[util.dash2camel(prop.name)] = val; - } - } - - return rstyle; - } -}; - -styfn.getIndexedStyle = function (ele, property, subproperty, index) { - var pstyle = ele.pstyle(property)[subproperty][index]; - return pstyle != null ? pstyle : ele.cy().style().getDefaultProperty(property)[subproperty][0]; -}; - -styfn.getStylePropertyValue = function (ele, propName, isRenderedVal) { - var self = this; - - ele = ele[0]; // insure it's an element - - if (ele) { - var prop = self.properties[propName]; - - if (prop.alias) { - prop = prop.pointsTo; - } - - var type = prop.type; - var styleProp = ele.pstyle(prop.name); - var zoom = ele.cy().zoom(); - - if (styleProp) { - var units = styleProp.units ? type.implicitUnits || 'px' : null; - var val = units ? [].concat(styleProp.pfValue).map(function (pfValue) { - return pfValue * (isRenderedVal ? zoom : 1) + units; - }).join(' ') : styleProp.strValue; - - return val; - } - } -}; - -styfn.getAnimationStartStyle = function (ele, aniProps) { - var rstyle = {}; - - for (var i = 0; i < aniProps.length; i++) { - var aniProp = aniProps[i]; - var name = aniProp.name; - - var styleProp = ele.pstyle(name); - - if (styleProp !== undefined) { - // then make a prop of it - if (is.plainObject(styleProp)) { - styleProp = this.parse(name, styleProp.strValue); - } else { - styleProp = this.parse(name, styleProp); - } - } - - if (styleProp) { - rstyle[name] = styleProp; - } - } - - return rstyle; -}; - -styfn.getPropsList = function (propsObj) { - var self = this; - var rstyle = []; - var style = propsObj; - var props = self.properties; - - if (style) { - var names = Object.keys(style); - - for (var i = 0; i < names.length; i++) { - var name = names[i]; - var val = style[name]; - var prop = props[name] || props[util.camel2dash(name)]; - var styleProp = this.parse(prop.name, val); - - if (styleProp) { - rstyle.push(styleProp); - } - } - } - - return rstyle; -}; - -module.exports = styfn; - -/***/ }), -/* 90 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var styfn = {}; - -styfn.appendFromJson = function (json) { - var style = this; - - for (var i = 0; i < json.length; i++) { - var context = json[i]; - var selector = context.selector; - var props = context.style || context.css; - var names = Object.keys(props); - - style.selector(selector); // apply selector - - for (var j = 0; j < names.length; j++) { - var name = names[j]; - var value = props[name]; - - style.css(name, value); // apply property - } - } - - return style; -}; - -// accessible cy.style() function -styfn.fromJson = function (json) { - var style = this; - - style.resetToDefault(); - style.appendFromJson(json); - - return style; -}; - -// get json from cy.style() api -styfn.json = function () { - var json = []; - - for (var i = this.defaultLength; i < this.length; i++) { - var cxt = this[i]; - var selector = cxt.selector; - var props = cxt.properties; - var css = {}; - - for (var j = 0; j < props.length; j++) { - var prop = props[j]; - css[prop.name] = prop.strValue; - } - - json.push({ - selector: !selector ? 'core' : selector.toString(), - style: css - }); - } - - return json; -}; - -module.exports = styfn; - -/***/ }), -/* 91 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var Selector = __webpack_require__(6); - -var styfn = {}; - -styfn.appendFromString = function (string) { - var self = this; - var style = this; - var remaining = '' + string; - var selAndBlockStr = void 0; - var blockRem = void 0; - var propAndValStr = void 0; - - // remove comments from the style string - remaining = remaining.replace(/[/][*](\s|.)+?[*][/]/g, ''); - - function removeSelAndBlockFromRemaining() { - // remove the parsed selector and block from the remaining text to parse - if (remaining.length > selAndBlockStr.length) { - remaining = remaining.substr(selAndBlockStr.length); - } else { - remaining = ''; - } - } - - function removePropAndValFromRem() { - // remove the parsed property and value from the remaining block text to parse - if (blockRem.length > propAndValStr.length) { - blockRem = blockRem.substr(propAndValStr.length); - } else { - blockRem = ''; - } - } - - while (true) { - var nothingLeftToParse = remaining.match(/^\s*$/); - if (nothingLeftToParse) { - break; - } - - var selAndBlock = remaining.match(/^\s*((?:.|\s)+?)\s*\{((?:.|\s)+?)\}/); - - if (!selAndBlock) { - util.error('Halting stylesheet parsing: String stylesheet contains more to parse but no selector and block found in: ' + remaining); - break; - } - - selAndBlockStr = selAndBlock[0]; - - // parse the selector - var selectorStr = selAndBlock[1]; - if (selectorStr !== 'core') { - var selector = new Selector(selectorStr); - if (selector._private.invalid) { - util.error('Skipping parsing of block: Invalid selector found in string stylesheet: ' + selectorStr); - - // skip this selector and block - removeSelAndBlockFromRemaining(); - continue; - } - } - - // parse the block of properties and values - var blockStr = selAndBlock[2]; - var invalidBlock = false; - blockRem = blockStr; - var props = []; - - while (true) { - var _nothingLeftToParse = blockRem.match(/^\s*$/); - if (_nothingLeftToParse) { - break; - } - - var propAndVal = blockRem.match(/^\s*(.+?)\s*:\s*(.+?)\s*;/); - - if (!propAndVal) { - util.error('Skipping parsing of block: Invalid formatting of style property and value definitions found in:' + blockStr); - invalidBlock = true; - break; - } - - propAndValStr = propAndVal[0]; - var propStr = propAndVal[1]; - var valStr = propAndVal[2]; - - var prop = self.properties[propStr]; - if (!prop) { - util.error('Skipping property: Invalid property name in: ' + propAndValStr); - - // skip this property in the block - removePropAndValFromRem(); - continue; - } - - var parsedProp = style.parse(propStr, valStr); - - if (!parsedProp) { - util.error('Skipping property: Invalid property definition in: ' + propAndValStr); - - // skip this property in the block - removePropAndValFromRem(); - continue; - } - - props.push({ - name: propStr, - val: valStr - }); - removePropAndValFromRem(); - } - - if (invalidBlock) { - removeSelAndBlockFromRemaining(); - break; - } - - // put the parsed block in the style - style.selector(selectorStr); - for (var i = 0; i < props.length; i++) { - var _prop = props[i]; - style.css(_prop.name, _prop.val); - } - - removeSelAndBlockFromRemaining(); - } - - return style; -}; - -styfn.fromString = function (string) { - var style = this; - - style.resetToDefault(); - style.appendFromString(string); - - return style; -}; - -module.exports = styfn; - -/***/ }), -/* 92 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); - -var styfn = {}; - -(function () { - var number = util.regex.number; - var rgba = util.regex.rgbaNoBackRefs; - var hsla = util.regex.hslaNoBackRefs; - var hex3 = util.regex.hex3; - var hex6 = util.regex.hex6; - var data = function data(prefix) { - return '^' + prefix + '\\s*\\(\\s*([\\w\\.]+)\\s*\\)$'; - }; - var mapData = function mapData(prefix) { - var mapArg = number + '|\\w+|' + rgba + '|' + hsla + '|' + hex3 + '|' + hex6; - return '^' + prefix + '\\s*\\(([\\w\\.]+)\\s*\\,\\s*(' + number + ')\\s*\\,\\s*(' + number + ')\\s*,\\s*(' + mapArg + ')\\s*\\,\\s*(' + mapArg + ')\\)$'; - }; - var urlRegexes = ['^url\\s*\\(\\s*[\'"]?(.+?)[\'"]?\\s*\\)$', '^(none)$', '^(.+)$']; - - // each visual style property has a type and needs to be validated according to it - styfn.types = { - time: { number: true, min: 0, units: 's|ms', implicitUnits: 'ms' }, - percent: { number: true, min: 0, max: 100, units: '%', implicitUnits: '%' }, - zeroOneNumber: { number: true, min: 0, max: 1, unitless: true }, - zeroOneNumbers: { number: true, min: 0, max: 1, unitless: true, multiple: true }, - nOneOneNumber: { number: true, min: -1, max: 1, unitless: true }, - nonNegativeInt: { number: true, min: 0, integer: true, unitless: true }, - position: { enums: ['parent', 'origin'] }, - nodeSize: { number: true, min: 0, enums: ['label'] }, - number: { number: true, unitless: true }, - numbers: { number: true, unitless: true, multiple: true }, - positiveNumber: { number: true, unitless: true, min: 0, strictMin: true }, - size: { number: true, min: 0 }, - bidirectionalSize: { number: true }, // allows negative - bidirectionalSizes: { number: true, multiple: true }, // allows negative - sizeMaybePercent: { number: true, min: 0, allowPercent: true }, - paddingRelativeTo: { enums: ['width', 'height', 'average', 'min', 'max'] }, - bgWH: { number: true, min: 0, allowPercent: true, enums: ['auto'], multiple: true }, - bgPos: { number: true, allowPercent: true, multiple: true }, - bgRelativeTo: { enums: ['inner', 'include-padding'], multiple: true }, - bgRepeat: { enums: ['repeat', 'repeat-x', 'repeat-y', 'no-repeat'], multiple: true }, - bgFit: { enums: ['none', 'contain', 'cover'], multiple: true }, - bgCrossOrigin: { enums: ['anonymous', 'use-credentials'], multiple: true }, - bgClip: { enums: ['none', 'node'] }, - color: { color: true }, - bool: { enums: ['yes', 'no'] }, - lineStyle: { enums: ['solid', 'dotted', 'dashed'] }, - borderStyle: { enums: ['solid', 'dotted', 'dashed', 'double'] }, - curveStyle: { enums: ['bezier', 'unbundled-bezier', 'haystack', 'segments'] }, - fontFamily: { regex: '^([\\w- \\"]+(?:\\s*,\\s*[\\w- \\"]+)*)$' }, - fontletiant: { enums: ['small-caps', 'normal'] }, - fontStyle: { enums: ['italic', 'normal', 'oblique'] }, - fontWeight: { enums: ['normal', 'bold', 'bolder', 'lighter', '100', '200', '300', '400', '500', '600', '800', '900', 100, 200, 300, 400, 500, 600, 700, 800, 900] }, - textDecoration: { enums: ['none', 'underline', 'overline', 'line-through'] }, - textTransform: { enums: ['none', 'uppercase', 'lowercase'] }, - textWrap: { enums: ['none', 'wrap', 'ellipsis'] }, - textBackgroundShape: { enums: ['rectangle', 'roundrectangle'] }, - nodeShape: { enums: ['rectangle', 'roundrectangle', 'cutrectangle', 'bottomroundrectangle', 'barrel', 'ellipse', 'triangle', 'square', 'pentagon', 'hexagon', 'concavehexagon', 'heptagon', 'octagon', 'tag', 'star', 'diamond', 'vee', 'rhomboid', 'polygon'] }, - compoundIncludeLabels: { enums: ['include', 'exclude'] }, - arrowShape: { enums: ['tee', 'triangle', 'triangle-tee', 'triangle-cross', 'triangle-backcurve', 'half-triangle-overshot', 'vee', 'square', 'circle', 'diamond', 'none'] }, - arrowFill: { enums: ['filled', 'hollow'] }, - display: { enums: ['element', 'none'] }, - visibility: { enums: ['hidden', 'visible'] }, - zCompoundDepth: { enums: ['bottom', 'orphan', 'auto', 'top'] }, - zIndexCompare: { enums: ['auto', 'manual'] }, - valign: { enums: ['top', 'center', 'bottom'] }, - halign: { enums: ['left', 'center', 'right'] }, - text: { string: true }, - data: { mapping: true, regex: data('data') }, - layoutData: { mapping: true, regex: data('layoutData') }, - scratch: { mapping: true, regex: data('scratch') }, - mapData: { mapping: true, regex: mapData('mapData') }, - mapLayoutData: { mapping: true, regex: mapData('mapLayoutData') }, - mapScratch: { mapping: true, regex: mapData('mapScratch') }, - fn: { mapping: true, fn: true }, - url: { regexes: urlRegexes, singleRegexMatchValue: true }, - urls: { regexes: urlRegexes, singleRegexMatchValue: true, multiple: true }, - propList: { propList: true }, - angle: { number: true, units: 'deg|rad', implicitUnits: 'rad' }, - textRotation: { number: true, units: 'deg|rad', implicitUnits: 'rad', enums: ['none', 'autorotate'] }, - polygonPointList: { number: true, multiple: true, evenMultiple: true, min: -1, max: 1, unitless: true }, - edgeDistances: { enums: ['intersection', 'node-position'] }, - edgeEndpoint: { - number: true, multiple: true, units: '%|px|em|deg|rad', implicitUnits: 'px', - enums: ['inside-to-node', 'outside-to-node', 'outside-to-line'], singleEnum: true, - validate: function validate(valArr, unitsArr) { - switch (valArr.length) { - case 2: - // can be % or px only - return unitsArr[0] !== 'deg' && unitsArr[0] !== 'rad' && unitsArr[1] !== 'deg' && unitsArr[1] !== 'rad'; - case 1: - // can be enum, deg, or rad only - return is.string(valArr[0]) || unitsArr[0] === 'deg' || unitsArr[0] === 'rad'; - default: - return false; - } - } - }, - easing: { - regexes: ['^(spring)\\s*\\(\\s*(' + number + ')\\s*,\\s*(' + number + ')\\s*\\)$', '^(cubic-bezier)\\s*\\(\\s*(' + number + ')\\s*,\\s*(' + number + ')\\s*,\\s*(' + number + ')\\s*,\\s*(' + number + ')\\s*\\)$'], - enums: ['linear', 'ease', 'ease-in', 'ease-out', 'ease-in-out', 'ease-in-sine', 'ease-out-sine', 'ease-in-out-sine', 'ease-in-quad', 'ease-out-quad', 'ease-in-out-quad', 'ease-in-cubic', 'ease-out-cubic', 'ease-in-out-cubic', 'ease-in-quart', 'ease-out-quart', 'ease-in-out-quart', 'ease-in-quint', 'ease-out-quint', 'ease-in-out-quint', 'ease-in-expo', 'ease-out-expo', 'ease-in-out-expo', 'ease-in-circ', 'ease-out-circ', 'ease-in-out-circ'] - } - }; - - var zOrderDiff = { - zeroNonZero: function zeroNonZero(val1, val2) { - if (val1 === 0 && val2 !== 0) { - return true; - } else if (val1 !== 0 && val2 === 0) { - return true; - } else { - return false; - } - }, - anyDiff: function anyDiff(val1, val2) { - return val1 !== val2; - } - }; - - var zd = zOrderDiff; - - // define visual style properties - var t = styfn.types; - var props = styfn.properties = [ - // main label - { name: 'label', type: t.text }, { name: 'text-rotation', type: t.textRotation }, { name: 'text-margin-x', type: t.bidirectionalSize }, { name: 'text-margin-y', type: t.bidirectionalSize }, - - // source label - { name: 'source-label', type: t.text }, { name: 'source-text-rotation', type: t.textRotation }, { name: 'source-text-margin-x', type: t.bidirectionalSize }, { name: 'source-text-margin-y', type: t.bidirectionalSize }, { name: 'source-text-offset', type: t.size }, - - // target label - { name: 'target-label', type: t.text }, { name: 'target-text-rotation', type: t.textRotation }, { name: 'target-text-margin-x', type: t.bidirectionalSize }, { name: 'target-text-margin-y', type: t.bidirectionalSize }, { name: 'target-text-offset', type: t.size }, - - // common label style - { name: 'text-valign', type: t.valign }, { name: 'text-halign', type: t.halign }, { name: 'color', type: t.color }, { name: 'text-outline-color', type: t.color }, { name: 'text-outline-width', type: t.size }, { name: 'text-outline-opacity', type: t.zeroOneNumber }, { name: 'text-opacity', type: t.zeroOneNumber }, { name: 'text-background-color', type: t.color }, { name: 'text-background-opacity', type: t.zeroOneNumber }, { name: 'text-background-padding', type: t.size }, { name: 'text-border-opacity', type: t.zeroOneNumber }, { name: 'text-border-color', type: t.color }, { name: 'text-border-width', type: t.size }, { name: 'text-border-style', type: t.borderStyle }, { name: 'text-background-shape', type: t.textBackgroundShape }, - // { name: 'text-decoration', type: t.textDecoration }, // not supported in canvas - { name: 'text-transform', type: t.textTransform }, { name: 'text-wrap', type: t.textWrap }, { name: 'text-max-width', type: t.size }, { name: 'text-events', type: t.bool }, { name: 'font-family', type: t.fontFamily }, { name: 'font-style', type: t.fontStyle }, - // { name: 'font-letiant', type: t.fontletiant }, // not useful - { name: 'font-weight', type: t.fontWeight }, { name: 'font-size', type: t.size }, { name: 'min-zoomed-font-size', type: t.size }, - - // behaviour - { name: 'events', type: t.bool }, - - // visibility - { name: 'display', type: t.display, triggersZOrder: zd.anyDiff }, { name: 'visibility', type: t.visibility, triggersZOrder: zd.anyDiff }, { name: 'opacity', type: t.zeroOneNumber, triggersZOrder: zd.zeroNonZero }, { name: 'z-compound-depth', type: t.zCompoundDepth, triggersZOrder: zd.anyDiff }, { name: 'z-index-compare', type: t.zIndexCompare, triggersZOrder: zd.anyDiff }, { name: 'z-index', type: t.nonNegativeInt, triggersZOrder: zd.anyDiff }, - - // overlays - { name: 'overlay-padding', type: t.size }, { name: 'overlay-color', type: t.color }, { name: 'overlay-opacity', type: t.zeroOneNumber }, - - // transition anis - { name: 'transition-property', type: t.propList }, { name: 'transition-duration', type: t.time }, { name: 'transition-delay', type: t.time }, { name: 'transition-timing-function', type: t.easing }, - - // node body - { name: 'height', type: t.nodeSize }, { name: 'width', type: t.nodeSize }, { name: 'shape', type: t.nodeShape }, { name: 'shape-polygon-points', type: t.polygonPointList }, { name: 'background-color', type: t.color }, { name: 'background-opacity', type: t.zeroOneNumber }, { name: 'background-blacken', type: t.nOneOneNumber }, { name: 'padding', type: t.sizeMaybePercent }, { name: 'padding-relative-to', type: t.paddingRelativeTo }, - - // node border - { name: 'border-color', type: t.color }, { name: 'border-opacity', type: t.zeroOneNumber }, { name: 'border-width', type: t.size }, { name: 'border-style', type: t.borderStyle }, - - // node background images - { name: 'background-image', type: t.urls }, { name: 'background-image-crossorigin', type: t.bgCrossOrigin }, { name: 'background-image-opacity', type: t.zeroOneNumbers }, { name: 'background-position-x', type: t.bgPos }, { name: 'background-position-y', type: t.bgPos }, { name: 'background-width-relative-to', type: t.bgRelativeTo }, { name: 'background-height-relative-to', type: t.bgRelativeTo }, { name: 'background-repeat', type: t.bgRepeat }, { name: 'background-fit', type: t.bgFit }, { name: 'background-clip', type: t.bgClip }, { name: 'background-width', type: t.bgWH }, { name: 'background-height', type: t.bgWH }, - - // compound props - { name: 'position', type: t.position }, { name: 'compound-sizing-wrt-labels', type: t.compoundIncludeLabels }, { name: 'min-width', type: t.size }, { name: 'min-width-bias-left', type: t.sizeMaybePercent }, { name: 'min-width-bias-right', type: t.sizeMaybePercent }, { name: 'min-height', type: t.size }, { name: 'min-height-bias-top', type: t.sizeMaybePercent }, { name: 'min-height-bias-bottom', type: t.sizeMaybePercent }, - - // edge line - { name: 'line-style', type: t.lineStyle }, { name: 'line-color', type: t.color }, { name: 'curve-style', type: t.curveStyle }, { name: 'haystack-radius', type: t.zeroOneNumber }, { name: 'source-endpoint', type: t.edgeEndpoint }, { name: 'target-endpoint', type: t.edgeEndpoint }, { name: 'control-point-step-size', type: t.size }, { name: 'control-point-distances', type: t.bidirectionalSizes }, { name: 'control-point-weights', type: t.numbers }, { name: 'segment-distances', type: t.bidirectionalSizes }, { name: 'segment-weights', type: t.numbers }, { name: 'edge-distances', type: t.edgeDistances }, { name: 'arrow-scale', type: t.positiveNumber }, { name: 'loop-direction', type: t.angle }, { name: 'loop-sweep', type: t.angle }, { name: 'source-distance-from-node', type: t.size }, { name: 'target-distance-from-node', type: t.size }, - - // ghost properties - { name: 'ghost', type: t.bool }, { name: 'ghost-offset-x', type: t.bidirectionalSize }, { name: 'ghost-offset-y', type: t.bidirectionalSize }, { name: 'ghost-opacity', type: t.zeroOneNumber }, - - // these are just for the core - { name: 'selection-box-color', type: t.color }, { name: 'selection-box-opacity', type: t.zeroOneNumber }, { name: 'selection-box-border-color', type: t.color }, { name: 'selection-box-border-width', type: t.size }, { name: 'active-bg-color', type: t.color }, { name: 'active-bg-opacity', type: t.zeroOneNumber }, { name: 'active-bg-size', type: t.size }, { name: 'outside-texture-bg-color', type: t.color }, { name: 'outside-texture-bg-opacity', type: t.zeroOneNumber }]; - - // define aliases - var aliases = styfn.aliases = [{ name: 'content', pointsTo: 'label' }, { name: 'control-point-distance', pointsTo: 'control-point-distances' }, { name: 'control-point-weight', pointsTo: 'control-point-weights' }, { name: 'edge-text-rotation', pointsTo: 'text-rotation' }, { name: 'padding-left', pointsTo: 'padding' }, { name: 'padding-right', pointsTo: 'padding' }, { name: 'padding-top', pointsTo: 'padding' }, { name: 'padding-bottom', pointsTo: 'padding' }]; - - // pie backgrounds for nodes - styfn.pieBackgroundN = 16; // because the pie properties are numbered, give access to a constant N (for renderer use) - props.push({ name: 'pie-size', type: t.sizeMaybePercent }); - for (var i = 1; i <= styfn.pieBackgroundN; i++) { - props.push({ name: 'pie-' + i + '-background-color', type: t.color }); - props.push({ name: 'pie-' + i + '-background-size', type: t.percent }); - props.push({ name: 'pie-' + i + '-background-opacity', type: t.zeroOneNumber }); - } - - // edge arrows - var arrowPrefixes = styfn.arrowPrefixes = ['source', 'mid-source', 'target', 'mid-target']; - [{ name: 'arrow-shape', type: t.arrowShape }, { name: 'arrow-color', type: t.color }, { name: 'arrow-fill', type: t.arrowFill }].forEach(function (prop) { - arrowPrefixes.forEach(function (prefix) { - var name = prefix + '-' + prop.name; - var type = prop.type; - - props.push({ name: name, type: type }); - }); - }, {}); - - // list of property names - styfn.propertyNames = props.map(function (p) { - return p.name; - }); - - // allow access of properties by name ( e.g. style.properties.height ) - for (var _i = 0; _i < props.length; _i++) { - var prop = props[_i]; - - props[prop.name] = prop; // allow lookup by name - } - - // map aliases - for (var _i2 = 0; _i2 < aliases.length; _i2++) { - var alias = aliases[_i2]; - var pointsToProp = props[alias.pointsTo]; - var aliasProp = { - name: alias.name, - alias: true, - pointsTo: pointsToProp - }; - - // add alias prop for parsing - props.push(aliasProp); - - props[alias.name] = aliasProp; // allow lookup by name - } -})(); - -styfn.getDefaultProperty = function (name) { - return this.getDefaultProperties()[name]; -}; - -styfn.getDefaultProperties = util.memoize(function () { - var rawProps = util.extend({ - // common node/edge props - 'events': 'yes', - 'text-events': 'no', - 'text-valign': 'top', - 'text-halign': 'center', - 'color': '#000', - 'text-outline-color': '#000', - 'text-outline-width': 0, - 'text-outline-opacity': 1, - 'text-opacity': 1, - 'text-decoration': 'none', - 'text-transform': 'none', - 'text-wrap': 'none', - 'text-max-width': 9999, - 'text-background-color': '#000', - 'text-background-opacity': 0, - 'text-background-shape': 'rectangle', - 'text-background-padding': 0, - 'text-border-opacity': 0, - 'text-border-width': 0, - 'text-border-style': 'solid', - 'text-border-color': '#000', - 'font-family': 'Helvetica Neue, Helvetica, sans-serif', - 'font-style': 'normal', - // 'font-letiant': fontletiant, - 'font-weight': 'normal', - 'font-size': 16, - 'min-zoomed-font-size': 0, - 'text-rotation': 'none', - 'source-text-rotation': 'none', - 'target-text-rotation': 'none', - 'visibility': 'visible', - 'display': 'element', - 'opacity': 1, - 'z-compound-depth': 'auto', - 'z-index-compare': 'auto', - 'z-index': 0, - 'label': '', - 'text-margin-x': 0, - 'text-margin-y': 0, - 'source-label': '', - 'source-text-offset': 0, - 'source-text-margin-x': 0, - 'source-text-margin-y': 0, - 'target-label': '', - 'target-text-offset': 0, - 'target-text-margin-x': 0, - 'target-text-margin-y': 0, - 'overlay-opacity': 0, - 'overlay-color': '#000', - 'overlay-padding': 10, - 'transition-property': 'none', - 'transition-duration': 0, - 'transition-delay': 0, - 'transition-timing-function': 'linear', - - // node props - 'background-blacken': 0, - 'background-color': '#999', - 'background-opacity': 1, - 'background-image': 'none', - 'background-image-crossorigin': 'anonymous', - 'background-image-opacity': 1, - 'background-position-x': '50%', - 'background-position-y': '50%', - 'background-width-relative-to': 'include-padding', - 'background-height-relative-to': 'include-padding', - 'background-repeat': 'no-repeat', - 'background-fit': 'none', - 'background-clip': 'node', - 'background-width': 'auto', - 'background-height': 'auto', - 'border-color': '#000', - 'border-opacity': 1, - 'border-width': 0, - 'border-style': 'solid', - 'height': 30, - 'width': 30, - 'shape': 'ellipse', - 'shape-polygon-points': '-1, -1, 1, -1, 1, 1, -1, 1', - - // ghost props - 'ghost': 'no', - 'ghost-offset-y': 0, - 'ghost-offset-x': 0, - 'ghost-opacity': 0, - - // compound props - 'padding': 0, - 'padding-relative-to': 'width', - 'position': 'origin', - 'compound-sizing-wrt-labels': 'include', - 'min-width': 0, - 'min-width-bias-left': 0, - 'min-width-bias-right': 0, - 'min-height': 0, - 'min-height-bias-top': 0, - 'min-height-bias-bottom': 0 - }, { - // node pie bg - 'pie-size': '100%' - }, [{ name: 'pie-{{i}}-background-color', value: 'black' }, { name: 'pie-{{i}}-background-size', value: '0%' }, { name: 'pie-{{i}}-background-opacity', value: 1 }].reduce(function (css, prop) { - for (var i = 1; i <= styfn.pieBackgroundN; i++) { - var name = prop.name.replace('{{i}}', i); - var val = prop.value; - - css[name] = val; - } - - return css; - }, {}), { - // edge props - 'line-style': 'solid', - 'line-color': '#999', - 'control-point-step-size': 40, - 'control-point-weights': 0.5, - 'segment-weights': 0.5, - 'segment-distances': 20, - 'edge-distances': 'intersection', - 'curve-style': 'bezier', - 'haystack-radius': 0, - 'arrow-scale': 1, - 'loop-direction': '-45deg', - 'loop-sweep': '-90deg', - 'source-distance-from-node': 0, - 'target-distance-from-node': 0, - 'source-endpoint': 'outside-to-node', - 'target-endpoint': 'outside-to-node' - }, [{ name: 'arrow-shape', value: 'none' }, { name: 'arrow-color', value: '#999' }, { name: 'arrow-fill', value: 'filled' }].reduce(function (css, prop) { - styfn.arrowPrefixes.forEach(function (prefix) { - var name = prefix + '-' + prop.name; - var val = prop.value; - - css[name] = val; - }); - - return css; - }, {})); - - var parsedProps = {}; - - for (var i = 0; i < this.properties.length; i++) { - var prop = this.properties[i]; - - if (prop.pointsTo) { - continue; - } - - var name = prop.name; - var val = rawProps[name]; - var parsedProp = this.parse(name, val); - - parsedProps[name] = parsedProp; - } - - return parsedProps; -}); - -styfn.addDefaultStylesheet = function () { - this.selector('$node > node') // compound (parent) node properties - .css({ - 'shape': 'rectangle', - 'padding': 10, - 'background-color': '#eee', - 'border-color': '#ccc', - 'border-width': 1 - }).selector('edge') // just edge properties - .css({ - 'width': 3, - 'curve-style': 'haystack' - }).selector(':parent <-> node').css({ - 'curve-style': 'bezier', - 'source-endpoint': 'outside-to-line', - 'target-endpoint': 'outside-to-line' - }).selector(':selected').css({ - 'background-color': '#0169D9', - 'line-color': '#0169D9', - 'source-arrow-color': '#0169D9', - 'target-arrow-color': '#0169D9', - 'mid-source-arrow-color': '#0169D9', - 'mid-target-arrow-color': '#0169D9' - }).selector('node:parent:selected').css({ - 'background-color': '#CCE1F9', - 'border-color': '#aec8e5' - }).selector(':active').css({ - 'overlay-color': 'black', - 'overlay-padding': 10, - 'overlay-opacity': 0.25 - }).selector('core') // just core properties - .css({ - 'selection-box-color': '#ddd', - 'selection-box-opacity': 0.65, - 'selection-box-border-color': '#aaa', - 'selection-box-border-width': 1, - 'active-bg-color': 'black', - 'active-bg-opacity': 0.15, - 'active-bg-size': 30, - 'outside-texture-bg-color': '#000', - 'outside-texture-bg-opacity': 0.125 - }); - - this.defaultLength = this.length; -}; - -module.exports = styfn; - -/***/ }), -/* 93 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); -var math = __webpack_require__(2); - -var styfn = {}; - -// a caching layer for property parsing -styfn.parse = function (name, value, propIsBypass, propIsFlat) { - var self = this; - - // function values can't be cached in all cases, and there isn't much benefit of caching them anyway - if (is.fn(value)) { - return self.parseImplWarn(name, value, propIsBypass, propIsFlat); - } - - var flatKey = propIsFlat === 'mapping' || propIsFlat === true || propIsFlat === false || propIsFlat == null ? 'dontcare' : propIsFlat; - var argHash = [name, value, propIsBypass, flatKey].join('$'); - var propCache = self.propCache = self.propCache || {}; - var ret = void 0; - - if (!(ret = propCache[argHash])) { - ret = propCache[argHash] = self.parseImplWarn(name, value, propIsBypass, propIsFlat); - } - - // - bypasses can't be shared b/c the value can be changed by animations or otherwise overridden - // - mappings can't be shared b/c mappings are per-element - if (propIsBypass || propIsFlat === 'mapping') { - // need a copy since props are mutated later in their lifecycles - ret = util.copy(ret); - - if (ret) { - ret.value = util.copy(ret.value); // because it could be an array, e.g. colour - } - } - - return ret; -}; - -styfn.parseImplWarn = function (name, value, propIsBypass, propIsFlat) { - var prop = this.parseImpl(name, value, propIsBypass, propIsFlat); - - if (!prop && value != null) { - util.error('The style property `%s: %s` is invalid', name, value); - } - - return prop; -}; - -// parse a property; return null on invalid; return parsed property otherwise -// fields : -// - name : the name of the property -// - value : the parsed, native-typed value of the property -// - strValue : a string value that represents the property value in valid css -// - bypass : true iff the property is a bypass property -styfn.parseImpl = function (name, value, propIsBypass, propIsFlat) { - var self = this; - - name = util.camel2dash(name); // make sure the property name is in dash form (e.g. 'property-name' not 'propertyName') - - var property = self.properties[name]; - var passedValue = value; - var types = self.types; - - if (!property) { - return null; - } // return null on property of unknown name - if (value === undefined) { - return null; - } // can't assign undefined - - // the property may be an alias - if (property.alias) { - property = property.pointsTo; - name = property.name; - } - - var valueIsString = is.string(value); - if (valueIsString) { - // trim the value to make parsing easier - value = value.trim(); - } - - var type = property.type; - if (!type) { - return null; - } // no type, no luck - - // check if bypass is null or empty string (i.e. indication to delete bypass property) - if (propIsBypass && (value === '' || value === null)) { - return { - name: name, - value: value, - bypass: true, - deleteBypass: true - }; - } - - // check if value is a function used as a mapper - if (is.fn(value)) { - return { - name: name, - value: value, - strValue: 'fn', - mapped: types.fn, - bypass: propIsBypass - }; - } - - // check if value is mapped - var data = void 0, - mapData = void 0; - if (!valueIsString || propIsFlat) { - // then don't bother to do the expensive regex checks - - } else if (data = new RegExp(types.data.regex).exec(value)) { - if (propIsBypass) { - return false; - } // mappers not allowed in bypass - - var mapped = types.data; - - return { - name: name, - value: data, - strValue: '' + value, - mapped: mapped, - field: data[1], - bypass: propIsBypass - }; - } else if (mapData = new RegExp(types.mapData.regex).exec(value)) { - if (propIsBypass) { - return false; - } // mappers not allowed in bypass - if (type.multiple) { - return false; - } // impossible to map to num - - var _mapped = types.mapData; - - // we can map only if the type is a colour or a number - if (!(type.color || type.number)) { - return false; - } - - var valueMin = this.parse(name, mapData[4]); // parse to validate - if (!valueMin || valueMin.mapped) { - return false; - } // can't be invalid or mapped - - var valueMax = this.parse(name, mapData[5]); // parse to validate - if (!valueMax || valueMax.mapped) { - return false; - } // can't be invalid or mapped - - // check if valueMin and valueMax are the same - if (valueMin.value === valueMax.value) { - return false; // can't make much of a mapper without a range - } else if (type.color) { - var c1 = valueMin.value; - var c2 = valueMax.value; - - var same = c1[0] === c2[0] // red - && c1[1] === c2[1] // green - && c1[2] === c2[2] // blue - && ( // optional alpha - c1[3] === c2[3] // same alpha outright - || (c1[3] == null || c1[3] === 1) && ( // full opacity for colour 1? - c2[3] == null || c2[3] === 1) // full opacity for colour 2? - ); - - if (same) { - return false; - } // can't make a mapper without a range - } - - return { - name: name, - value: mapData, - strValue: '' + value, - mapped: _mapped, - field: mapData[1], - fieldMin: parseFloat(mapData[2]), // min & max are numeric - fieldMax: parseFloat(mapData[3]), - valueMin: valueMin.value, - valueMax: valueMax.value, - bypass: propIsBypass - }; - } - - if (type.multiple && propIsFlat !== 'multiple') { - var vals = void 0; - - if (valueIsString) { - vals = value.split(/\s+/); - } else if (is.array(value)) { - vals = value; - } else { - vals = [value]; - } - - if (type.evenMultiple && vals.length % 2 !== 0) { - return null; - } - - var valArr = []; - var unitsArr = []; - var pfValArr = []; - var hasEnum = false; - - for (var i = 0; i < vals.length; i++) { - var p = self.parse(name, vals[i], propIsBypass, 'multiple'); - - hasEnum = hasEnum || is.string(p.value); - - valArr.push(p.value); - pfValArr.push(p.pfValue != null ? p.pfValue : p.value); - unitsArr.push(p.units); - } - - if (type.validate && !type.validate(valArr, unitsArr)) { - return null; - } - - if (type.singleEnum && hasEnum) { - if (valArr.length === 1 && is.string(valArr[0])) { - return { - name: name, - value: valArr[0], - strValue: valArr[0], - bypass: propIsBypass - }; - } else { - return null; - } - } - - return { - name: name, - value: valArr, - pfValue: pfValArr, - strValue: valArr.map(function (val, i) { - return val + (unitsArr[i] || ''); - }).join(' '), - bypass: propIsBypass, - units: unitsArr - }; - } - - // several types also allow enums - var checkEnums = function checkEnums() { - for (var _i = 0; _i < type.enums.length; _i++) { - var en = type.enums[_i]; - - if (en === value) { - return { - name: name, - value: value, - strValue: '' + value, - bypass: propIsBypass - }; - } - } - - return null; - }; - - // check the type and return the appropriate object - if (type.number) { - var units = void 0; - var implicitUnits = 'px'; // not set => px - - if (type.units) { - // use specified units if set - units = type.units; - } - - if (type.implicitUnits) { - implicitUnits = type.implicitUnits; - } - - if (!type.unitless) { - if (valueIsString) { - var unitsRegex = 'px|em' + (type.allowPercent ? '|\\%' : ''); - if (units) { - unitsRegex = units; - } // only allow explicit units if so set - var match = value.match('^(' + util.regex.number + ')(' + unitsRegex + ')?' + '$'); - - if (match) { - value = match[1]; - units = match[2] || implicitUnits; - } - } else if (!units || type.implicitUnits) { - units = implicitUnits; // implicitly px if unspecified - } - } - - value = parseFloat(value); - - // if not a number and enums not allowed, then the value is invalid - if (isNaN(value) && type.enums === undefined) { - return null; - } - - // check if this number type also accepts special keywords in place of numbers - // (i.e. `left`, `auto`, etc) - if (isNaN(value) && type.enums !== undefined) { - value = passedValue; - - return checkEnums(); - } - - // check if value must be an integer - if (type.integer && !is.integer(value)) { - return null; - } - - // check value is within range - if (type.min !== undefined && (value < type.min || type.strictMin && value === type.min) || type.max !== undefined && (value > type.max || type.strictMax && value === type.max)) { - return null; - } - - var ret = { - name: name, - value: value, - strValue: '' + value + (units ? units : ''), - units: units, - bypass: propIsBypass - }; - - // normalise value in pixels - if (type.unitless || units !== 'px' && units !== 'em') { - ret.pfValue = value; - } else { - ret.pfValue = units === 'px' || !units ? value : this.getEmSizeInPixels() * value; - } - - // normalise value in ms - if (units === 'ms' || units === 's') { - ret.pfValue = units === 'ms' ? value : 1000 * value; - } - - // normalise value in rad - if (units === 'deg' || units === 'rad') { - ret.pfValue = units === 'rad' ? value : math.deg2rad(value); - } - - // normalize value in % - if (units === '%') { - ret.pfValue = value / 100; - } - - return ret; - } else if (type.propList) { - - var props = []; - var propsStr = '' + value; - - if (propsStr === 'none') { - // leave empty - - } else { - // go over each prop - - var propsSplit = propsStr.split(','); - for (var _i2 = 0; _i2 < propsSplit.length; _i2++) { - var propName = propsSplit[_i2].trim(); - - if (self.properties[propName]) { - props.push(propName); - } - } - - if (props.length === 0) { - return null; - } - } - - return { - name: name, - value: props, - strValue: props.length === 0 ? 'none' : props.join(', '), - bypass: propIsBypass - }; - } else if (type.color) { - var tuple = util.color2tuple(value); - - if (!tuple) { - return null; - } - - return { - name: name, - value: tuple, - pfValue: tuple, - strValue: '' + value, - bypass: propIsBypass - }; - } else if (type.regex || type.regexes) { - - // first check enums - if (type.enums) { - var enumProp = checkEnums(); - - if (enumProp) { - return enumProp; - } - } - - var regexes = type.regexes ? type.regexes : [type.regex]; - - for (var _i3 = 0; _i3 < regexes.length; _i3++) { - var regex = new RegExp(regexes[_i3]); // make a regex from the type string - var m = regex.exec(value); - - if (m) { - // regex matches - return { - name: name, - value: type.singleRegexMatchValue ? m[1] : m, - strValue: '' + value, - bypass: propIsBypass - }; - } - } - - return null; // didn't match any - } else if (type.string) { - // just return - return { - name: name, - value: '' + value, - strValue: '' + value, - bypass: propIsBypass - }; - } else if (type.enums) { - // check enums last because it's a combo type in others - return checkEnums(); - } else { - return null; // not a type we can handle - } -}; - -module.exports = styfn; - -/***/ }), -/* 94 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var window = __webpack_require__(3); -var math = __webpack_require__(2); - -var corefn = { - - autolock: function autolock(bool) { - if (bool !== undefined) { - this._private.autolock = bool ? true : false; - } else { - return this._private.autolock; - } - - return this; // chaining - }, - - autoungrabify: function autoungrabify(bool) { - if (bool !== undefined) { - this._private.autoungrabify = bool ? true : false; - } else { - return this._private.autoungrabify; - } - - return this; // chaining - }, - - autounselectify: function autounselectify(bool) { - if (bool !== undefined) { - this._private.autounselectify = bool ? true : false; - } else { - return this._private.autounselectify; - } - - return this; // chaining - }, - - panningEnabled: function panningEnabled(bool) { - if (bool !== undefined) { - this._private.panningEnabled = bool ? true : false; - } else { - return this._private.panningEnabled; - } - - return this; // chaining - }, - - userPanningEnabled: function userPanningEnabled(bool) { - if (bool !== undefined) { - this._private.userPanningEnabled = bool ? true : false; - } else { - return this._private.userPanningEnabled; - } - - return this; // chaining - }, - - zoomingEnabled: function zoomingEnabled(bool) { - if (bool !== undefined) { - this._private.zoomingEnabled = bool ? true : false; - } else { - return this._private.zoomingEnabled; - } - - return this; // chaining - }, - - userZoomingEnabled: function userZoomingEnabled(bool) { - if (bool !== undefined) { - this._private.userZoomingEnabled = bool ? true : false; - } else { - return this._private.userZoomingEnabled; - } - - return this; // chaining - }, - - boxSelectionEnabled: function boxSelectionEnabled(bool) { - if (bool !== undefined) { - this._private.boxSelectionEnabled = bool ? true : false; - } else { - return this._private.boxSelectionEnabled; - } - - return this; // chaining - }, - - pan: function pan() { - var args = arguments; - var pan = this._private.pan; - var dim = void 0, - val = void 0, - dims = void 0, - x = void 0, - y = void 0; - - switch (args.length) { - case 0: - // .pan() - return pan; - - case 1: - - if (is.string(args[0])) { - // .pan('x') - dim = args[0]; - return pan[dim]; - } else if (is.plainObject(args[0])) { - // .pan({ x: 0, y: 100 }) - if (!this._private.panningEnabled) { - return this; - } - - dims = args[0]; - x = dims.x; - y = dims.y; - - if (is.number(x)) { - pan.x = x; - } - - if (is.number(y)) { - pan.y = y; - } - - this.emit('pan viewport'); - } - break; - - case 2: - // .pan('x', 100) - if (!this._private.panningEnabled) { - return this; - } - - dim = args[0]; - val = args[1]; - - if ((dim === 'x' || dim === 'y') && is.number(val)) { - pan[dim] = val; - } - - this.emit('pan viewport'); - break; - - default: - break; // invalid - } - - this.notify({ // notify the renderer that the viewport changed - type: 'viewport' - }); - - return this; // chaining - }, - - panBy: function panBy(arg0, arg1) { - var args = arguments; - var pan = this._private.pan; - var dim = void 0, - val = void 0, - dims = void 0, - x = void 0, - y = void 0; - - if (!this._private.panningEnabled) { - return this; - } - - switch (args.length) { - case 1: - - if (is.plainObject(arg0)) { - // .panBy({ x: 0, y: 100 }) - dims = args[0]; - x = dims.x; - y = dims.y; - - if (is.number(x)) { - pan.x += x; - } - - if (is.number(y)) { - pan.y += y; - } - - this.emit('pan viewport'); - } - break; - - case 2: - // .panBy('x', 100) - dim = arg0; - val = arg1; - - if ((dim === 'x' || dim === 'y') && is.number(val)) { - pan[dim] += val; - } - - this.emit('pan viewport'); - break; - - default: - break; // invalid - } - - this.notify({ // notify the renderer that the viewport changed - type: 'viewport' - }); - - return this; // chaining - }, - - fit: function fit(elements, padding) { - var viewportState = this.getFitViewport(elements, padding); - - if (viewportState) { - var _p = this._private; - _p.zoom = viewportState.zoom; - _p.pan = viewportState.pan; - - this.emit('pan zoom viewport'); - - this.notify({ // notify the renderer that the viewport changed - type: 'viewport' - }); - } - - return this; // chaining - }, - - getFitViewport: function getFitViewport(elements, padding) { - if (is.number(elements) && padding === undefined) { - // elements is optional - padding = elements; - elements = undefined; - } - - if (!this._private.panningEnabled || !this._private.zoomingEnabled) { - return; - } - - var bb = void 0; - - if (is.string(elements)) { - var sel = elements; - elements = this.$(sel); - } else if (is.boundingBox(elements)) { - // assume bb - var bbe = elements; - bb = { - x1: bbe.x1, - y1: bbe.y1, - x2: bbe.x2, - y2: bbe.y2 - }; - - bb.w = bb.x2 - bb.x1; - bb.h = bb.y2 - bb.y1; - } else if (!is.elementOrCollection(elements)) { - elements = this.mutableElements(); - } - - if (is.elementOrCollection(elements) && elements.empty()) { - return; - } // can't fit to nothing - - bb = bb || elements.boundingBox(); - - var w = this.width(); - var h = this.height(); - var zoom = void 0; - padding = is.number(padding) ? padding : 0; - - if (!isNaN(w) && !isNaN(h) && w > 0 && h > 0 && !isNaN(bb.w) && !isNaN(bb.h) && bb.w > 0 && bb.h > 0) { - zoom = Math.min((w - 2 * padding) / bb.w, (h - 2 * padding) / bb.h); - - // crop zoom - zoom = zoom > this._private.maxZoom ? this._private.maxZoom : zoom; - zoom = zoom < this._private.minZoom ? this._private.minZoom : zoom; - - var pan = { // now pan to middle - x: (w - zoom * (bb.x1 + bb.x2)) / 2, - y: (h - zoom * (bb.y1 + bb.y2)) / 2 - }; - - return { - zoom: zoom, - pan: pan - }; - } - - return; - }, - - minZoom: function minZoom(zoom) { - if (zoom === undefined) { - return this._private.minZoom; - } else if (is.number(zoom)) { - this._private.minZoom = zoom; - } - - return this; - }, - - maxZoom: function maxZoom(zoom) { - if (zoom === undefined) { - return this._private.maxZoom; - } else if (is.number(zoom)) { - this._private.maxZoom = zoom; - } - - return this; - }, - - getZoomedViewport: function getZoomedViewport(params) { - var _p = this._private; - var currentPan = _p.pan; - var currentZoom = _p.zoom; - var pos = void 0; // in rendered px - var zoom = void 0; - var bail = false; - - if (!_p.zoomingEnabled) { - // zooming disabled - bail = true; - } - - if (is.number(params)) { - // then set the zoom - zoom = params; - } else if (is.plainObject(params)) { - // then zoom about a point - zoom = params.level; - - if (params.position != null) { - pos = math.modelToRenderedPosition(params.position, currentZoom, currentPan); - } else if (params.renderedPosition != null) { - pos = params.renderedPosition; - } - - if (pos != null && !_p.panningEnabled) { - // panning disabled - bail = true; - } - } - - // crop zoom - zoom = zoom > _p.maxZoom ? _p.maxZoom : zoom; - zoom = zoom < _p.minZoom ? _p.minZoom : zoom; - - // can't zoom with invalid params - if (bail || !is.number(zoom) || zoom === currentZoom || pos != null && (!is.number(pos.x) || !is.number(pos.y))) { - return null; - } - - if (pos != null) { - // set zoom about position - var pan1 = currentPan; - var zoom1 = currentZoom; - var zoom2 = zoom; - - var pan2 = { - x: -zoom2 / zoom1 * (pos.x - pan1.x) + pos.x, - y: -zoom2 / zoom1 * (pos.y - pan1.y) + pos.y - }; - - return { - zoomed: true, - panned: true, - zoom: zoom2, - pan: pan2 - }; - } else { - // just set the zoom - return { - zoomed: true, - panned: false, - zoom: zoom, - pan: currentPan - }; - } - }, - - zoom: function zoom(params) { - if (params === undefined) { - // get - return this._private.zoom; - } else { - // set - var vp = this.getZoomedViewport(params); - var _p = this._private; - - if (vp == null || !vp.zoomed) { - return this; - } - - _p.zoom = vp.zoom; - - if (vp.panned) { - _p.pan.x = vp.pan.x; - _p.pan.y = vp.pan.y; - } - - this.emit('zoom' + (vp.panned ? ' pan' : '') + ' viewport'); - - this.notify({ // notify the renderer that the viewport changed - type: 'viewport' - }); - - return this; // chaining - } - }, - - viewport: function viewport(opts) { - var _p = this._private; - var zoomDefd = true; - var panDefd = true; - var events = []; // to trigger - var zoomFailed = false; - var panFailed = false; - - if (!opts) { - return this; - } - if (!is.number(opts.zoom)) { - zoomDefd = false; - } - if (!is.plainObject(opts.pan)) { - panDefd = false; - } - if (!zoomDefd && !panDefd) { - return this; - } - - if (zoomDefd) { - var z = opts.zoom; - - if (z < _p.minZoom || z > _p.maxZoom || !_p.zoomingEnabled) { - zoomFailed = true; - } else { - _p.zoom = z; - - events.push('zoom'); - } - } - - if (panDefd && (!zoomFailed || !opts.cancelOnFailedZoom) && _p.panningEnabled) { - var p = opts.pan; - - if (is.number(p.x)) { - _p.pan.x = p.x; - panFailed = false; - } - - if (is.number(p.y)) { - _p.pan.y = p.y; - panFailed = false; - } - - if (!panFailed) { - events.push('pan'); - } - } - - if (events.length > 0) { - events.push('viewport'); - this.emit(events.join(' ')); - - this.notify({ - type: 'viewport' - }); - } - - return this; // chaining - }, - - center: function center(elements) { - var pan = this.getCenterPan(elements); - - if (pan) { - this._private.pan = pan; - - this.emit('pan viewport'); - - this.notify({ // notify the renderer that the viewport changed - type: 'viewport' - }); - } - - return this; // chaining - }, - - getCenterPan: function getCenterPan(elements, zoom) { - if (!this._private.panningEnabled) { - return; - } - - if (is.string(elements)) { - var selector = elements; - elements = this.mutableElements().filter(selector); - } else if (!is.elementOrCollection(elements)) { - elements = this.mutableElements(); - } - - if (elements.length === 0) { - return; - } // can't centre pan to nothing - - var bb = elements.boundingBox(); - var w = this.width(); - var h = this.height(); - zoom = zoom === undefined ? this._private.zoom : zoom; - - var pan = { // middle - x: (w - zoom * (bb.x1 + bb.x2)) / 2, - y: (h - zoom * (bb.y1 + bb.y2)) / 2 - }; - - return pan; - }, - - reset: function reset() { - if (!this._private.panningEnabled || !this._private.zoomingEnabled) { - return this; - } - - this.viewport({ - pan: { x: 0, y: 0 }, - zoom: 1 - }); - - return this; // chaining - }, - - invalidateSize: function invalidateSize() { - this._private.sizeCache = null; - }, - - size: function size() { - var _p = this._private; - var container = _p.container; - - return _p.sizeCache = _p.sizeCache || (container ? function () { - var style = window.getComputedStyle(container); - var val = function val(name) { - return parseFloat(style.getPropertyValue(name)); - }; - - return { - width: container.clientWidth - val('padding-left') - val('padding-right'), - height: container.clientHeight - val('padding-top') - val('padding-bottom') - }; - }() : { // fallback if no container (not 0 b/c can be used for dividing etc) - width: 1, - height: 1 - }); - }, - - width: function width() { - return this.size().width; - }, - - height: function height() { - return this.size().height; - }, - - extent: function extent() { - var pan = this._private.pan; - var zoom = this._private.zoom; - var rb = this.renderedExtent(); - - var b = { - x1: (rb.x1 - pan.x) / zoom, - x2: (rb.x2 - pan.x) / zoom, - y1: (rb.y1 - pan.y) / zoom, - y2: (rb.y2 - pan.y) / zoom - }; - - b.w = b.x2 - b.x1; - b.h = b.y2 - b.y1; - - return b; - }, - - renderedExtent: function renderedExtent() { - var width = this.width(); - var height = this.height(); - - return { - x1: 0, - y1: 0, - x2: width, - y2: height, - w: width, - h: height - }; - } -}; - -// aliases -corefn.centre = corefn.center; - -// backwards compatibility -corefn.autolockNodes = corefn.autolock; -corefn.autoungrabifyNodes = corefn.autoungrabify; - -module.exports = corefn; - -/***/ }), -/* 95 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var define = __webpack_require__(4); -var Collection = __webpack_require__(7); -var Core = __webpack_require__(12); -var incExts = __webpack_require__(96); -var is = __webpack_require__(0); -var Emitter = __webpack_require__(11); - -// registered extensions to cytoscape, indexed by name -var extensions = {}; - -// registered modules for extensions, indexed by name -var modules = {}; - -function setExtension(type, name, registrant) { - - var ext = registrant; - - var overrideErr = function overrideErr(field) { - util.error('Can not register `' + name + '` for `' + type + '` since `' + field + '` already exists in the prototype and can not be overridden'); - }; - - if (type === 'core') { - if (Core.prototype[name]) { - return overrideErr(name); - } else { - Core.prototype[name] = registrant; - } - } else if (type === 'collection') { - if (Collection.prototype[name]) { - return overrideErr(name); - } else { - Collection.prototype[name] = registrant; - } - } else if (type === 'layout') { - // fill in missing layout functions in the prototype - - var Layout = function Layout(options) { - this.options = options; - - registrant.call(this, options); - - // make sure layout has _private for use w/ std apis like .on() - if (!is.plainObject(this._private)) { - this._private = {}; - } - - this._private.cy = options.cy; - this._private.listeners = []; - - this.createEmitter(); - }; - - var layoutProto = Layout.prototype = Object.create(registrant.prototype); - - var optLayoutFns = []; - - for (var i = 0; i < optLayoutFns.length; i++) { - var fnName = optLayoutFns[i]; - - layoutProto[fnName] = layoutProto[fnName] || function () { - return this; - }; - } - - // either .start() or .run() is defined, so autogen the other - if (layoutProto.start && !layoutProto.run) { - layoutProto.run = function () { - this.start();return this; - }; - } else if (!layoutProto.start && layoutProto.run) { - layoutProto.start = function () { - this.run();return this; - }; - } - - var regStop = registrant.prototype.stop; - layoutProto.stop = function () { - var opts = this.options; - - if (opts && opts.animate) { - var anis = this.animations; - - if (anis) { - for (var _i = 0; _i < anis.length; _i++) { - anis[_i].stop(); - } - } - } - - if (regStop) { - regStop.call(this); - } else { - this.emit('layoutstop'); - } - - return this; - }; - - if (!layoutProto.destroy) { - layoutProto.destroy = function () { - return this; - }; - } - - layoutProto.cy = function () { - return this._private.cy; - }; - - var getCy = function getCy(layout) { - return layout._private.cy; - }; - - util.assign(layoutProto, { - createEmitter: function createEmitter() { - this._private.emitter = new Emitter({ - eventFields: function eventFields(layout) { - return { - layout: layout, - cy: getCy(layout), - target: layout - }; - }, - bubble: function bubble() { - return true; - }, - parent: function parent(layout) { - return getCy(layout); - }, - context: this - }); - - return this; - }, - emitter: function emitter() { - return this._private.emitter; - }, - on: function on(evt, cb) { - this.emitter().on(evt, cb);return this; - }, - one: function one(evt, cb) { - this.emitter().one(evt, cb);return this; - }, - once: function once(evt, cb) { - this.emitter().one(evt, cb);return this; - }, - removeListener: function removeListener(evt, cb) { - this.emitter().removeListener(evt, cb);return this; - }, - emit: function emit(evt, params) { - this.emitter().emit(evt, params);return this; - } - }); - - define.eventAliasesOn(layoutProto); - - ext = Layout; // replace with our wrapped layout - } else if (type === 'renderer' && name !== 'null' && name !== 'base') { - // user registered renderers inherit from base - - var BaseRenderer = getExtension('renderer', 'base'); - var bProto = BaseRenderer.prototype; - var RegistrantRenderer = registrant; - var rProto = registrant.prototype; - - var Renderer = function Renderer() { - BaseRenderer.apply(this, arguments); - RegistrantRenderer.apply(this, arguments); - }; - - var proto = Renderer.prototype; - - for (var pName in bProto) { - var pVal = bProto[pName]; - var existsInR = rProto[pName] != null; - - if (existsInR) { - return overrideErr(pName); - } - - proto[pName] = pVal; // take impl from base - } - - for (var _pName in rProto) { - proto[_pName] = rProto[_pName]; // take impl from registrant - } - - bProto.clientFunctions.forEach(function (name) { - proto[name] = proto[name] || function () { - util.error('Renderer does not implement `renderer.' + name + '()` on its prototype'); - }; - }); - - ext = Renderer; - } - - return util.setMap({ - map: extensions, - keys: [type, name], - value: ext - }); -} - -function getExtension(type, name) { - return util.getMap({ - map: extensions, - keys: [type, name] - }); -} - -function setModule(type, name, moduleType, moduleName, registrant) { - return util.setMap({ - map: modules, - keys: [type, name, moduleType, moduleName], - value: registrant - }); -} - -function getModule(type, name, moduleType, moduleName) { - return util.getMap({ - map: modules, - keys: [type, name, moduleType, moduleName] - }); -} - -var extension = function extension() { - // e.g. extension('renderer', 'svg') - if (arguments.length === 2) { - return getExtension.apply(null, arguments); - } - - // e.g. extension('renderer', 'svg', { ... }) - else if (arguments.length === 3) { - return setExtension.apply(null, arguments); - } - - // e.g. extension('renderer', 'svg', 'nodeShape', 'ellipse') - else if (arguments.length === 4) { - return getModule.apply(null, arguments); - } - - // e.g. extension('renderer', 'svg', 'nodeShape', 'ellipse', { ... }) - else if (arguments.length === 5) { - return setModule.apply(null, arguments); - } else { - util.error('Invalid extension access syntax'); - } -}; - -// allows a core instance to access extensions internally -Core.prototype.extension = extension; - -// included extensions -incExts.forEach(function (group) { - group.extensions.forEach(function (ext) { - setExtension(group.type, ext.name, ext.impl); - }); -}); - -module.exports = extension; - -/***/ }), -/* 96 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = [{ - type: 'layout', - extensions: __webpack_require__(97) -}, { - type: 'renderer', - extensions: __webpack_require__(106) -}]; - -/***/ }), -/* 97 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = [{ name: 'breadthfirst', impl: __webpack_require__(98) }, { name: 'circle', impl: __webpack_require__(99) }, { name: 'concentric', impl: __webpack_require__(100) }, { name: 'cose', impl: __webpack_require__(101) }, { name: 'grid', impl: __webpack_require__(102) }, { name: 'null', impl: __webpack_require__(103) }, { name: 'preset', impl: __webpack_require__(104) }, { name: 'random', impl: __webpack_require__(105) }]; - -/***/ }), -/* 98 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var math = __webpack_require__(2); -var is = __webpack_require__(0); - -var defaults = { - fit: true, // whether to fit the viewport to the graph - directed: false, // whether the tree is directed downwards (or edges can point in any direction if false) - padding: 30, // padding on fit - circle: false, // put depths in concentric circles if true, put depths top down if false - spacingFactor: 1.75, // positive spacing factor, larger => more space between nodes (N.B. n/a if causes overlap) - boundingBox: undefined, // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h } - avoidOverlap: true, // prevents node overlap, may overflow boundingBox if not enough space - nodeDimensionsIncludeLabels: false, // Excludes the label when calculating node bounding boxes for the layout algorithm - roots: undefined, // the roots of the trees - maximalAdjustments: 0, // how many times to try to position the nodes in a maximal way (i.e. no backtracking) - animate: false, // whether to transition the node positions - animationDuration: 500, // duration of animation in ms if enabled - animationEasing: undefined, // easing of animation if enabled, - animateFilter: function animateFilter(node, i) { - return true; - }, // a function that determines whether the node should be animated. All nodes animated by default on animate enabled. Non-animated nodes are positioned immediately when the layout starts - ready: undefined, // callback on layoutready - stop: undefined, // callback on layoutstop - transform: function transform(node, position) { - return position; - } // transform a given node position. Useful for changing flow direction in discrete layouts -}; - -function BreadthFirstLayout(options) { - this.options = util.extend({}, defaults, options); -} - -BreadthFirstLayout.prototype.run = function () { - var params = this.options; - var options = params; - - var cy = params.cy; - var eles = options.eles; - var nodes = eles.nodes().not(':parent'); - var graph = eles; - - var bb = math.makeBoundingBox(options.boundingBox ? options.boundingBox : { - x1: 0, y1: 0, w: cy.width(), h: cy.height() - }); - - var roots = void 0; - if (is.elementOrCollection(options.roots)) { - roots = options.roots; - } else if (is.array(options.roots)) { - var rootsArray = []; - - for (var i = 0; i < options.roots.length; i++) { - var id = options.roots[i]; - var ele = cy.getElementById(id); - rootsArray.push(ele); - } - - roots = cy.collection(rootsArray); - } else if (is.string(options.roots)) { - roots = cy.$(options.roots); - } else { - if (options.directed) { - roots = nodes.roots(); - } else { - var components = []; - var unhandledNodes = nodes; - - var _loop = function _loop() { - var currComp = cy.collection(); - - eles.bfs({ - roots: unhandledNodes[0], - visit: function visit(node, edge, pNode, i, depth) { - currComp = currComp.add(node); - }, - directed: false - }); - - unhandledNodes = unhandledNodes.not(currComp); - components.push(currComp); - }; - - while (unhandledNodes.length > 0) { - _loop(); - } - - roots = cy.collection(); - - var _loop2 = function _loop2(_i) { - var comp = components[_i]; - var maxDegree = comp.maxDegree(false); - var compRoots = comp.filter(function (ele) { - return ele.degree(false) === maxDegree; - }); - - roots = roots.add(compRoots); - }; - - for (var _i = 0; _i < components.length; _i++) { - _loop2(_i); - } - } - } - - var depths = []; - var foundByBfs = {}; - var id2depth = {}; - var prevNode = {}; - var prevEdge = {}; - var successors = {}; - - // find the depths of the nodes - graph.bfs({ - roots: roots, - directed: options.directed, - visit: function visit(node, edge, pNode, i, depth) { - var ele = node[0]; - var id = ele.id(); - - if (!depths[depth]) { - depths[depth] = []; - } - - depths[depth].push(ele); - foundByBfs[id] = true; - id2depth[id] = depth; - prevNode[id] = pNode; - prevEdge[id] = edge; - - if (pNode) { - var prevId = pNode.id(); - var succ = successors[prevId] = successors[prevId] || []; - - succ.push(node); - } - } - }); - - // check for nodes not found by bfs - var orphanNodes = []; - for (var _i2 = 0; _i2 < nodes.length; _i2++) { - var _ele = nodes[_i2]; - - if (foundByBfs[_ele.id()]) { - continue; - } else { - orphanNodes.push(_ele); - } - } - - // assign orphan nodes a depth from their neighborhood - var maxChecks = orphanNodes.length * 3; - var checks = 0; - while (orphanNodes.length !== 0 && checks < maxChecks) { - var node = orphanNodes.shift(); - var neighbors = node.neighborhood().nodes(); - var assignedDepth = false; - - for (var _i3 = 0; _i3 < neighbors.length; _i3++) { - var depth = id2depth[neighbors[_i3].id()]; - - if (depth !== undefined) { - depths[depth].push(node); - assignedDepth = true; - break; - } - } - - if (!assignedDepth) { - orphanNodes.push(node); - } - - checks++; - } - - // assign orphan nodes that are still left to the depth of their subgraph - while (orphanNodes.length !== 0) { - var _node = orphanNodes.shift(); - //let subgraph = graph.bfs( node ).path; - var _assignedDepth = false; - - // for( let i = 0; i < subgraph.length; i++ ){ - // let depth = id2depth[ subgraph[i].id() ]; - - // if( depth !== undefined ){ - // depths[depth].push( node ); - // assignedDepth = true; - // break; - // } - // } - - if (!_assignedDepth) { - // worst case if the graph really isn't tree friendly, then just dump it in 0 - if (depths.length === 0) { - depths.push([]); - } - - depths[0].push(_node); - } - } - - // assign the nodes a depth and index - var assignDepthsToEles = function assignDepthsToEles() { - for (var _i4 = 0; _i4 < depths.length; _i4++) { - var _eles = depths[_i4]; - - for (var j = 0; j < _eles.length; j++) { - var _ele2 = _eles[j]; - - if (_ele2 == null) { - _eles.splice(j, 1); - j--; - continue; - } - - _ele2._private.scratch.breadthfirst = { - depth: _i4, - index: j - }; - } - } - }; - assignDepthsToEles(); - - var intersectsDepth = function intersectsDepth(node) { - // returns true if has edges pointing in from a higher depth - var edges = node.connectedEdges(function (ele) { - return ele.data('target') === node.id(); - }); - var thisInfo = node._private.scratch.breadthfirst; - var highestDepthOfOther = 0; - var highestOther = void 0; - for (var _i5 = 0; _i5 < edges.length; _i5++) { - var edge = edges[_i5]; - var otherNode = edge.source()[0]; - var otherInfo = otherNode._private.scratch.breadthfirst; - - if (thisInfo.depth <= otherInfo.depth && highestDepthOfOther < otherInfo.depth) { - highestDepthOfOther = otherInfo.depth; - highestOther = otherNode; - } - } - - return highestOther; - }; - - // make maximal if so set by adjusting depths - for (var adj = 0; adj < options.maximalAdjustments; adj++) { - - var nDepths = depths.length; - var elesToMove = []; - for (var _i6 = 0; _i6 < nDepths; _i6++) { - var _depth = depths[_i6]; - - var nDepth = _depth.length; - for (var j = 0; j < nDepth; j++) { - var _ele3 = _depth[j]; - var info = _ele3._private.scratch.breadthfirst; - var intEle = intersectsDepth(_ele3); - - if (intEle) { - info.intEle = intEle; - elesToMove.push(_ele3); - } - } - } - - for (var _i7 = 0; _i7 < elesToMove.length; _i7++) { - var _ele4 = elesToMove[_i7]; - var _info = _ele4._private.scratch.breadthfirst; - var _intEle = _info.intEle; - var intInfo = _intEle._private.scratch.breadthfirst; - - depths[_info.depth][_info.index] = null; // remove from old depth & index (create hole to be cleaned) - - // add to end of new depth - var newDepth = intInfo.depth + 1; - while (newDepth > depths.length - 1) { - depths.push([]); - } - depths[newDepth].push(_ele4); - - _info.depth = newDepth; - _info.index = depths[newDepth].length - 1; - } - - assignDepthsToEles(); - } - - // find min distance we need to leave between nodes - var minDistance = 0; - if (options.avoidOverlap) { - for (var _i8 = 0; _i8 < nodes.length; _i8++) { - var n = nodes[_i8]; - var nbb = n.layoutDimensions(options); - var w = nbb.w; - var h = nbb.h; - - minDistance = Math.max(minDistance, w, h); - } - } - - // get the weighted percent for an element based on its connectivity to other levels - var cachedWeightedPercent = {}; - var getWeightedPercent = function getWeightedPercent(ele) { - if (cachedWeightedPercent[ele.id()]) { - return cachedWeightedPercent[ele.id()]; - } - - var eleDepth = ele._private.scratch.breadthfirst.depth; - var neighbors = ele.neighborhood().nodes().not(':parent').intersection(nodes); - var percent = 0; - var samples = 0; - - for (var _i9 = 0; _i9 < neighbors.length; _i9++) { - var neighbor = neighbors[_i9]; - var bf = neighbor._private.scratch.breadthfirst; - var index = bf.index; - var _depth2 = bf.depth; - var _nDepth = depths[_depth2].length; - - if (eleDepth > _depth2 || eleDepth === 0) { - // only get influenced by elements above - percent += index / _nDepth; - samples++; - } - } - - samples = Math.max(1, samples); - percent = percent / samples; - - if (samples === 0) { - // so lone nodes have a "don't care" state in sorting - percent = undefined; - } - - cachedWeightedPercent[ele.id()] = percent; - return percent; - }; - - // rearrange the indices in each depth level based on connectivity - - var sortFn = function sortFn(a, b) { - var apct = getWeightedPercent(a); - var bpct = getWeightedPercent(b); - - return apct - bpct; - }; - - for (var times = 0; times < 3; times++) { - // do it a few times b/c the depths are dynamic and we want a more stable result - - for (var _i10 = 0; _i10 < depths.length; _i10++) { - depths[_i10] = depths[_i10].sort(sortFn); - } - assignDepthsToEles(); // and update - } - - var biggestDepthSize = 0; - for (var _i11 = 0; _i11 < depths.length; _i11++) { - biggestDepthSize = Math.max(depths[_i11].length, biggestDepthSize); - } - - var center = { - x: bb.x1 + bb.w / 2, - y: bb.x1 + bb.h / 2 - }; - - var getPosition = function getPosition(ele, isBottomDepth) { - var info = ele._private.scratch.breadthfirst; - var depth = info.depth; - var index = info.index; - var depthSize = depths[depth].length; - - var distanceX = Math.max(bb.w / (depthSize + 1), minDistance); - var distanceY = Math.max(bb.h / (depths.length + 1), minDistance); - var radiusStepSize = Math.min(bb.w / 2 / depths.length, bb.h / 2 / depths.length); - radiusStepSize = Math.max(radiusStepSize, minDistance); - - if (!options.circle) { - - var epos = { - x: center.x + (index + 1 - (depthSize + 1) / 2) * distanceX, - y: (depth + 1) * distanceY - }; - - if (isBottomDepth) { - return epos; - } - - // let succs = successors[ ele.id() ]; - // if( succs ){ - // epos.x = 0; - // - // for( let i = 0 ; i < succs.length; i++ ){ - // let spos = pos[ succs[i].id() ]; - // - // epos.x += spos.x; - // } - // - // epos.x /= succs.length; - // } else { - // //debugger; - // } - - return epos; - } else { - if (options.circle) { - var radius = radiusStepSize * depth + radiusStepSize - (depths.length > 0 && depths[0].length <= 3 ? radiusStepSize / 2 : 0); - var theta = 2 * Math.PI / depths[depth].length * index; - - if (depth === 0 && depths[0].length === 1) { - radius = 1; - } - - return { - x: center.x + radius * Math.cos(theta), - y: center.y + radius * Math.sin(theta) - }; - } else { - return { - x: center.x + (index + 1 - (depthSize + 1) / 2) * distanceX, - y: (depth + 1) * distanceY - }; - } - } - }; - - // get positions in reverse depth order - var pos = {}; - for (var _i12 = depths.length - 1; _i12 >= 0; _i12--) { - var _depth3 = depths[_i12]; - - for (var _j = 0; _j < _depth3.length; _j++) { - var _node2 = _depth3[_j]; - - pos[_node2.id()] = getPosition(_node2, _i12 === depths.length - 1); - } - } - - nodes.layoutPositions(this, options, function (node) { - return pos[node.id()]; - }); - - return this; // chaining -}; - -module.exports = BreadthFirstLayout; - -/***/ }), -/* 99 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var math = __webpack_require__(2); -var is = __webpack_require__(0); - -var defaults = { - fit: true, // whether to fit the viewport to the graph - padding: 30, // the padding on fit - boundingBox: undefined, // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h } - avoidOverlap: true, // prevents node overlap, may overflow boundingBox and radius if not enough space - nodeDimensionsIncludeLabels: false, // Excludes the label when calculating node bounding boxes for the layout algorithm - spacingFactor: undefined, // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up - radius: undefined, // the radius of the circle - startAngle: 3 / 2 * Math.PI, // where nodes start in radians - sweep: undefined, // how many radians should be between the first and last node (defaults to full circle) - clockwise: true, // whether the layout should go clockwise (true) or counterclockwise/anticlockwise (false) - sort: undefined, // a sorting function to order the nodes; e.g. function(a, b){ return a.data('weight') - b.data('weight') } - animate: false, // whether to transition the node positions - animationDuration: 500, // duration of animation in ms if enabled - animationEasing: undefined, // easing of animation if enabled - animateFilter: function animateFilter(node, i) { - return true; - }, // a function that determines whether the node should be animated. All nodes animated by default on animate enabled. Non-animated nodes are positioned immediately when the layout starts - ready: undefined, // callback on layoutready - stop: undefined, // callback on layoutstop - transform: function transform(node, position) { - return position; - } // transform a given node position. Useful for changing flow direction in discrete layouts - -}; - -function CircleLayout(options) { - this.options = util.extend({}, defaults, options); -} - -CircleLayout.prototype.run = function () { - var params = this.options; - var options = params; - - var cy = params.cy; - var eles = options.eles; - - var clockwise = options.counterclockwise !== undefined ? !options.counterclockwise : options.clockwise; - - var nodes = eles.nodes().not(':parent'); - - if (options.sort) { - nodes = nodes.sort(options.sort); - } - - var bb = math.makeBoundingBox(options.boundingBox ? options.boundingBox : { - x1: 0, y1: 0, w: cy.width(), h: cy.height() - }); - - var center = { - x: bb.x1 + bb.w / 2, - y: bb.y1 + bb.h / 2 - }; - - var sweep = options.sweep === undefined ? 2 * Math.PI - 2 * Math.PI / nodes.length : options.sweep; - var dTheta = sweep / Math.max(1, nodes.length - 1); - var r = void 0; - - var minDistance = 0; - for (var i = 0; i < nodes.length; i++) { - var n = nodes[i]; - var nbb = n.layoutDimensions(options); - var w = nbb.w; - var h = nbb.h; - - minDistance = Math.max(minDistance, w, h); - } - - if (is.number(options.radius)) { - r = options.radius; - } else if (nodes.length <= 1) { - r = 0; - } else { - r = Math.min(bb.h, bb.w) / 2 - minDistance; - } - - // calculate the radius - if (nodes.length > 1 && options.avoidOverlap) { - // but only if more than one node (can't overlap) - minDistance *= 1.75; // just to have some nice spacing - - var dcos = Math.cos(dTheta) - Math.cos(0); - var dsin = Math.sin(dTheta) - Math.sin(0); - var rMin = Math.sqrt(minDistance * minDistance / (dcos * dcos + dsin * dsin)); // s.t. no nodes overlapping - r = Math.max(rMin, r); - } - - var getPos = function getPos(ele, i) { - var theta = options.startAngle + i * dTheta * (clockwise ? 1 : -1); - - var rx = r * Math.cos(theta); - var ry = r * Math.sin(theta); - var pos = { - x: center.x + rx, - y: center.y + ry - }; - - return pos; - }; - - nodes.layoutPositions(this, options, getPos); - - return this; // chaining -}; - -module.exports = CircleLayout; - -/***/ }), -/* 100 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var math = __webpack_require__(2); - -var defaults = { - fit: true, // whether to fit the viewport to the graph - padding: 30, // the padding on fit - startAngle: 3 / 2 * Math.PI, // where nodes start in radians - sweep: undefined, // how many radians should be between the first and last node (defaults to full circle) - clockwise: true, // whether the layout should go clockwise (true) or counterclockwise/anticlockwise (false) - equidistant: false, // whether levels have an equal radial distance betwen them, may cause bounding box overflow - minNodeSpacing: 10, // min spacing between outside of nodes (used for radius adjustment) - boundingBox: undefined, // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h } - avoidOverlap: true, // prevents node overlap, may overflow boundingBox if not enough space - nodeDimensionsIncludeLabels: false, // Excludes the label when calculating node bounding boxes for the layout algorithm - height: undefined, // height of layout area (overrides container height) - width: undefined, // width of layout area (overrides container width) - spacingFactor: undefined, // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up - concentric: function concentric(node) { - // returns numeric value for each node, placing higher nodes in levels towards the centre - return node.degree(); - }, - levelWidth: function levelWidth(nodes) { - // the letiation of concentric values in each level - return nodes.maxDegree() / 4; - }, - animate: false, // whether to transition the node positions - animationDuration: 500, // duration of animation in ms if enabled - animationEasing: undefined, // easing of animation if enabled - animateFilter: function animateFilter(node, i) { - return true; - }, // a function that determines whether the node should be animated. All nodes animated by default on animate enabled. Non-animated nodes are positioned immediately when the layout starts - ready: undefined, // callback on layoutready - stop: undefined, // callback on layoutstop - transform: function transform(node, position) { - return position; - } // transform a given node position. Useful for changing flow direction in discrete layouts -}; - -function ConcentricLayout(options) { - this.options = util.extend({}, defaults, options); -} - -ConcentricLayout.prototype.run = function () { - var params = this.options; - var options = params; - - var clockwise = options.counterclockwise !== undefined ? !options.counterclockwise : options.clockwise; - - var cy = params.cy; - - var eles = options.eles; - var nodes = eles.nodes().not(':parent'); - - var bb = math.makeBoundingBox(options.boundingBox ? options.boundingBox : { - x1: 0, y1: 0, w: cy.width(), h: cy.height() - }); - - var center = { - x: bb.x1 + bb.w / 2, - y: bb.y1 + bb.h / 2 - }; - - var nodeValues = []; // { node, value } - var theta = options.startAngle; - var maxNodeSize = 0; - - for (var i = 0; i < nodes.length; i++) { - var node = nodes[i]; - var value = void 0; - - // calculate the node value - value = options.concentric(node); - nodeValues.push({ - value: value, - node: node - }); - - // for style mapping - node._private.scratch.concentric = value; - } - - // in case we used the `concentric` in style - nodes.updateStyle(); - - // calculate max size now based on potentially updated mappers - for (var _i = 0; _i < nodes.length; _i++) { - var _node = nodes[_i]; - var nbb = _node.layoutDimensions(options); - - maxNodeSize = Math.max(maxNodeSize, nbb.w, nbb.h); - } - - // sort node values in descreasing order - nodeValues.sort(function (a, b) { - return b.value - a.value; - }); - - var levelWidth = options.levelWidth(nodes); - - // put the values into levels - var levels = [[]]; - var currentLevel = levels[0]; - for (var _i2 = 0; _i2 < nodeValues.length; _i2++) { - var val = nodeValues[_i2]; - - if (currentLevel.length > 0) { - var diff = Math.abs(currentLevel[0].value - val.value); - - if (diff >= levelWidth) { - currentLevel = []; - levels.push(currentLevel); - } - } - - currentLevel.push(val); - } - - // create positions from levels - - var minDist = maxNodeSize + options.minNodeSpacing; // min dist between nodes - - if (!options.avoidOverlap) { - // then strictly constrain to bb - var firstLvlHasMulti = levels.length > 0 && levels[0].length > 1; - var maxR = Math.min(bb.w, bb.h) / 2 - minDist; - var rStep = maxR / (levels.length + firstLvlHasMulti ? 1 : 0); - - minDist = Math.min(minDist, rStep); - } - - // find the metrics for each level - var r = 0; - for (var _i3 = 0; _i3 < levels.length; _i3++) { - var level = levels[_i3]; - var sweep = options.sweep === undefined ? 2 * Math.PI - 2 * Math.PI / level.length : options.sweep; - var dTheta = level.dTheta = sweep / Math.max(1, level.length - 1); - - // calculate the radius - if (level.length > 1 && options.avoidOverlap) { - // but only if more than one node (can't overlap) - var dcos = Math.cos(dTheta) - Math.cos(0); - var dsin = Math.sin(dTheta) - Math.sin(0); - var rMin = Math.sqrt(minDist * minDist / (dcos * dcos + dsin * dsin)); // s.t. no nodes overlapping - - r = Math.max(rMin, r); - } - - level.r = r; - - r += minDist; - } - - if (options.equidistant) { - var rDeltaMax = 0; - var _r = 0; - - for (var _i4 = 0; _i4 < levels.length; _i4++) { - var _level = levels[_i4]; - var rDelta = _level.r - _r; - - rDeltaMax = Math.max(rDeltaMax, rDelta); - } - - _r = 0; - for (var _i5 = 0; _i5 < levels.length; _i5++) { - var _level2 = levels[_i5]; - - if (_i5 === 0) { - _r = _level2.r; - } - - _level2.r = _r; - - _r += rDeltaMax; - } - } - - // calculate the node positions - var pos = {}; // id => position - for (var _i6 = 0; _i6 < levels.length; _i6++) { - var _level3 = levels[_i6]; - var _dTheta = _level3.dTheta; - var _r2 = _level3.r; - - for (var j = 0; j < _level3.length; j++) { - var _val = _level3[j]; - var _theta = options.startAngle + (clockwise ? 1 : -1) * _dTheta * j; - - var p = { - x: center.x + _r2 * Math.cos(_theta), - y: center.y + _r2 * Math.sin(_theta) - }; - - pos[_val.node.id()] = p; - } - } - - // position the nodes - nodes.layoutPositions(this, options, function (ele) { - var id = ele.id(); - - return pos[id]; - }); - - return this; // chaining -}; - -module.exports = ConcentricLayout; - -/***/ }), -/* 101 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/* -The CoSE layout was written by Gerardo Huck. -https://www.linkedin.com/in/gerardohuck/ - -Based on the following article: -http://dl.acm.org/citation.cfm?id=1498047 - -Modifications tracked on Github. -*/ - -var util = __webpack_require__(1); -var math = __webpack_require__(2); -var is = __webpack_require__(0); -var Promise = __webpack_require__(5); - -var DEBUG; - -/** - * @brief : default layout options - */ -var defaults = { - // Called on `layoutready` - ready: function ready() {}, - - // Called on `layoutstop` - stop: function stop() {}, - - // Whether to animate while running the layout - // true : Animate continuously as the layout is running - // false : Just show the end result - // 'end' : Animate with the end result, from the initial positions to the end positions - animate: true, - - // Easing of the animation for animate:'end' - animationEasing: undefined, - - // The duration of the animation for animate:'end' - animationDuration: undefined, - - // A function that determines whether the node should be animated - // All nodes animated by default on animate enabled - // Non-animated nodes are positioned immediately when the layout starts - animateFilter: function animateFilter(node, i) { - return true; - }, - - // The layout animates only after this many milliseconds for animate:true - // (prevents flashing on fast runs) - animationThreshold: 250, - - // Number of iterations between consecutive screen positions update - // (0 -> only updated on the end) - refresh: 20, - - // Whether to fit the network view after when done - fit: true, - - // Padding on fit - padding: 30, - - // Constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h } - boundingBox: undefined, - - // Excludes the label when calculating node bounding boxes for the layout algorithm - nodeDimensionsIncludeLabels: false, - - // Randomize the initial positions of the nodes (true) or use existing positions (false) - randomize: false, - - // Extra spacing between components in non-compound graphs - componentSpacing: 40, - - // Node repulsion (non overlapping) multiplier - nodeRepulsion: function nodeRepulsion(node) { - return 2048; - }, - - // Node repulsion (overlapping) multiplier - nodeOverlap: 4, - - // Ideal edge (non nested) length - idealEdgeLength: function idealEdgeLength(edge) { - return 32; - }, - - // Divisor to compute edge forces - edgeElasticity: function edgeElasticity(edge) { - return 32; - }, - - // Nesting factor (multiplier) to compute ideal edge length for nested edges - nestingFactor: 1.2, - - // Gravity force (constant) - gravity: 1, - - // Maximum number of iterations to perform - numIter: 1000, - - // Initial temperature (maximum node displacement) - initialTemp: 1000, - - // Cooling factor (how the temperature is reduced between consecutive iterations - coolingFactor: 0.99, - - // Lower temperature threshold (below this point the layout will end) - minTemp: 1.0, - - // Pass a reference to weaver to use threads for calculations - weaver: false -}; - -/** - * @brief : constructor - * @arg options : object containing layout options - */ -function CoseLayout(options) { - this.options = util.extend({}, defaults, options); - - this.options.layout = this; -} - -/** - * @brief : runs the layout - */ -CoseLayout.prototype.run = function () { - var options = this.options; - var cy = options.cy; - var layout = this; - var thread = this.thread; - var Thread = options.weaver ? options.weaver.Thread : null; - - var falseThread = { // use false thread as polyfill - listeners: [], - on: function on(e, cb) { - this.listeners.push({ event: e, callback: cb }); - - return this; - }, - trigger: function trigger(e) { - if (is.string(e)) { - e = { type: e }; - } - - var matchesEvent = function matchesEvent(l) { - return l.event === e.type; - }; - var trigger = function trigger(l) { - l.callback(e); - }; - - this.listeners.filter(matchesEvent).forEach(trigger); - - return this; - }, - pass: function pass(data) { - this.pass = data; - - return this; - }, - run: function run(cb) { - var pass = this.pass; - - return new Promise(function (resolve) { - resolve(cb(pass)); - }); - }, - stop: function stop() { - return this; - }, - stopped: function stopped() { - return true; - } - }; - - function broadcast(message) { - // for false thread - var e = { type: 'message', message: message }; - - falseThread.trigger(e); - } - - if (!thread || thread.stopped()) { - thread = this.thread = Thread ? new Thread() : falseThread; - } - - layout.stopped = false; - - if (options.animate === true || options.animate === false) { - layout.emit({ type: 'layoutstart', layout: layout }); - } - - // Set DEBUG - Global variable - if (true === options.debug) { - DEBUG = true; - } else { - DEBUG = false; - } - - // Initialize layout info - var layoutInfo = createLayoutInfo(cy, layout, options); - - // Show LayoutInfo contents if debugging - if (DEBUG) { - printLayoutInfo(layoutInfo); - } - - // If required, randomize node positions - if (options.randomize) { - randomizePositions(layoutInfo, cy); - } - - var startTime = Date.now(); - var refreshRequested = false; - var refresh = function refresh(rOpts) { - rOpts = rOpts || {}; - - if (refreshRequested && !rOpts.next) { - return; - } - - if (!rOpts.force && Date.now() - startTime < options.animationThreshold) { - return; - } - - refreshRequested = true; - - util.requestAnimationFrame(function () { - refreshPositions(layoutInfo, cy, options); - - // Fit the graph if necessary - if (true === options.fit) { - cy.fit(options.padding); - } - - refreshRequested = false; - - if (rOpts.next) { - rOpts.next(); - } - }); - }; - - thread.on('message', function (e) { - var layoutNodes = e.message; - - layoutInfo.layoutNodes = layoutNodes; - refresh(); - }); - - thread.pass({ - layoutInfo: layoutInfo, - options: { - animate: options.animate, - refresh: options.refresh, - componentSpacing: options.componentSpacing, - nodeOverlap: options.nodeOverlap, - nestingFactor: options.nestingFactor, - gravity: options.gravity, - numIter: options.numIter, - initialTemp: options.initialTemp, - coolingFactor: options.coolingFactor, - minTemp: options.minTemp - } - }).run(function (pass) { - var layoutInfo = pass.layoutInfo; - var options = pass.options; - var stopped = false; - - /** - * @brief : Performs one iteration of the physical simulation - * @arg layoutInfo : LayoutInfo object already initialized - * @arg cy : Cytoscape object - * @arg options : Layout options - */ - var step = function step(layoutInfo, options, _step) { - // var s = "\n\n###############################"; - // s += "\nSTEP: " + step; - // s += "\n###############################\n"; - // logDebug(s); - - // Calculate node repulsions - calculateNodeForces(layoutInfo, options); - // Calculate edge forces - calculateEdgeForces(layoutInfo, options); - // Calculate gravity forces - calculateGravityForces(layoutInfo, options); - // Propagate forces from parent to child - propagateForces(layoutInfo, options); - // Update positions based on calculated forces - updatePositions(layoutInfo, options); - }; - - /** - * @brief : Computes the node repulsion forces - */ - var calculateNodeForces = function calculateNodeForces(layoutInfo, options) { - // Go through each of the graphs in graphSet - // Nodes only repel each other if they belong to the same graph - // var s = 'calculateNodeForces'; - // logDebug(s); - for (var i = 0; i < layoutInfo.graphSet.length; i++) { - var graph = layoutInfo.graphSet[i]; - var numNodes = graph.length; - - // s = "Set: " + graph.toString(); - // logDebug(s); - - // Now get all the pairs of nodes - // Only get each pair once, (A, B) = (B, A) - for (var j = 0; j < numNodes; j++) { - var node1 = layoutInfo.layoutNodes[layoutInfo.idToIndex[graph[j]]]; - - for (var k = j + 1; k < numNodes; k++) { - var node2 = layoutInfo.layoutNodes[layoutInfo.idToIndex[graph[k]]]; - - nodeRepulsion(node1, node2, layoutInfo, options); - } - } - } - }; - - var randomDistance = function randomDistance(max) { - return -max + 2 * max * Math.random(); - }; - - /** - * @brief : Compute the node repulsion forces between a pair of nodes - */ - var nodeRepulsion = function nodeRepulsion(node1, node2, layoutInfo, options) { - // var s = "Node repulsion. Node1: " + node1.id + " Node2: " + node2.id; - - var cmptId1 = node1.cmptId; - var cmptId2 = node2.cmptId; - - if (cmptId1 !== cmptId2 && !layoutInfo.isCompound) { - return; - } - - // Get direction of line connecting both node centers - var directionX = node2.positionX - node1.positionX; - var directionY = node2.positionY - node1.positionY; - var maxRandDist = 1; - // s += "\ndirectionX: " + directionX + ", directionY: " + directionY; - - // If both centers are the same, apply a random force - if (0 === directionX && 0 === directionY) { - directionX = randomDistance(maxRandDist); - directionY = randomDistance(maxRandDist); - } - - var overlap = nodesOverlap(node1, node2, directionX, directionY); - - if (overlap > 0) { - // s += "\nNodes DO overlap."; - // s += "\nOverlap: " + overlap; - // If nodes overlap, repulsion force is proportional - // to the overlap - var force = options.nodeOverlap * overlap; - - // Compute the module and components of the force vector - var distance = Math.sqrt(directionX * directionX + directionY * directionY); - // s += "\nDistance: " + distance; - var forceX = force * directionX / distance; - var forceY = force * directionY / distance; - } else { - // s += "\nNodes do NOT overlap."; - // If there's no overlap, force is inversely proportional - // to squared distance - - // Get clipping points for both nodes - var point1 = findClippingPoint(node1, directionX, directionY); - var point2 = findClippingPoint(node2, -1 * directionX, -1 * directionY); - - // Use clipping points to compute distance - var distanceX = point2.x - point1.x; - var distanceY = point2.y - point1.y; - var distanceSqr = distanceX * distanceX + distanceY * distanceY; - var distance = Math.sqrt(distanceSqr); - // s += "\nDistance: " + distance; - - // Compute the module and components of the force vector - var force = (node1.nodeRepulsion + node2.nodeRepulsion) / distanceSqr; - var forceX = force * distanceX / distance; - var forceY = force * distanceY / distance; - } - - // Apply force - if (!node1.isLocked) { - node1.offsetX -= forceX; - node1.offsetY -= forceY; - } - - if (!node2.isLocked) { - node2.offsetX += forceX; - node2.offsetY += forceY; - } - - // s += "\nForceX: " + forceX + " ForceY: " + forceY; - // logDebug(s); - - return; - }; - - /** - * @brief : Determines whether two nodes overlap or not - * @return : Amount of overlapping (0 => no overlap) - */ - var nodesOverlap = function nodesOverlap(node1, node2, dX, dY) { - - if (dX > 0) { - var overlapX = node1.maxX - node2.minX; - } else { - var overlapX = node2.maxX - node1.minX; - } - - if (dY > 0) { - var overlapY = node1.maxY - node2.minY; - } else { - var overlapY = node2.maxY - node1.minY; - } - - if (overlapX >= 0 && overlapY >= 0) { - return Math.sqrt(overlapX * overlapX + overlapY * overlapY); - } else { - return 0; - } - }; - - /** - * @brief : Finds the point in which an edge (direction dX, dY) intersects - * the rectangular bounding box of it's source/target node - */ - var findClippingPoint = function findClippingPoint(node, dX, dY) { - - // Shorcuts - var X = node.positionX; - var Y = node.positionY; - var H = node.height || 1; - var W = node.width || 1; - var dirSlope = dY / dX; - var nodeSlope = H / W; - - // var s = 'Computing clipping point of node ' + node.id + - // " . Height: " + H + ", Width: " + W + - // "\nDirection " + dX + ", " + dY; - // - // Compute intersection - var res = {}; - - // Case: Vertical direction (up) - if (0 === dX && 0 < dY) { - res.x = X; - // s += "\nUp direction"; - res.y = Y + H / 2; - - return res; - } - - // Case: Vertical direction (down) - if (0 === dX && 0 > dY) { - res.x = X; - res.y = Y + H / 2; - // s += "\nDown direction"; - - return res; - } - - // Case: Intersects the right border - if (0 < dX && -1 * nodeSlope <= dirSlope && dirSlope <= nodeSlope) { - res.x = X + W / 2; - res.y = Y + W * dY / 2 / dX; - // s += "\nRightborder"; - - return res; - } - - // Case: Intersects the left border - if (0 > dX && -1 * nodeSlope <= dirSlope && dirSlope <= nodeSlope) { - res.x = X - W / 2; - res.y = Y - W * dY / 2 / dX; - // s += "\nLeftborder"; - - return res; - } - - // Case: Intersects the top border - if (0 < dY && (dirSlope <= -1 * nodeSlope || dirSlope >= nodeSlope)) { - res.x = X + H * dX / 2 / dY; - res.y = Y + H / 2; - // s += "\nTop border"; - - return res; - } - - // Case: Intersects the bottom border - if (0 > dY && (dirSlope <= -1 * nodeSlope || dirSlope >= nodeSlope)) { - res.x = X - H * dX / 2 / dY; - res.y = Y - H / 2; - // s += "\nBottom border"; - - return res; - } - - // s += "\nClipping point found at " + res.x + ", " + res.y; - // logDebug(s); - return res; - }; - - /** - * @brief : Calculates all edge forces - */ - var calculateEdgeForces = function calculateEdgeForces(layoutInfo, options) { - // Iterate over all edges - for (var i = 0; i < layoutInfo.edgeSize; i++) { - // Get edge, source & target nodes - var edge = layoutInfo.layoutEdges[i]; - var sourceIx = layoutInfo.idToIndex[edge.sourceId]; - var source = layoutInfo.layoutNodes[sourceIx]; - var targetIx = layoutInfo.idToIndex[edge.targetId]; - var target = layoutInfo.layoutNodes[targetIx]; - - // Get direction of line connecting both node centers - var directionX = target.positionX - source.positionX; - var directionY = target.positionY - source.positionY; - - // If both centers are the same, do nothing. - // A random force has already been applied as node repulsion - if (0 === directionX && 0 === directionY) { - continue; - } - - // Get clipping points for both nodes - var point1 = findClippingPoint(source, directionX, directionY); - var point2 = findClippingPoint(target, -1 * directionX, -1 * directionY); - - var lx = point2.x - point1.x; - var ly = point2.y - point1.y; - var l = Math.sqrt(lx * lx + ly * ly); - - var force = Math.pow(edge.idealLength - l, 2) / edge.elasticity; - - if (0 !== l) { - var forceX = force * lx / l; - var forceY = force * ly / l; - } else { - var forceX = 0; - var forceY = 0; - } - - // Add this force to target and source nodes - if (!source.isLocked) { - source.offsetX += forceX; - source.offsetY += forceY; - } - - if (!target.isLocked) { - target.offsetX -= forceX; - target.offsetY -= forceY; - } - - // var s = 'Edge force between nodes ' + source.id + ' and ' + target.id; - // s += "\nDistance: " + l + " Force: (" + forceX + ", " + forceY + ")"; - // logDebug(s); - } - }; - - /** - * @brief : Computes gravity forces for all nodes - */ - var calculateGravityForces = function calculateGravityForces(layoutInfo, options) { - var distThreshold = 1; - - // var s = 'calculateGravityForces'; - // logDebug(s); - for (var i = 0; i < layoutInfo.graphSet.length; i++) { - var graph = layoutInfo.graphSet[i]; - var numNodes = graph.length; - - // s = "Set: " + graph.toString(); - // logDebug(s); - - // Compute graph center - if (0 === i) { - var centerX = layoutInfo.clientHeight / 2; - var centerY = layoutInfo.clientWidth / 2; - } else { - // Get Parent node for this graph, and use its position as center - var temp = layoutInfo.layoutNodes[layoutInfo.idToIndex[graph[0]]]; - var parent = layoutInfo.layoutNodes[layoutInfo.idToIndex[temp.parentId]]; - var centerX = parent.positionX; - var centerY = parent.positionY; - } - // s = "Center found at: " + centerX + ", " + centerY; - // logDebug(s); - - // Apply force to all nodes in graph - for (var j = 0; j < numNodes; j++) { - var node = layoutInfo.layoutNodes[layoutInfo.idToIndex[graph[j]]]; - // s = "Node: " + node.id; - - if (node.isLocked) { - continue; - } - - var dx = centerX - node.positionX; - var dy = centerY - node.positionY; - var d = Math.sqrt(dx * dx + dy * dy); - if (d > distThreshold) { - var fx = options.gravity * dx / d; - var fy = options.gravity * dy / d; - node.offsetX += fx; - node.offsetY += fy; - // s += ": Applied force: " + fx + ", " + fy; - } else {} - // s += ": skypped since it's too close to center"; - - // logDebug(s); - } - } - }; - - /** - * @brief : This function propagates the existing offsets from - * parent nodes to its descendents. - * @arg layoutInfo : layoutInfo Object - * @arg cy : cytoscape Object - * @arg options : Layout options - */ - var propagateForces = function propagateForces(layoutInfo, options) { - // Inline implementation of a queue, used for traversing the graph in BFS order - var queue = []; - var start = 0; // Points to the start the queue - var end = -1; // Points to the end of the queue - - // logDebug('propagateForces'); - - // Start by visiting the nodes in the root graph - queue.push.apply(queue, layoutInfo.graphSet[0]); - end += layoutInfo.graphSet[0].length; - - // Traverse the graph, level by level, - while (start <= end) { - // Get the node to visit and remove it from queue - var nodeId = queue[start++]; - var nodeIndex = layoutInfo.idToIndex[nodeId]; - var node = layoutInfo.layoutNodes[nodeIndex]; - var children = node.children; - - // We only need to process the node if it's compound - if (0 < children.length && !node.isLocked) { - var offX = node.offsetX; - var offY = node.offsetY; - - // var s = "Propagating offset from parent node : " + node.id + - // ". OffsetX: " + offX + ". OffsetY: " + offY; - // s += "\n Children: " + children.toString(); - // logDebug(s); - - for (var i = 0; i < children.length; i++) { - var childNode = layoutInfo.layoutNodes[layoutInfo.idToIndex[children[i]]]; - // Propagate offset - childNode.offsetX += offX; - childNode.offsetY += offY; - // Add children to queue to be visited - queue[++end] = children[i]; - } - - // Reset parent offsets - node.offsetX = 0; - node.offsetY = 0; - } - } - }; - - /** - * @brief : Updates the layout model positions, based on - * the accumulated forces - */ - var updatePositions = function updatePositions(layoutInfo, options) { - // var s = 'Updating positions'; - // logDebug(s); - - // Reset boundaries for compound nodes - for (var i = 0; i < layoutInfo.nodeSize; i++) { - var n = layoutInfo.layoutNodes[i]; - if (0 < n.children.length) { - // logDebug("Resetting boundaries of compound node: " + n.id); - n.maxX = undefined; - n.minX = undefined; - n.maxY = undefined; - n.minY = undefined; - } - } - - for (var i = 0; i < layoutInfo.nodeSize; i++) { - var n = layoutInfo.layoutNodes[i]; - if (0 < n.children.length || n.isLocked) { - // No need to set compound or locked node position - // logDebug("Skipping position update of node: " + n.id); - continue; - } - // s = "Node: " + n.id + " Previous position: (" + - // n.positionX + ", " + n.positionY + ")."; - - // Limit displacement in order to improve stability - var tempForce = limitForce(n.offsetX, n.offsetY, layoutInfo.temperature); - n.positionX += tempForce.x; - n.positionY += tempForce.y; - n.offsetX = 0; - n.offsetY = 0; - n.minX = n.positionX - n.width; - n.maxX = n.positionX + n.width; - n.minY = n.positionY - n.height; - n.maxY = n.positionY + n.height; - // s += " New Position: (" + n.positionX + ", " + n.positionY + ")."; - // logDebug(s); - - // Update ancestry boudaries - updateAncestryBoundaries(n, layoutInfo); - } - - // Update size, position of compund nodes - for (var i = 0; i < layoutInfo.nodeSize; i++) { - var n = layoutInfo.layoutNodes[i]; - if (0 < n.children.length && !n.isLocked) { - n.positionX = (n.maxX + n.minX) / 2; - n.positionY = (n.maxY + n.minY) / 2; - n.width = n.maxX - n.minX; - n.height = n.maxY - n.minY; - // s = "Updating position, size of compound node " + n.id; - // s += "\nPositionX: " + n.positionX + ", PositionY: " + n.positionY; - // s += "\nWidth: " + n.width + ", Height: " + n.height; - // logDebug(s); - } - } - }; - - /** - * @brief : Limits a force (forceX, forceY) to be not - * greater (in modulo) than max. - 8 Preserves force direction. - */ - var limitForce = function limitForce(forceX, forceY, max) { - // var s = "Limiting force: (" + forceX + ", " + forceY + "). Max: " + max; - var force = Math.sqrt(forceX * forceX + forceY * forceY); - - if (force > max) { - var res = { - x: max * forceX / force, - y: max * forceY / force - }; - } else { - var res = { - x: forceX, - y: forceY - }; - } - - // s += ".\nResult: (" + res.x + ", " + res.y + ")"; - // logDebug(s); - - return res; - }; - - /** - * @brief : Function used for keeping track of compound node - * sizes, since they should bound all their subnodes. - */ - var updateAncestryBoundaries = function updateAncestryBoundaries(node, layoutInfo) { - // var s = "Propagating new position/size of node " + node.id; - var parentId = node.parentId; - if (null == parentId) { - // If there's no parent, we are done - // s += ". No parent node."; - // logDebug(s); - return; - } - - // Get Parent Node - var p = layoutInfo.layoutNodes[layoutInfo.idToIndex[parentId]]; - var flag = false; - - // MaxX - if (null == p.maxX || node.maxX + p.padRight > p.maxX) { - p.maxX = node.maxX + p.padRight; - flag = true; - // s += "\nNew maxX for parent node " + p.id + ": " + p.maxX; - } - - // MinX - if (null == p.minX || node.minX - p.padLeft < p.minX) { - p.minX = node.minX - p.padLeft; - flag = true; - // s += "\nNew minX for parent node " + p.id + ": " + p.minX; - } - - // MaxY - if (null == p.maxY || node.maxY + p.padBottom > p.maxY) { - p.maxY = node.maxY + p.padBottom; - flag = true; - // s += "\nNew maxY for parent node " + p.id + ": " + p.maxY; - } - - // MinY - if (null == p.minY || node.minY - p.padTop < p.minY) { - p.minY = node.minY - p.padTop; - flag = true; - // s += "\nNew minY for parent node " + p.id + ": " + p.minY; - } - - // If updated boundaries, propagate changes upward - if (flag) { - // logDebug(s); - return updateAncestryBoundaries(p, layoutInfo); - } - - // s += ". No changes in boundaries/position of parent node " + p.id; - // logDebug(s); - return; - }; - - var separateComponents = function separateComponents(layutInfo, options) { - var nodes = layoutInfo.layoutNodes; - var components = []; - - for (var i = 0; i < nodes.length; i++) { - var node = nodes[i]; - var cid = node.cmptId; - var component = components[cid] = components[cid] || []; - - component.push(node); - } - - var totalA = 0; - - for (var i = 0; i < components.length; i++) { - var c = components[i]; - - if (!c) { - continue; - } - - c.x1 = Infinity; - c.x2 = -Infinity; - c.y1 = Infinity; - c.y2 = -Infinity; - - for (var j = 0; j < c.length; j++) { - var n = c[j]; - - c.x1 = Math.min(c.x1, n.positionX - n.width / 2); - c.x2 = Math.max(c.x2, n.positionX + n.width / 2); - c.y1 = Math.min(c.y1, n.positionY - n.height / 2); - c.y2 = Math.max(c.y2, n.positionY + n.height / 2); - } - - c.w = c.x2 - c.x1; - c.h = c.y2 - c.y1; - - totalA += c.w * c.h; - } - - components.sort(function (c1, c2) { - return c2.w * c2.h - c1.w * c1.h; - }); - - var x = 0; - var y = 0; - var usedW = 0; - var rowH = 0; - var maxRowW = Math.sqrt(totalA) * layoutInfo.clientWidth / layoutInfo.clientHeight; - - for (var i = 0; i < components.length; i++) { - var c = components[i]; - - if (!c) { - continue; - } - - for (var j = 0; j < c.length; j++) { - var n = c[j]; - - if (!n.isLocked) { - n.positionX += x; - n.positionY += y; - } - } - - x += c.w + options.componentSpacing; - usedW += c.w + options.componentSpacing; - rowH = Math.max(rowH, c.h); - - if (usedW > maxRowW) { - y += rowH + options.componentSpacing; - x = 0; - usedW = 0; - rowH = 0; - } - } - }; - - var mainLoop = function mainLoop(i) { - if (stopped) { - // logDebug("Layout manually stopped. Stopping computation in step " + i); - return false; - } - - // Do one step in the phisical simulation - step(layoutInfo, options, i); - - // Update temperature - layoutInfo.temperature = layoutInfo.temperature * options.coolingFactor; - // logDebug("New temperature: " + layoutInfo.temperature); - - if (layoutInfo.temperature < options.minTemp) { - // logDebug("Temperature drop below minimum threshold. Stopping computation in step " + i); - return false; - } - - return true; - }; - - var i = 0; - var loopRet; - - do { - var f = 0; - - while (f < options.refresh && i < options.numIter) { - var loopRet = mainLoop(i); - if (!loopRet) { - break; - } - - f++; - i++; - } - - if (options.animate === true) { - broadcast(layoutInfo.layoutNodes); // eslint-disable-line no-undef - } - } while (loopRet && i + 1 < options.numIter); - - separateComponents(layoutInfo, options); - - return layoutInfo; - }).then(function (layoutInfoUpdated) { - layoutInfo.layoutNodes = layoutInfoUpdated.layoutNodes; // get the positions - - thread.stop(); - done(); - }); - - var done = function done() { - if (options.animate === true || options.animate === false) { - refresh({ - force: true, - next: function next() { - // Layout has finished - layout.one('layoutstop', options.stop); - layout.emit({ type: 'layoutstop', layout: layout }); - } - }); - } else { - options.eles.nodes().layoutPositions(layout, options, function (node) { - var lnode = layoutInfo.layoutNodes[layoutInfo.idToIndex[node.data('id')]]; - - return { x: lnode.positionX, y: lnode.positionY }; - }); - } - }; - - return this; // chaining -}; - -/** - * @brief : called on continuous layouts to stop them before they finish - */ -CoseLayout.prototype.stop = function () { - this.stopped = true; - - if (this.thread) { - this.thread.stop(); - } - - this.emit('layoutstop'); - - return this; // chaining -}; - -CoseLayout.prototype.destroy = function () { - if (this.thread) { - this.thread.stop(); - } - - return this; // chaining -}; - -/** - * @brief : Creates an object which is contains all the data - * used in the layout process - * @arg cy : cytoscape.js object - * @return : layoutInfo object initialized - */ -var createLayoutInfo = function createLayoutInfo(cy, layout, options) { - // Shortcut - var edges = options.eles.edges(); - var nodes = options.eles.nodes(); - - var layoutInfo = { - isCompound: cy.hasCompoundNodes(), - layoutNodes: [], - idToIndex: {}, - nodeSize: nodes.size(), - graphSet: [], - indexToGraph: [], - layoutEdges: [], - edgeSize: edges.size(), - temperature: options.initialTemp, - clientWidth: cy.width(), - clientHeight: cy.width(), - boundingBox: math.makeBoundingBox(options.boundingBox ? options.boundingBox : { - x1: 0, y1: 0, w: cy.width(), h: cy.height() - }) - }; - - var components = options.eles.components(); - var id2cmptId = {}; - - for (var i = 0; i < components.length; i++) { - var component = components[i]; - - for (var j = 0; j < component.length; j++) { - var node = component[j]; - - id2cmptId[node.id()] = i; - } - } - - // Iterate over all nodes, creating layout nodes - for (var i = 0; i < layoutInfo.nodeSize; i++) { - var n = nodes[i]; - var nbb = n.layoutDimensions(options); - - var tempNode = {}; - tempNode.isLocked = n.locked(); - tempNode.id = n.data('id'); - tempNode.parentId = n.data('parent'); - tempNode.cmptId = id2cmptId[n.id()]; - tempNode.children = []; - tempNode.positionX = n.position('x'); - tempNode.positionY = n.position('y'); - tempNode.offsetX = 0; - tempNode.offsetY = 0; - tempNode.height = nbb.w; - tempNode.width = nbb.h; - tempNode.maxX = tempNode.positionX + tempNode.width / 2; - tempNode.minX = tempNode.positionX - tempNode.width / 2; - tempNode.maxY = tempNode.positionY + tempNode.height / 2; - tempNode.minY = tempNode.positionY - tempNode.height / 2; - tempNode.padLeft = parseFloat(n.style('padding')); - tempNode.padRight = parseFloat(n.style('padding')); - tempNode.padTop = parseFloat(n.style('padding')); - tempNode.padBottom = parseFloat(n.style('padding')); - - // forces - tempNode.nodeRepulsion = is.fn(options.nodeRepulsion) ? options.nodeRepulsion(n) : options.nodeRepulsion; - - // Add new node - layoutInfo.layoutNodes.push(tempNode); - // Add entry to id-index map - layoutInfo.idToIndex[tempNode.id] = i; - } - - // Inline implementation of a queue, used for traversing the graph in BFS order - var queue = []; - var start = 0; // Points to the start the queue - var end = -1; // Points to the end of the queue - - var tempGraph = []; - - // Second pass to add child information and - // initialize queue for hierarchical traversal - for (var i = 0; i < layoutInfo.nodeSize; i++) { - var n = layoutInfo.layoutNodes[i]; - var p_id = n.parentId; - // Check if node n has a parent node - if (null != p_id) { - // Add node Id to parent's list of children - layoutInfo.layoutNodes[layoutInfo.idToIndex[p_id]].children.push(n.id); - } else { - // If a node doesn't have a parent, then it's in the root graph - queue[++end] = n.id; - tempGraph.push(n.id); - } - } - - // Add root graph to graphSet - layoutInfo.graphSet.push(tempGraph); - - // Traverse the graph, level by level, - while (start <= end) { - // Get the node to visit and remove it from queue - var node_id = queue[start++]; - var node_ix = layoutInfo.idToIndex[node_id]; - var node = layoutInfo.layoutNodes[node_ix]; - var children = node.children; - if (children.length > 0) { - // Add children nodes as a new graph to graph set - layoutInfo.graphSet.push(children); - // Add children to que queue to be visited - for (var i = 0; i < children.length; i++) { - queue[++end] = children[i]; - } - } - } - - // Create indexToGraph map - for (var i = 0; i < layoutInfo.graphSet.length; i++) { - var graph = layoutInfo.graphSet[i]; - for (var j = 0; j < graph.length; j++) { - var index = layoutInfo.idToIndex[graph[j]]; - layoutInfo.indexToGraph[index] = i; - } - } - - // Iterate over all edges, creating Layout Edges - for (var i = 0; i < layoutInfo.edgeSize; i++) { - var e = edges[i]; - var tempEdge = {}; - tempEdge.id = e.data('id'); - tempEdge.sourceId = e.data('source'); - tempEdge.targetId = e.data('target'); - - // Compute ideal length - var idealLength = is.fn(options.idealEdgeLength) ? options.idealEdgeLength(e) : options.idealEdgeLength; - var elasticity = is.fn(options.edgeElasticity) ? options.edgeElasticity(e) : options.edgeElasticity; - - // Check if it's an inter graph edge - var sourceIx = layoutInfo.idToIndex[tempEdge.sourceId]; - var targetIx = layoutInfo.idToIndex[tempEdge.targetId]; - var sourceGraph = layoutInfo.indexToGraph[sourceIx]; - var targetGraph = layoutInfo.indexToGraph[targetIx]; - - if (sourceGraph != targetGraph) { - // Find lowest common graph ancestor - var lca = findLCA(tempEdge.sourceId, tempEdge.targetId, layoutInfo); - - // Compute sum of node depths, relative to lca graph - var lcaGraph = layoutInfo.graphSet[lca]; - var depth = 0; - - // Source depth - var tempNode = layoutInfo.layoutNodes[sourceIx]; - while (-1 === lcaGraph.indexOf(tempNode.id)) { - tempNode = layoutInfo.layoutNodes[layoutInfo.idToIndex[tempNode.parentId]]; - depth++; - } - - // Target depth - tempNode = layoutInfo.layoutNodes[targetIx]; - while (-1 === lcaGraph.indexOf(tempNode.id)) { - tempNode = layoutInfo.layoutNodes[layoutInfo.idToIndex[tempNode.parentId]]; - depth++; - } - - // logDebug('LCA of nodes ' + tempEdge.sourceId + ' and ' + tempEdge.targetId + - // ". Index: " + lca + " Contents: " + lcaGraph.toString() + - // ". Depth: " + depth); - - // Update idealLength - idealLength *= depth * options.nestingFactor; - } - - tempEdge.idealLength = idealLength; - tempEdge.elasticity = elasticity; - - layoutInfo.layoutEdges.push(tempEdge); - } - - // Finally, return layoutInfo object - return layoutInfo; -}; - -/** - * @brief : This function finds the index of the lowest common - * graph ancestor between 2 nodes in the subtree - * (from the graph hierarchy induced tree) whose - * root is graphIx - * - * @arg node1: node1's ID - * @arg node2: node2's ID - * @arg layoutInfo: layoutInfo object - * - */ -var findLCA = function findLCA(node1, node2, layoutInfo) { - // Find their common ancester, starting from the root graph - var res = findLCA_aux(node1, node2, 0, layoutInfo); - if (2 > res.count) { - // If aux function couldn't find the common ancester, - // then it is the root graph - return 0; - } else { - return res.graph; - } -}; - -/** - * @brief : Auxiliary function used for LCA computation - * - * @arg node1 : node1's ID - * @arg node2 : node2's ID - * @arg graphIx : subgraph index - * @arg layoutInfo : layoutInfo object - * - * @return : object of the form {count: X, graph: Y}, where: - * X is the number of ancesters (max: 2) found in - * graphIx (and it's subgraphs), - * Y is the graph index of the lowest graph containing - * all X nodes - */ -var findLCA_aux = function findLCA_aux(node1, node2, graphIx, layoutInfo) { - var graph = layoutInfo.graphSet[graphIx]; - // If both nodes belongs to graphIx - if (-1 < graph.indexOf(node1) && -1 < graph.indexOf(node2)) { - return { count: 2, graph: graphIx }; - } - - // Make recursive calls for all subgraphs - var c = 0; - for (var i = 0; i < graph.length; i++) { - var nodeId = graph[i]; - var nodeIx = layoutInfo.idToIndex[nodeId]; - var children = layoutInfo.layoutNodes[nodeIx].children; - - // If the node has no child, skip it - if (0 === children.length) { - continue; - } - - var childGraphIx = layoutInfo.indexToGraph[layoutInfo.idToIndex[children[0]]]; - var result = findLCA_aux(node1, node2, childGraphIx, layoutInfo); - if (0 === result.count) { - // Neither node1 nor node2 are present in this subgraph - continue; - } else if (1 === result.count) { - // One of (node1, node2) is present in this subgraph - c++; - if (2 === c) { - // We've already found both nodes, no need to keep searching - break; - } - } else { - // Both nodes are present in this subgraph - return result; - } - } - - return { count: c, graph: graphIx }; -}; - -/** - * @brief: printsLayoutInfo into js console - * Only used for debbuging - */ -var printLayoutInfo = function printLayoutInfo(layoutInfo) { - /* eslint-disable */ - - if (!DEBUG) { - return; - } - console.debug('layoutNodes:'); - for (var i = 0; i < layoutInfo.nodeSize; i++) { - var n = layoutInfo.layoutNodes[i]; - var s = '\nindex: ' + i + '\nId: ' + n.id + '\nChildren: ' + n.children.toString() + '\nparentId: ' + n.parentId + '\npositionX: ' + n.positionX + '\npositionY: ' + n.positionY + '\nOffsetX: ' + n.offsetX + '\nOffsetY: ' + n.offsetY + '\npadLeft: ' + n.padLeft + '\npadRight: ' + n.padRight + '\npadTop: ' + n.padTop + '\npadBottom: ' + n.padBottom; - - console.debug(s); - } - - console.debug('idToIndex'); - for (var i in layoutInfo.idToIndex) { - console.debug('Id: ' + i + '\nIndex: ' + layoutInfo.idToIndex[i]); - } - - console.debug('Graph Set'); - var set = layoutInfo.graphSet; - for (var i = 0; i < set.length; i++) { - console.debug('Set : ' + i + ': ' + set[i].toString()); - } - - var s = 'IndexToGraph'; - for (var i = 0; i < layoutInfo.indexToGraph.length; i++) { - s += '\nIndex : ' + i + ' Graph: ' + layoutInfo.indexToGraph[i]; - } - console.debug(s); - - s = 'Layout Edges'; - for (var i = 0; i < layoutInfo.layoutEdges.length; i++) { - var e = layoutInfo.layoutEdges[i]; - s += '\nEdge Index: ' + i + ' ID: ' + e.id + ' SouceID: ' + e.sourceId + ' TargetId: ' + e.targetId + ' Ideal Length: ' + e.idealLength; - } - console.debug(s); - - s = 'nodeSize: ' + layoutInfo.nodeSize; - s += '\nedgeSize: ' + layoutInfo.edgeSize; - s += '\ntemperature: ' + layoutInfo.temperature; - console.debug(s); - - return; - /* eslint-enable */ -}; - -/** - * @brief : Randomizes the position of all nodes - */ -var randomizePositions = function randomizePositions(layoutInfo, cy) { - var width = layoutInfo.clientWidth; - var height = layoutInfo.clientHeight; - - for (var i = 0; i < layoutInfo.nodeSize; i++) { - var n = layoutInfo.layoutNodes[i]; - - // No need to randomize compound nodes or locked nodes - if (0 === n.children.length && !n.isLocked) { - n.positionX = Math.random() * width; - n.positionY = Math.random() * height; - } - } -}; - -/** - * @brief : Updates the positions of nodes in the network - * @arg layoutInfo : LayoutInfo object - * @arg cy : Cytoscape object - * @arg options : Layout options - */ -var refreshPositions = function refreshPositions(layoutInfo, cy, options) { - // var s = 'Refreshing positions'; - // logDebug(s); - - var layout = options.layout; - var nodes = options.eles.nodes(); - var bb = layoutInfo.boundingBox; - var coseBB = { x1: Infinity, x2: -Infinity, y1: Infinity, y2: -Infinity }; - - if (options.boundingBox) { - nodes.forEach(function (node) { - var lnode = layoutInfo.layoutNodes[layoutInfo.idToIndex[node.data('id')]]; - - coseBB.x1 = Math.min(coseBB.x1, lnode.positionX); - coseBB.x2 = Math.max(coseBB.x2, lnode.positionX); - - coseBB.y1 = Math.min(coseBB.y1, lnode.positionY); - coseBB.y2 = Math.max(coseBB.y2, lnode.positionY); - }); - - coseBB.w = coseBB.x2 - coseBB.x1; - coseBB.h = coseBB.y2 - coseBB.y1; - } - - nodes.positions(function (ele, i) { - var lnode = layoutInfo.layoutNodes[layoutInfo.idToIndex[ele.data('id')]]; - // s = "Node: " + lnode.id + ". Refreshed position: (" + - // lnode.positionX + ", " + lnode.positionY + ")."; - // logDebug(s); - - if (options.boundingBox) { - // then add extra bounding box constraint - var pctX = (lnode.positionX - coseBB.x1) / coseBB.w; - var pctY = (lnode.positionY - coseBB.y1) / coseBB.h; - - return { - x: bb.x1 + pctX * bb.w, - y: bb.y1 + pctY * bb.h - }; - } else { - return { - x: lnode.positionX, - y: lnode.positionY - }; - } - }); - - // Trigger layoutReady only on first call - if (true !== layoutInfo.ready) { - // s = 'Triggering layoutready'; - // logDebug(s); - layoutInfo.ready = true; - layout.one('layoutready', options.ready); - layout.emit({ type: 'layoutready', layout: this }); - } -}; - -/** - * @brief : Logs a debug message in JS console, if DEBUG is ON - */ -// var logDebug = function(text) { -// if (DEBUG) { -// console.debug(text); -// } -// }; - -module.exports = CoseLayout; - -/***/ }), -/* 102 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var math = __webpack_require__(2); - -var defaults = { - fit: true, // whether to fit the viewport to the graph - padding: 30, // padding used on fit - boundingBox: undefined, // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h } - avoidOverlap: true, // prevents node overlap, may overflow boundingBox if not enough space - avoidOverlapPadding: 10, // extra spacing around nodes when avoidOverlap: true - nodeDimensionsIncludeLabels: false, // Excludes the label when calculating node bounding boxes for the layout algorithm - spacingFactor: undefined, // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up - condense: false, // uses all available space on false, uses minimal space on true - rows: undefined, // force num of rows in the grid - cols: undefined, // force num of columns in the grid - position: function position(node) {}, // returns { row, col } for element - sort: undefined, // a sorting function to order the nodes; e.g. function(a, b){ return a.data('weight') - b.data('weight') } - animate: false, // whether to transition the node positions - animationDuration: 500, // duration of animation in ms if enabled - animationEasing: undefined, // easing of animation if enabled - animateFilter: function animateFilter(node, i) { - return true; - }, // a function that determines whether the node should be animated. All nodes animated by default on animate enabled. Non-animated nodes are positioned immediately when the layout starts - ready: undefined, // callback on layoutready - stop: undefined, // callback on layoutstop - transform: function transform(node, position) { - return position; - } // transform a given node position. Useful for changing flow direction in discrete layouts -}; - -function GridLayout(options) { - this.options = util.extend({}, defaults, options); -} - -GridLayout.prototype.run = function () { - var params = this.options; - var options = params; - - var cy = params.cy; - var eles = options.eles; - var nodes = eles.nodes().not(':parent'); - - if (options.sort) { - nodes = nodes.sort(options.sort); - } - - var bb = math.makeBoundingBox(options.boundingBox ? options.boundingBox : { - x1: 0, y1: 0, w: cy.width(), h: cy.height() - }); - - if (bb.h === 0 || bb.w === 0) { - nodes.layoutPositions(this, options, function (ele) { - return { x: bb.x1, y: bb.y1 }; - }); - } else { - - // width/height * splits^2 = cells where splits is number of times to split width - var cells = nodes.size(); - var splits = Math.sqrt(cells * bb.h / bb.w); - var rows = Math.round(splits); - var cols = Math.round(bb.w / bb.h * splits); - - var small = function small(val) { - if (val == null) { - return Math.min(rows, cols); - } else { - var min = Math.min(rows, cols); - if (min == rows) { - rows = val; - } else { - cols = val; - } - } - }; - - var large = function large(val) { - if (val == null) { - return Math.max(rows, cols); - } else { - var max = Math.max(rows, cols); - if (max == rows) { - rows = val; - } else { - cols = val; - } - } - }; - - var oRows = options.rows; - var oCols = options.cols != null ? options.cols : options.columns; - - // if rows or columns were set in options, use those values - if (oRows != null && oCols != null) { - rows = oRows; - cols = oCols; - } else if (oRows != null && oCols == null) { - rows = oRows; - cols = Math.ceil(cells / rows); - } else if (oRows == null && oCols != null) { - cols = oCols; - rows = Math.ceil(cells / cols); - } - - // otherwise use the automatic values and adjust accordingly - - // if rounding was up, see if we can reduce rows or columns - else if (cols * rows > cells) { - var sm = small(); - var lg = large(); - - // reducing the small side takes away the most cells, so try it first - if ((sm - 1) * lg >= cells) { - small(sm - 1); - } else if ((lg - 1) * sm >= cells) { - large(lg - 1); - } - } else { - - // if rounding was too low, add rows or columns - while (cols * rows < cells) { - var _sm = small(); - var _lg = large(); - - // try to add to larger side first (adds less in multiplication) - if ((_lg + 1) * _sm >= cells) { - large(_lg + 1); - } else { - small(_sm + 1); - } - } - } - - var cellWidth = bb.w / cols; - var cellHeight = bb.h / rows; - - if (options.condense) { - cellWidth = 0; - cellHeight = 0; - } - - if (options.avoidOverlap) { - for (var i = 0; i < nodes.length; i++) { - var node = nodes[i]; - var pos = node._private.position; - - if (pos.x == null || pos.y == null) { - // for bb - pos.x = 0; - pos.y = 0; - } - - var nbb = node.layoutDimensions(options); - var p = options.avoidOverlapPadding; - - var w = nbb.w + p; - var h = nbb.h + p; - - cellWidth = Math.max(cellWidth, w); - cellHeight = Math.max(cellHeight, h); - } - } - - var cellUsed = {}; // e.g. 'c-0-2' => true - - var used = function used(row, col) { - return cellUsed['c-' + row + '-' + col] ? true : false; - }; - - var use = function use(row, col) { - cellUsed['c-' + row + '-' + col] = true; - }; - - // to keep track of current cell position - var row = 0; - var col = 0; - var moveToNextCell = function moveToNextCell() { - col++; - if (col >= cols) { - col = 0; - row++; - } - }; - - // get a cache of all the manual positions - var id2manPos = {}; - for (var _i = 0; _i < nodes.length; _i++) { - var _node = nodes[_i]; - var rcPos = options.position(_node); - - if (rcPos && (rcPos.row !== undefined || rcPos.col !== undefined)) { - // must have at least row or col def'd - var _pos = { - row: rcPos.row, - col: rcPos.col - }; - - if (_pos.col === undefined) { - // find unused col - _pos.col = 0; - - while (used(_pos.row, _pos.col)) { - _pos.col++; - } - } else if (_pos.row === undefined) { - // find unused row - _pos.row = 0; - - while (used(_pos.row, _pos.col)) { - _pos.row++; - } - } - - id2manPos[_node.id()] = _pos; - use(_pos.row, _pos.col); - } - } - - var getPos = function getPos(element, i) { - var x = void 0, - y = void 0; - - if (element.locked() || element.isParent()) { - return false; - } - - // see if we have a manual position set - var rcPos = id2manPos[element.id()]; - if (rcPos) { - x = rcPos.col * cellWidth + cellWidth / 2 + bb.x1; - y = rcPos.row * cellHeight + cellHeight / 2 + bb.y1; - } else { - // otherwise set automatically - - while (used(row, col)) { - moveToNextCell(); - } - - x = col * cellWidth + cellWidth / 2 + bb.x1; - y = row * cellHeight + cellHeight / 2 + bb.y1; - use(row, col); - - moveToNextCell(); - } - - return { x: x, y: y }; - }; - - nodes.layoutPositions(this, options, getPos); - } - - return this; // chaining -}; - -module.exports = GridLayout; - -/***/ }), -/* 103 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -// default layout options -var defaults = { - ready: function ready() {}, // on layoutready - stop: function stop() {} // on layoutstop -}; - -// constructor -// options : object containing layout options -function NullLayout(options) { - this.options = util.extend({}, defaults, options); -} - -// runs the layout -NullLayout.prototype.run = function () { - var options = this.options; - var eles = options.eles; // elements to consider in the layout - var layout = this; - - // cy is automatically populated for us in the constructor - var cy = options.cy; // jshint ignore:line - - layout.emit('layoutstart'); - - // puts all nodes at (0, 0) - eles.nodes().positions(function () { - return { - x: 0, - y: 0 - }; - }); - - // trigger layoutready when each node has had its position set at least once - layout.one('layoutready', options.ready); - layout.emit('layoutready'); - - // trigger layoutstop when the layout stops (e.g. finishes) - layout.one('layoutstop', options.stop); - layout.emit('layoutstop'); - - return this; // chaining -}; - -// called on continuous layouts to stop them before they finish -NullLayout.prototype.stop = function () { - return this; // chaining -}; - -module.exports = NullLayout; - -/***/ }), -/* 104 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var is = __webpack_require__(0); - -var defaults = { - positions: undefined, // map of (node id) => (position obj); or function(node){ return somPos; } - zoom: undefined, // the zoom level to set (prob want fit = false if set) - pan: undefined, // the pan level to set (prob want fit = false if set) - fit: true, // whether to fit to viewport - padding: 30, // padding on fit - animate: false, // whether to transition the node positions - animationDuration: 500, // duration of animation in ms if enabled - animationEasing: undefined, // easing of animation if enabled - animateFilter: function animateFilter(node, i) { - return true; - }, // a function that determines whether the node should be animated. All nodes animated by default on animate enabled. Non-animated nodes are positioned immediately when the layout starts - ready: undefined, // callback on layoutready - stop: undefined, // callback on layoutstop - transform: function transform(node, position) { - return position; - } // transform a given node position. Useful for changing flow direction in discrete layouts -}; - -function PresetLayout(options) { - this.options = util.extend({}, defaults, options); -} - -PresetLayout.prototype.run = function () { - var options = this.options; - var eles = options.eles; - - var nodes = eles.nodes(); - var posIsFn = is.fn(options.positions); - - function getPosition(node) { - if (options.positions == null) { - return null; - } - - if (posIsFn) { - return options.positions(node); - } - - var pos = options.positions[node._private.data.id]; - - if (pos == null) { - return null; - } - - return pos; - } - - nodes.layoutPositions(this, options, function (node, i) { - var position = getPosition(node); - - if (node.locked() || position == null) { - return false; - } - - return position; - }); - - return this; // chaining -}; - -module.exports = PresetLayout; - -/***/ }), -/* 105 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var math = __webpack_require__(2); - -var defaults = { - fit: true, // whether to fit to viewport - padding: 30, // fit padding - boundingBox: undefined, // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h } - animate: false, // whether to transition the node positions - animationDuration: 500, // duration of animation in ms if enabled - animationEasing: undefined, // easing of animation if enabled - animateFilter: function animateFilter(node, i) { - return true; - }, // a function that determines whether the node should be animated. All nodes animated by default on animate enabled. Non-animated nodes are positioned immediately when the layout starts - ready: undefined, // callback on layoutready - stop: undefined, // callback on layoutstop - transform: function transform(node, position) { - return position; - } // transform a given node position. Useful for changing flow direction in discrete layouts -}; - -function RandomLayout(options) { - this.options = util.extend({}, defaults, options); -} - -RandomLayout.prototype.run = function () { - var options = this.options; - var cy = options.cy; - var eles = options.eles; - var nodes = eles.nodes().not(':parent'); - - var bb = math.makeBoundingBox(options.boundingBox ? options.boundingBox : { - x1: 0, y1: 0, w: cy.width(), h: cy.height() - }); - - var getPos = function getPos(node, i) { - return { - x: bb.x1 + Math.round(Math.random() * bb.w), - y: bb.y1 + Math.round(Math.random() * bb.h) - }; - }; - - nodes.layoutPositions(this, options, getPos); - - return this; // chaining -}; - -module.exports = RandomLayout; - -/***/ }), -/* 106 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = [{ name: 'null', impl: __webpack_require__(107) }, { name: 'base', impl: __webpack_require__(108) }, { name: 'canvas', impl: __webpack_require__(124) }]; - -/***/ }), -/* 107 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -function NullRenderer(options) { - this.options = options; - this.notifications = 0; // for testing -} - -var noop = function noop() {}; - -NullRenderer.prototype = { - recalculateRenderedStyle: noop, - notify: function notify() { - this.notifications++; - }, - init: noop -}; - -module.exports = NullRenderer; - -/***/ }), -/* 108 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var window = __webpack_require__(3); - -var BaseRenderer = function BaseRenderer(options) { - this.init(options); -}; -var BR = BaseRenderer; -var BRp = BR.prototype; - -BRp.clientFunctions = ['redrawHint', 'render', 'renderTo', 'matchCanvasSize', 'nodeShapeImpl', 'arrowShapeImpl']; - -BRp.init = function (options) { - var r = this; - - r.options = options; - - r.cy = options.cy; - - var ctr = r.container = options.cy.container(); - - // prepend a stylesheet in the head such that - if (window) { - var document = window.document; - var head = document.head; - var stylesheetId = '__________cytoscape_stylesheet'; - var className = '__________cytoscape_container'; - var stylesheetAlreadyExists = document.getElementById(stylesheetId) != null; - - if (ctr.className.indexOf(className) < 0) { - ctr.className = (ctr.className || '') + ' ' + className; - } - - if (!stylesheetAlreadyExists) { - var stylesheet = document.createElement('style'); - - stylesheet.id = stylesheetId; - stylesheet.innerHTML = '.' + className + ' { position: relative; }'; - - head.insertBefore(stylesheet, head.children[0]); // first so lowest priority - } - - var computedStyle = window.getComputedStyle(ctr); - var position = computedStyle.getPropertyValue('position'); - - if (position === 'static') { - util.error('A Cytoscape container has style position:static and so can not use UI extensions properly'); - } - } - - r.selection = [undefined, undefined, undefined, undefined, 0]; // Coordinates for selection box, plus enabled flag - - r.bezierProjPcts = [0.05, 0.225, 0.4, 0.5, 0.6, 0.775, 0.95]; - - //--Pointer-related data - r.hoverData = { down: null, last: null, - downTime: null, triggerMode: null, - dragging: false, - initialPan: [null, null], capture: false }; - - r.dragData = { possibleDragElements: [] }; - - r.touchData = { - start: null, capture: false, - - // These 3 fields related to tap, taphold events - startPosition: [null, null, null, null, null, null], - singleTouchStartTime: null, - singleTouchMoved: true, - - now: [null, null, null, null, null, null], - earlier: [null, null, null, null, null, null] - }; - - r.redraws = 0; - r.showFps = options.showFps; - r.debug = options.debug; - - r.hideEdgesOnViewport = options.hideEdgesOnViewport; - r.hideLabelsOnViewport = options.hideLabelsOnViewport; - r.textureOnViewport = options.textureOnViewport; - r.wheelSensitivity = options.wheelSensitivity; - r.motionBlurEnabled = options.motionBlur; // on by default - r.forcedPixelRatio = options.pixelRatio; - r.motionBlur = options.motionBlur; // for initial kick off - r.motionBlurOpacity = options.motionBlurOpacity; - r.motionBlurTransparency = 1 - r.motionBlurOpacity; - r.motionBlurPxRatio = 1; - r.mbPxRBlurry = 1; //0.8; - r.minMbLowQualFrames = 4; - r.fullQualityMb = false; - r.clearedForMotionBlur = []; - r.desktopTapThreshold = options.desktopTapThreshold; - r.desktopTapThreshold2 = options.desktopTapThreshold * options.desktopTapThreshold; - r.touchTapThreshold = options.touchTapThreshold; - r.touchTapThreshold2 = options.touchTapThreshold * options.touchTapThreshold; - r.tapholdDuration = 500; - - r.bindings = []; - r.beforeRenderCallbacks = []; - r.beforeRenderPriorities = { // higher priority execs before lower one - animations: 400, - eleCalcs: 300, - eleTxrDeq: 200, - lyrTxrDeq: 100 - }; - - r.registerNodeShapes(); - r.registerArrowShapes(); - r.registerCalculationListeners(); -}; - -BRp.notify = function (params) { - var types; - var r = this; - - // the renderer can't be notified after it's destroyed - if (this.destroyed) { - return; - } - - if (is.array(params.type)) { - types = params.type; - } else { - types = [params.type]; - } - - var has = {}; - for (var i = 0; i < types.length; i++) { - var type = types[i]; - - has[type] = true; - } // for - - if (has['init']) { - r.load(); - return; - } - - if (has['destroy']) { - r.destroy(); - return; - } - - if (has['add'] || has['remove'] || has['load'] || has['zorder']) { - r.invalidateCachedZSortedEles(); - } - - if (has['viewport']) { - r.redrawHint('select', true); - } - - if (has['load'] || has['resize']) { - r.invalidateContainerClientCoordsCache(); - r.matchCanvasSize(r.container); - } - - r.redrawHint('eles', true); - r.redrawHint('drag', true); - - this.startRenderLoop(); - - this.redraw(); -}; - -BRp.destroy = function () { - var r = this; - - r.destroyed = true; - - r.cy.stopAnimationLoop(); - - for (var i = 0; i < r.bindings.length; i++) { - var binding = r.bindings[i]; - var b = binding; - var tgt = b.target; - - (tgt.off || tgt.removeEventListener).apply(tgt, b.args); - } - - r.bindings = []; - r.beforeRenderCallbacks = []; - r.onUpdateEleCalcsFns = []; - - if (r.removeObserver) { - r.removeObserver.disconnect(); - } - - if (r.styleObserver) { - r.styleObserver.disconnect(); - } - - if (r.labelCalcDiv) { - try { - document.body.removeChild(r.labelCalcDiv); // eslint-disable-line no-undef - } catch (e) { - // ie10 issue #1014 - } - } -}; - -[__webpack_require__(109), __webpack_require__(110), __webpack_require__(120), __webpack_require__(121), __webpack_require__(122), __webpack_require__(123)].forEach(function (props) { - util.extend(BRp, props); -}); - -module.exports = BR; - -/***/ }), -/* 109 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); -var is = __webpack_require__(0); -var util = __webpack_require__(1); - -var BRp = {}; - -BRp.arrowShapeWidth = 0.3; - -BRp.registerArrowShapes = function () { - var arrowShapes = this.arrowShapes = {}; - var renderer = this; - - // Contract for arrow shapes: - // 0, 0 is arrow tip - // (0, 1) is direction towards node - // (1, 0) is right - // - // functional api: - // collide: check x, y in shape - // roughCollide: called before collide, no false negatives - // draw: draw - // spacing: dist(arrowTip, nodeBoundary) - // gap: dist(edgeTip, nodeBoundary), edgeTip may != arrowTip - - var bbCollide = function bbCollide(x, y, size, angle, translation, edgeWidth, padding) { - var x1 = translation.x - size / 2 - padding; - var x2 = translation.x + size / 2 + padding; - var y1 = translation.y - size / 2 - padding; - var y2 = translation.y + size / 2 + padding; - - var inside = x1 <= x && x <= x2 && y1 <= y && y <= y2; - - return inside; - }; - - var transform = function transform(x, y, size, angle, translation) { - var xRotated = x * Math.cos(angle) - y * Math.sin(angle); - var yRotated = x * Math.sin(angle) + y * Math.cos(angle); - - var xScaled = xRotated * size; - var yScaled = yRotated * size; - - var xTranslated = xScaled + translation.x; - var yTranslated = yScaled + translation.y; - - return { - x: xTranslated, - y: yTranslated - }; - }; - - var transformPoints = function transformPoints(pts, size, angle, translation) { - var retPts = []; - - for (var i = 0; i < pts.length; i += 2) { - var x = pts[i]; - var y = pts[i + 1]; - - retPts.push(transform(x, y, size, angle, translation)); - } - - return retPts; - }; - - var pointsToArr = function pointsToArr(pts) { - var ret = []; - - for (var i = 0; i < pts.length; i++) { - var p = pts[i]; - - ret.push(p.x, p.y); - } - - return ret; - }; - - var standardGap = function standardGap(edge) { - return edge.pstyle('width').pfValue * edge.pstyle('arrow-scale').pfValue * 2; - }; - - var defineArrowShape = function defineArrowShape(name, defn) { - if (is.string(defn)) { - defn = arrowShapes[defn]; - } - - arrowShapes[name] = util.extend({ - name: name, - - points: [-0.15, -0.3, 0.15, -0.3, 0.15, 0.3, -0.15, 0.3], - - collide: function collide(x, y, size, angle, translation, padding) { - var points = pointsToArr(transformPoints(this.points, size + 2 * padding, angle, translation)); - var inside = math.pointInsidePolygonPoints(x, y, points); - - return inside; - }, - - roughCollide: bbCollide, - - draw: function draw(context, size, angle, translation) { - var points = transformPoints(this.points, size, angle, translation); - - renderer.arrowShapeImpl('polygon')(context, points); - }, - - spacing: function spacing(edge) { - return 0; - }, - - gap: standardGap - }, defn); - }; - - defineArrowShape('none', { - collide: util.falsify, - - roughCollide: util.falsify, - - draw: util.noop, - - spacing: util.zeroify, - - gap: util.zeroify - }); - - defineArrowShape('triangle', { - points: [-0.15, -0.3, 0, 0, 0.15, -0.3] - }); - - defineArrowShape('arrow', 'triangle'); - - defineArrowShape('triangle-backcurve', { - points: arrowShapes['triangle'].points, - - controlPoint: [0, -0.15], - - roughCollide: bbCollide, - - draw: function draw(context, size, angle, translation, edgeWidth) { - var ptsTrans = transformPoints(this.points, size, angle, translation); - var ctrlPt = this.controlPoint; - var ctrlPtTrans = transform(ctrlPt[0], ctrlPt[1], size, angle, translation); - - renderer.arrowShapeImpl(this.name)(context, ptsTrans, ctrlPtTrans); - }, - - gap: function gap(edge) { - return standardGap(edge) * 0.8; - } - }); - - defineArrowShape('triangle-tee', { - points: [-0.15, -0.3, 0, 0, 0.15, -0.3, -0.15, -0.3], - - pointsTee: [-0.15, -0.4, -0.15, -0.5, 0.15, -0.5, 0.15, -0.4], - - collide: function collide(x, y, size, angle, translation, edgeWidth, padding) { - var triPts = pointsToArr(transformPoints(this.points, size + 2 * padding, angle, translation)); - var teePts = pointsToArr(transformPoints(this.pointsTee, size + 2 * padding, angle, translation)); - - var inside = math.pointInsidePolygonPoints(x, y, triPts) || math.pointInsidePolygonPoints(x, y, teePts); - - return inside; - }, - - draw: function draw(context, size, angle, translation, edgeWidth) { - var triPts = transformPoints(this.points, size, angle, translation); - var teePts = transformPoints(this.pointsTee, size, angle, translation); - - renderer.arrowShapeImpl(this.name)(context, triPts, teePts); - } - }); - - defineArrowShape('triangle-cross', { - points: [-0.15, -0.3, 0, 0, 0.15, -0.3, -0.15, -0.3], - - baseCrossLinePts: [-0.15, -0.4, // first half of the rectangle - -0.15, -0.4, 0.15, -0.4, // second half of the rectangle - 0.15, -0.4], - - crossLinePts: function crossLinePts(size, edgeWidth) { - // shift points so that the distance between the cross points matches edge width - var p = this.baseCrossLinePts.slice(); - var shiftFactor = edgeWidth / size; - var y0 = 3; - var y1 = 5; - - p[y0] = p[y0] - shiftFactor; - p[y1] = p[y1] - shiftFactor; - - return p; - }, - - collide: function collide(x, y, size, angle, translation, edgeWidth, padding) { - var triPts = pointsToArr(transformPoints(this.points, size + 2 * padding, angle, translation)); - var teePts = pointsToArr(transformPoints(this.crossLinePts(size, edgeWidth), size + 2 * padding, angle, translation)); - var inside = math.pointInsidePolygonPoints(x, y, triPts) || math.pointInsidePolygonPoints(x, y, teePts); - - return inside; - }, - - draw: function draw(context, size, angle, translation, edgeWidth) { - var triPts = transformPoints(this.points, size, angle, translation); - var crossLinePts = transformPoints(this.crossLinePts(size, edgeWidth), size, angle, translation); - - renderer.arrowShapeImpl(this.name)(context, triPts, crossLinePts); - } - }); - - defineArrowShape('vee', { - points: [-0.15, -0.3, 0, 0, 0.15, -0.3, 0, -0.15], - - gap: function gap(edge) { - return standardGap(edge) * 0.525; - } - }); - - defineArrowShape('circle', { - radius: 0.15, - - collide: function collide(x, y, size, angle, translation, edgeWidth, padding) { - var t = translation; - var inside = Math.pow(t.x - x, 2) + Math.pow(t.y - y, 2) <= Math.pow((size + 2 * padding) * this.radius, 2); - - return inside; - }, - - draw: function draw(context, size, angle, translation, edgeWidth) { - renderer.arrowShapeImpl(this.name)(context, translation.x, translation.y, this.radius * size); - }, - - spacing: function spacing(edge) { - return renderer.getArrowWidth(edge.pstyle('width').pfValue, edge.pstyle('arrow-scale').value) * this.radius; - } - }); - - defineArrowShape('tee', { - points: [-0.15, 0, -0.15, -0.1, 0.15, -0.1, 0.15, 0], - - spacing: function spacing(edge) { - return 1; - }, - - gap: function gap(edge) { - return 1; - } - }); - - defineArrowShape('square', { - points: [-0.15, 0.00, 0.15, 0.00, 0.15, -0.3, -0.15, -0.3] - }); - - defineArrowShape('diamond', { - points: [-0.15, -0.15, 0, -0.3, 0.15, -0.15, 0, 0], - - gap: function gap(edge) { - return edge.pstyle('width').pfValue * edge.pstyle('arrow-scale').value; - } - }); -}; - -module.exports = BRp; - -/***/ }), -/* 110 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var BRp = {}; - -[__webpack_require__(111), __webpack_require__(112), __webpack_require__(113), __webpack_require__(114), __webpack_require__(115), __webpack_require__(116), __webpack_require__(117), __webpack_require__(118), __webpack_require__(119)].forEach(function (props) { - util.extend(BRp, props); -}); - -module.exports = BRp; - -/***/ }), -/* 111 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var window = __webpack_require__(3); -var math = __webpack_require__(2); -var util = __webpack_require__(1); -var window = __webpack_require__(3); - -var BRp = {}; - -// Project mouse -BRp.projectIntoViewport = function (clientX, clientY) { - var cy = this.cy; - var offsets = this.findContainerClientCoords(); - var offsetLeft = offsets[0]; - var offsetTop = offsets[1]; - var scale = offsets[4]; - var pan = cy.pan(); - var zoom = cy.zoom(); - - var x = ((clientX - offsetLeft) / scale - pan.x) / zoom; - var y = ((clientY - offsetTop) / scale - pan.y) / zoom; - - return [x, y]; -}; - -BRp.findContainerClientCoords = function () { - if (this.containerBB) { - return this.containerBB; - } - - var container = this.container; - var rect = container.getBoundingClientRect(); - var style = window.getComputedStyle(container); - var styleValue = function styleValue(name) { - return parseFloat(style.getPropertyValue(name)); - }; - - var padding = { - left: styleValue('padding-left'), - right: styleValue('padding-right'), - top: styleValue('padding-top'), - bottom: styleValue('padding-bottom') - }; - - var border = { - left: styleValue('border-left-width'), - right: styleValue('border-right-width'), - top: styleValue('border-top-width'), - bottom: styleValue('border-bottom-width') - }; - - var clientWidth = container.clientWidth; - var clientHeight = container.clientHeight; - - var paddingHor = padding.left + padding.right; - var paddingVer = padding.top + padding.bottom; - - var borderHor = border.left + border.right; - var borderVer = border.top + border.bottom; - - var scale = rect.width / (clientWidth + borderHor); - - var unscaledW = clientWidth - paddingHor; - var unscaledH = clientHeight - paddingVer; - - var scaledW = rect.width - (paddingHor + borderHor) * scale; - var scaledH = rect.height - (paddingVer + borderVer) * scale; - - var left = rect.left + padding.left + border.left; - var top = rect.top + padding.top + border.top; - - return this.containerBB = [left, top, unscaledW, unscaledH, scale]; -}; - -BRp.invalidateContainerClientCoordsCache = function () { - this.containerBB = null; -}; - -BRp.findNearestElement = function (x, y, interactiveElementsOnly, isTouch) { - return this.findNearestElements(x, y, interactiveElementsOnly, isTouch)[0]; -}; - -BRp.findNearestElements = function (x, y, interactiveElementsOnly, isTouch) { - var self = this; - var r = this; - var eles = r.getCachedZSortedEles(); - var near = []; // 1 node max, 1 edge max - var zoom = r.cy.zoom(); - var hasCompounds = r.cy.hasCompoundNodes(); - var edgeThreshold = (isTouch ? 24 : 8) / zoom; - var nodeThreshold = (isTouch ? 8 : 2) / zoom; - var labelThreshold = (isTouch ? 8 : 2) / zoom; - var minSqDist = Infinity; - var nearEdge; - var nearNode; - - if (interactiveElementsOnly) { - eles = eles.interactive; - } - - function addEle(ele, sqDist) { - if (ele.isNode()) { - if (nearNode) { - return; // can't replace node - } else { - nearNode = ele; - near.push(ele); - } - } - - if (ele.isEdge() && (sqDist == null || sqDist < minSqDist)) { - if (nearEdge) { - // then replace existing edge - // can replace only if same z-index - if (nearEdge.pstyle('z-compound-depth').value === ele.pstyle('z-compound-depth').value && nearEdge.pstyle('z-compound-depth').value === ele.pstyle('z-compound-depth').value) { - for (var i = 0; i < near.length; i++) { - if (near[i].isEdge()) { - near[i] = ele; - nearEdge = ele; - minSqDist = sqDist != null ? sqDist : minSqDist; - break; - } - } - } - } else { - near.push(ele); - nearEdge = ele; - minSqDist = sqDist != null ? sqDist : minSqDist; - } - } - } - - function checkNode(node) { - var width = node.outerWidth() + 2 * nodeThreshold; - var height = node.outerHeight() + 2 * nodeThreshold; - var hw = width / 2; - var hh = height / 2; - var pos = node.position(); - - if (pos.x - hw <= x && x <= pos.x + hw // bb check x - && pos.y - hh <= y && y <= pos.y + hh // bb check y - ) { - var shape = r.nodeShapes[self.getNodeShape(node)]; - - if (shape.checkPoint(x, y, 0, width, height, pos.x, pos.y)) { - addEle(node, 0); - return true; - } - } - } - - function checkEdge(edge) { - var _p = edge._private; - - var rs = _p.rscratch; - var styleWidth = edge.pstyle('width').pfValue; - var scale = edge.pstyle('arrow-scale').value; - var width = styleWidth / 2 + edgeThreshold; // more like a distance radius from centre - var widthSq = width * width; - var width2 = width * 2; - var src = _p.source; - var tgt = _p.target; - var inEdgeBB = false; - var sqDist; - - if (rs.edgeType === 'segments' || rs.edgeType === 'straight' || rs.edgeType === 'haystack') { - var pts = rs.allpts; - - for (var i = 0; i + 3 < pts.length; i += 2) { - if ((inEdgeBB = math.inLineVicinity(x, y, pts[i], pts[i + 1], pts[i + 2], pts[i + 3], width2)) && widthSq > (sqDist = math.sqdistToFiniteLine(x, y, pts[i], pts[i + 1], pts[i + 2], pts[i + 3]))) { - addEle(edge, sqDist); - return true; - } - } - } else if (rs.edgeType === 'bezier' || rs.edgeType === 'multibezier' || rs.edgeType === 'self' || rs.edgeType === 'compound') { - var pts = rs.allpts; - for (var i = 0; i + 5 < rs.allpts.length; i += 4) { - if ((inEdgeBB = math.inBezierVicinity(x, y, pts[i], pts[i + 1], pts[i + 2], pts[i + 3], pts[i + 4], pts[i + 5], width2)) && widthSq > (sqDist = math.sqdistToQuadraticBezier(x, y, pts[i], pts[i + 1], pts[i + 2], pts[i + 3], pts[i + 4], pts[i + 5]))) { - addEle(edge, sqDist); - return true; - } - } - } - - // if we're close to the edge but didn't hit it, maybe we hit its arrows - - var src = src || _p.source; - var tgt = tgt || _p.target; - - var arSize = self.getArrowWidth(styleWidth, scale); - - var arrows = [{ name: 'source', x: rs.arrowStartX, y: rs.arrowStartY, angle: rs.srcArrowAngle }, { name: 'target', x: rs.arrowEndX, y: rs.arrowEndY, angle: rs.tgtArrowAngle }, { name: 'mid-source', x: rs.midX, y: rs.midY, angle: rs.midsrcArrowAngle }, { name: 'mid-target', x: rs.midX, y: rs.midY, angle: rs.midtgtArrowAngle }]; - - for (var i = 0; i < arrows.length; i++) { - var ar = arrows[i]; - var shape = r.arrowShapes[edge.pstyle(ar.name + '-arrow-shape').value]; - var edgeWidth = edge.pstyle('width').pfValue; - if (shape.roughCollide(x, y, arSize, ar.angle, { x: ar.x, y: ar.y }, edgeWidth, edgeThreshold) && shape.collide(x, y, arSize, ar.angle, { x: ar.x, y: ar.y }, edgeWidth, edgeThreshold)) { - addEle(edge); - return true; - } - } - - // for compound graphs, hitting edge may actually want a connected node instead (b/c edge may have greater z-index precedence) - if (hasCompounds && near.length > 0) { - checkNode(src); - checkNode(tgt); - } - } - - function preprop(obj, name, pre) { - return util.getPrefixedProperty(obj, name, pre); - } - - function checkLabel(ele, prefix) { - var _p = ele._private; - var th = labelThreshold; - - var prefixDash; - if (prefix) { - prefixDash = prefix + '-'; - } else { - prefixDash = ''; - } - - var text = ele.pstyle(prefixDash + 'label').value; - var eventsEnabled = ele.pstyle('text-events').strValue === 'yes'; - - if (!eventsEnabled || !text) { - return; - } - - var rstyle = _p.rstyle; - var bw = ele.pstyle('text-border-width').pfValue; - var pw = ele.pstyle('text-background-padding').pfValue; - var lw = preprop(rstyle, 'labelWidth', prefix) + bw + 2 * th + 2 * pw; - var lh = preprop(rstyle, 'labelHeight', prefix) + bw + 2 * th + 2 * pw; - var lx = preprop(rstyle, 'labelX', prefix); - var ly = preprop(rstyle, 'labelY', prefix); - - var theta = preprop(_p.rscratch, 'labelAngle', prefix); - - var lx1 = lx - lw / 2; - var lx2 = lx + lw / 2; - var ly1 = ly - lh / 2; - var ly2 = ly + lh / 2; - - if (theta) { - var cos = Math.cos(theta); - var sin = Math.sin(theta); - - var rotate = function rotate(x, y) { - x = x - lx; - y = y - ly; - - return { - x: x * cos - y * sin + lx, - y: x * sin + y * cos + ly - }; - }; - - var px1y1 = rotate(lx1, ly1); - var px1y2 = rotate(lx1, ly2); - var px2y1 = rotate(lx2, ly1); - var px2y2 = rotate(lx2, ly2); - - var points = [px1y1.x, px1y1.y, px2y1.x, px2y1.y, px2y2.x, px2y2.y, px1y2.x, px1y2.y]; - - if (math.pointInsidePolygonPoints(x, y, points)) { - addEle(ele); - return true; - } - } else { - // do a cheaper bb check - var bb = { - w: lw, - h: lh, - x1: lx1, - x2: lx2, - y1: ly1, - y2: ly2 - }; - - if (math.inBoundingBox(bb, x, y)) { - addEle(ele); - return true; - } - } - } - - for (var i = eles.length - 1; i >= 0; i--) { - // reverse order for precedence - var ele = eles[i]; - - if (ele.isNode()) { - checkNode(ele) || checkLabel(ele); - } else { - // then edge - checkEdge(ele) || checkLabel(ele) || checkLabel(ele, 'source') || checkLabel(ele, 'target'); - } - } - - return near; -}; - -// 'Give me everything from this box' -BRp.getAllInBox = function (x1, y1, x2, y2) { - var eles = this.getCachedZSortedEles().interactive; - var box = []; - - var x1c = Math.min(x1, x2); - var x2c = Math.max(x1, x2); - var y1c = Math.min(y1, y2); - var y2c = Math.max(y1, y2); - - x1 = x1c; - x2 = x2c; - y1 = y1c; - y2 = y2c; - - var boxBb = math.makeBoundingBox({ - x1: x1, y1: y1, - x2: x2, y2: y2 - }); - - for (var e = 0; e < eles.length; e++) { - var ele = eles[e]; - - if (ele.isNode()) { - var node = ele; - var nodeBb = node.boundingBox({ - includeNodes: true, - includeEdges: false, - includeLabels: false - }); - - if (math.boundingBoxesIntersect(boxBb, nodeBb) && !math.boundingBoxInBoundingBox(nodeBb, boxBb)) { - box.push(node); - } - } else { - var edge = ele; - var _p = edge._private; - var rs = _p.rscratch; - - if (rs.startX != null && rs.startY != null && !math.inBoundingBox(boxBb, rs.startX, rs.startY)) { - continue; - } - if (rs.endX != null && rs.endY != null && !math.inBoundingBox(boxBb, rs.endX, rs.endY)) { - continue; - } - - if (rs.edgeType === 'bezier' || rs.edgeType === 'multibezier' || rs.edgeType === 'self' || rs.edgeType === 'compound' || rs.edgeType === 'segments' || rs.edgeType === 'haystack') { - - var pts = _p.rstyle.bezierPts || _p.rstyle.linePts || _p.rstyle.haystackPts; - var allInside = true; - - for (var i = 0; i < pts.length; i++) { - if (!math.pointInBoundingBox(boxBb, pts[i])) { - allInside = false; - break; - } - } - - if (allInside) { - box.push(edge); - } - } else if (rs.edgeType === 'haystack' || rs.edgeType === 'straight') { - box.push(edge); - } - } - } - - return box; -}; - -module.exports = BRp; - -/***/ }), -/* 112 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); - -var BRp = {}; - -BRp.calculateArrowAngles = function (edge) { - var rs = edge._private.rscratch; - var isHaystack = rs.edgeType === 'haystack'; - var isBezier = rs.edgeType === 'bezier'; - var isMultibezier = rs.edgeType === 'multibezier'; - var isSegments = rs.edgeType === 'segments'; - var isCompound = rs.edgeType === 'compound'; - var isSelf = rs.edgeType === 'self'; - - // Displacement gives direction for arrowhead orientation - var dispX, dispY; - var startX, startY, endX, endY, midX, midY; - - if (isHaystack) { - startX = rs.haystackPts[0]; - startY = rs.haystackPts[1]; - endX = rs.haystackPts[2]; - endY = rs.haystackPts[3]; - } else { - startX = rs.arrowStartX; - startY = rs.arrowStartY; - endX = rs.arrowEndX; - endY = rs.arrowEndY; - } - - midX = rs.midX; - midY = rs.midY; - - // source - // - - if (isSegments) { - dispX = startX - rs.segpts[0]; - dispY = startY - rs.segpts[1]; - } else if (isMultibezier || isCompound || isSelf || isBezier) { - var pts = rs.allpts; - var bX = math.qbezierAt(pts[0], pts[2], pts[4], 0.1); - var bY = math.qbezierAt(pts[1], pts[3], pts[5], 0.1); - - dispX = startX - bX; - dispY = startY - bY; - } else { - dispX = startX - midX; - dispY = startY - midY; - } - - rs.srcArrowAngle = math.getAngleFromDisp(dispX, dispY); - - // mid target - // - - var midX = rs.midX; - var midY = rs.midY; - - if (isHaystack) { - midX = (startX + endX) / 2; - midY = (startY + endY) / 2; - } - - dispX = endX - startX; - dispY = endY - startY; - - if (isSegments) { - var pts = rs.allpts; - - if (pts.length / 2 % 2 === 0) { - var i2 = pts.length / 2; - var i1 = i2 - 2; - - dispX = pts[i2] - pts[i1]; - dispY = pts[i2 + 1] - pts[i1 + 1]; - } else { - var i2 = pts.length / 2 - 1; - var i1 = i2 - 2; - var i3 = i2 + 2; - - dispX = pts[i2] - pts[i1]; - dispY = pts[i2 + 1] - pts[i1 + 1]; - } - } else if (isMultibezier || isCompound || isSelf) { - var pts = rs.allpts; - var cpts = rs.ctrlpts; - var bp0x, bp0y; - var bp1x, bp1y; - - if (cpts.length / 2 % 2 === 0) { - var p0 = pts.length / 2 - 1; // startpt - var ic = p0 + 2; - var p1 = ic + 2; - - bp0x = math.qbezierAt(pts[p0], pts[ic], pts[p1], 0.0); - bp0y = math.qbezierAt(pts[p0 + 1], pts[ic + 1], pts[p1 + 1], 0.0); - - bp1x = math.qbezierAt(pts[p0], pts[ic], pts[p1], 0.0001); - bp1y = math.qbezierAt(pts[p0 + 1], pts[ic + 1], pts[p1 + 1], 0.0001); - } else { - var ic = pts.length / 2 - 1; // ctrpt - var p0 = ic - 2; // startpt - var p1 = ic + 2; // endpt - - bp0x = math.qbezierAt(pts[p0], pts[ic], pts[p1], 0.4999); - bp0y = math.qbezierAt(pts[p0 + 1], pts[ic + 1], pts[p1 + 1], 0.4999); - - bp1x = math.qbezierAt(pts[p0], pts[ic], pts[p1], 0.5); - bp1y = math.qbezierAt(pts[p0 + 1], pts[ic + 1], pts[p1 + 1], 0.5); - } - - dispX = bp1x - bp0x; - dispY = bp1y - bp0y; - } - - rs.midtgtArrowAngle = math.getAngleFromDisp(dispX, dispY); - - rs.midDispX = dispX; - rs.midDispY = dispY; - - // mid source - // - - dispX *= -1; - dispY *= -1; - - if (isSegments) { - var pts = rs.allpts; - - if (pts.length / 2 % 2 === 0) { - // already ok - } else { - var i2 = pts.length / 2 - 1; - var i3 = i2 + 2; - - dispX = -(pts[i3] - pts[i2]); - dispY = -(pts[i3 + 1] - pts[i2 + 1]); - } - } - - rs.midsrcArrowAngle = math.getAngleFromDisp(dispX, dispY); - - // target - // - - if (isSegments) { - dispX = endX - rs.segpts[rs.segpts.length - 2]; - dispY = endY - rs.segpts[rs.segpts.length - 1]; - } else if (isMultibezier || isCompound || isSelf || isBezier) { - var pts = rs.allpts; - var l = pts.length; - var bX = math.qbezierAt(pts[l - 6], pts[l - 4], pts[l - 2], 0.9); - var bY = math.qbezierAt(pts[l - 5], pts[l - 3], pts[l - 1], 0.9); - - dispX = endX - bX; - dispY = endY - bY; - } else { - dispX = endX - midX; - dispY = endY - midY; - } - - rs.tgtArrowAngle = math.getAngleFromDisp(dispX, dispY); -}; - -BRp.getArrowWidth = BRp.getArrowHeight = function (edgeWidth, scale) { - var cache = this.arrowWidthCache = this.arrowWidthCache || {}; - - var cachedVal = cache[edgeWidth + ', ' + scale]; - if (cachedVal) { - return cachedVal; - } - - cachedVal = Math.max(Math.pow(edgeWidth * 13.37, 0.9), 29) * scale; - cache[edgeWidth + ', ' + scale] = cachedVal; - - return cachedVal; -}; - -module.exports = BRp; - -/***/ }), -/* 113 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); -var is = __webpack_require__(0); - -var BRp = {}; - -BRp.findEdgeControlPoints = function (edges) { - if (!edges || edges.length === 0) { - return; - } - - var r = this; - var cy = r.cy; - var hasCompounds = cy.hasCompoundNodes(); - var hashTable = {}; - var pairIds = []; - var haystackEdges = []; - - // create a table of edge (src, tgt) => list of edges between them - var pairId; - for (var i = 0; i < edges.length; i++) { - var edge = edges[i]; - var _p = edge._private; - var data = _p.data; - var curveStyle = edge.pstyle('curve-style').value; - var edgeIsUnbundled = curveStyle === 'unbundled-bezier' || curveStyle === 'segments'; - var edgeIsBezier = curveStyle === 'unbundled-bezier' || curveStyle === 'bezier'; - - // ignore edges who are not to be displayed - // they shouldn't take up space - if (edge.pstyle('display').value === 'none') { - continue; - } - - if (curveStyle === 'haystack') { - haystackEdges.push(edge); - continue; - } - - var srcId = data.source; - var tgtId = data.target; - - pairId = srcId > tgtId ? tgtId + '$-$' + srcId : srcId + '$-$' + tgtId; - - if (edgeIsUnbundled) { - pairId = 'unbundled' + '$-$' + data.id; - } - - var tableEntry = hashTable[pairId]; - - if (tableEntry == null) { - tableEntry = hashTable[pairId] = []; - pairIds.push(pairId); - } - - tableEntry.push(edge); - - if (edgeIsUnbundled) { - tableEntry.hasUnbundled = true; - } - - if (edgeIsBezier) { - tableEntry.hasBezier = true; - } - } - - var src, tgt, srcPos, tgtPos, srcW, srcH, tgtW, tgtH, srcShape, tgtShape; - var vectorNormInverse; - var badBezier; - - // for each pair (src, tgt), create the ctrl pts - // Nested for loop is OK; total number of iterations for both loops = edgeCount - for (var p = 0; p < pairIds.length; p++) { - pairId = pairIds[p]; - var pairEdges = hashTable[pairId]; - - // for each pair id, the edges should be sorted by index - pairEdges.sort(function (edge1, edge2) { - return edge1.poolIndex() - edge2.poolIndex(); - }); - - src = pairEdges[0]._private.source; - tgt = pairEdges[0]._private.target; - - // make sure src/tgt distinction is consistent for bundled edges - if (!pairEdges.hasUnbundled && src.id() > tgt.id()) { - var temp = src; - src = tgt; - tgt = temp; - } - - srcPos = src.position(); - tgtPos = tgt.position(); - - srcW = src.outerWidth(); - srcH = src.outerHeight(); - - tgtW = tgt.outerWidth(); - tgtH = tgt.outerHeight(); - - srcShape = r.nodeShapes[this.getNodeShape(src)]; - tgtShape = r.nodeShapes[this.getNodeShape(tgt)]; - - badBezier = false; - - var edge; - var edge_p; - var rs; - - var dirCounts = { - 'north': 0, - 'west': 0, - 'south': 0, - 'east': 0, - 'northwest': 0, - 'southwest': 0, - 'northeast': 0, - 'southeast': 0 - }; - - var srcX2 = srcPos.x; - var srcY2 = srcPos.y; - var srcW2 = srcW; - var srcH2 = srcH; - - var tgtX2 = tgtPos.x; - var tgtY2 = tgtPos.y; - var tgtW2 = tgtW; - var tgtH2 = tgtH; - - var numEdges2 = pairEdges.length; - - for (var i = 0; i < pairEdges.length; i++) { - edge = pairEdges[i]; - edge_p = edge._private; - rs = edge_p.rscratch; - - var edgeIndex1 = rs.lastEdgeIndex; - var edgeIndex2 = i; - - var numEdges1 = rs.lastNumEdges; - - var curveStyle = edge.pstyle('curve-style').value; - - var edgeIsUnbundled = curveStyle === 'unbundled-bezier' || curveStyle === 'segments'; - - // whether the normalised pair order is the reverse of the edge's src-tgt order - var edgeIsSwapped = src.id() !== edge.source().id(); - - var ctrlptDists = edge.pstyle('control-point-distances'); - var loopDir = edge.pstyle('loop-direction').pfValue; - var loopSwp = edge.pstyle('loop-sweep').pfValue; - var ctrlptWs = edge.pstyle('control-point-weights'); - var bezierN = ctrlptDists && ctrlptWs ? Math.min(ctrlptDists.value.length, ctrlptWs.value.length) : 1; - var stepSize = edge.pstyle('control-point-step-size').pfValue; - var ctrlptDist = ctrlptDists ? ctrlptDists.pfValue[0] : undefined; - var ctrlptWeight = ctrlptWs.value[0]; - var edgeDistances = edge.pstyle('edge-distances').value; - var srcDistFNode = edge.pstyle('source-distance-from-node').pfValue; - var tgtDistFNode = edge.pstyle('target-distance-from-node').pfValue; - var segmentWs = edge.pstyle('segment-weights'); - var segmentDs = edge.pstyle('segment-distances'); - var segmentsN = Math.min(segmentWs.pfValue.length, segmentDs.pfValue.length); - var srcEndpt = edge.pstyle('source-endpoint').value; - var tgtEndpt = edge.pstyle('target-endpoint').value; - var srcArrShape = edge.pstyle('source-arrow-shape').value; - var tgtArrShape = edge.pstyle('target-arrow-shape').value; - var arrowScale = edge.pstyle('arrow-scale').value; - var lineWidth = edge.pstyle('width').pfValue; - - var srcX1 = rs.lastSrcCtlPtX; - var srcY1 = rs.lastSrcCtlPtY; - var srcW1 = rs.lastSrcCtlPtW; - var srcH1 = rs.lastSrcCtlPtH; - - var tgtX1 = rs.lastTgtCtlPtX; - var tgtY1 = rs.lastTgtCtlPtY; - var tgtW1 = rs.lastTgtCtlPtW; - var tgtH1 = rs.lastTgtCtlPtH; - - var curveStyle1 = rs.lastCurveStyle; - var curveStyle2 = curveStyle; - - var ctrlptDists1 = rs.lastCtrlptDists; - var ctrlptDists2 = ctrlptDists ? ctrlptDists.strValue : null; - - var ctrlptWs1 = rs.lastCtrlptWs; - var ctrlptWs2 = ctrlptWs.strValue; - - var segmentWs1 = rs.lastSegmentWs; - var segmentWs2 = segmentWs.strValue; - - var segmentDs1 = rs.lastSegmentDs; - var segmentDs2 = segmentDs.strValue; - - var stepSize1 = rs.lastStepSize; - var stepSize2 = stepSize; - - var loopDir1 = rs.lastLoopDir; - var loopDir2 = loopDir; - - var loopSwp1 = rs.lastLoopSwp; - var loopSwp2 = loopSwp; - - var edgeDistances1 = rs.lastEdgeDistances; - var edgeDistances2 = edgeDistances; - - var srcDistFNode1 = rs.lastSrcDistFNode; - var srcDistFNode2 = srcDistFNode; - - var tgtDistFNode1 = rs.lastTgtDistFNode; - var tgtDistFNode2 = tgtDistFNode; - - var srcEndpt1 = rs.lastSrcEndpt; - var srcEndpt2 = srcEndpt; - - var tgtEndpt1 = rs.lastTgtEndpt; - var tgtEndpt2 = tgtEndpt; - - var srcArr1 = rs.lastSrcArr; - var srcArr2 = srcArrShape; - - var tgtArr1 = rs.lastTgtArr; - var tgtArr2 = tgtArrShape; - - var lineW1 = rs.lastLineW; - var lineW2 = lineWidth; - - var arrScl1 = rs.lastArrScl; - var arrScl2 = arrowScale; - - if (badBezier) { - rs.badBezier = true; - } else { - rs.badBezier = false; - } - - var ptCacheHit; - - if (srcX1 === srcX2 && srcY1 === srcY2 && srcW1 === srcW2 && srcH1 === srcH2 && tgtX1 === tgtX2 && tgtY1 === tgtY2 && tgtW1 === tgtW2 && tgtH1 === tgtH2 && curveStyle1 === curveStyle2 && ctrlptDists1 === ctrlptDists2 && ctrlptWs1 === ctrlptWs2 && segmentWs1 === segmentWs2 && segmentDs1 === segmentDs2 && stepSize1 === stepSize2 && loopDir1 === loopDir2 && loopSwp1 === loopSwp2 && edgeDistances1 === edgeDistances2 && srcDistFNode1 === srcDistFNode2 && tgtDistFNode1 === tgtDistFNode2 && srcEndpt1 === srcEndpt2 && tgtEndpt1 === tgtEndpt2 && srcArr1 === srcArr2 && tgtArr1 === tgtArr2 && lineW1 === lineW2 && arrScl1 === arrScl2 && (edgeIndex1 === edgeIndex2 && numEdges1 === numEdges2 || edgeIsUnbundled)) { - ptCacheHit = true; // then the control points haven't changed and we can skip calculating them - } else { - ptCacheHit = false; - - rs.lastSrcCtlPtX = srcX2; - rs.lastSrcCtlPtY = srcY2; - rs.lastSrcCtlPtW = srcW2; - rs.lastSrcCtlPtH = srcH2; - rs.lastTgtCtlPtX = tgtX2; - rs.lastTgtCtlPtY = tgtY2; - rs.lastTgtCtlPtW = tgtW2; - rs.lastTgtCtlPtH = tgtH2; - rs.lastEdgeIndex = edgeIndex2; - rs.lastNumEdges = numEdges2; - rs.lastCurveStyle = curveStyle2; - rs.lastCtrlptDists = ctrlptDists2; - rs.lastCtrlptWs = ctrlptWs2; - rs.lastSegmentDs = segmentDs2; - rs.lastSegmentWs = segmentWs2; - rs.lastStepSize = stepSize2; - rs.lastLoopDir = loopDir2; - rs.lastLoopSwp = loopSwp2; - rs.lastEdgeDistances = edgeDistances2; - rs.lastSrcDistFNode = srcDistFNode2; - rs.lastTgtDistFNode = tgtDistFNode2; - rs.lastSrcEndpt = srcEndpt2; - rs.lastTgtEndpt = tgtEndpt2; - rs.lastSrcArr = srcArr2; - rs.lastTgtArr = tgtArr2; - rs.lastLineW = lineW2; - rs.lastArrScl = arrScl2; - } - - if (!ptCacheHit) { - - if (!pairEdges.calculatedIntersection && src !== tgt && (pairEdges.hasBezier || pairEdges.hasUnbundled)) { - - pairEdges.calculatedIntersection = true; - - // pt outside src shape to calc distance/displacement from src to tgt - var srcOutside = srcShape.intersectLine(srcPos.x, srcPos.y, srcW, srcH, tgtPos.x, tgtPos.y, 0); - - pairEdges.srcIntn = srcOutside; - - // pt outside tgt shape to calc distance/displacement from src to tgt - var tgtOutside = tgtShape.intersectLine(tgtPos.x, tgtPos.y, tgtW, tgtH, srcPos.x, srcPos.y, 0); - - pairEdges.tgtIntn = tgtOutside; - - var midptSrcPts = { - x1: srcOutside[0], - x2: tgtOutside[0], - y1: srcOutside[1], - y2: tgtOutside[1] - }; - - var posPts = { - x1: srcPos.x, - x2: tgtPos.x, - y1: srcPos.y, - y2: tgtPos.y - }; - - var dy = tgtOutside[1] - srcOutside[1]; - var dx = tgtOutside[0] - srcOutside[0]; - var l = Math.sqrt(dx * dx + dy * dy); - - var vector = { - x: dx, - y: dy - }; - - var vectorNorm = { - x: vector.x / l, - y: vector.y / l - }; - vectorNormInverse = { - x: -vectorNorm.y, - y: vectorNorm.x - }; - - // if node shapes overlap, then no ctrl pts to draw - if (tgtShape.checkPoint(srcOutside[0], srcOutside[1], 0, tgtW, tgtH, tgtPos.x, tgtPos.y) && srcShape.checkPoint(tgtOutside[0], tgtOutside[1], 0, srcW, srcH, srcPos.x, srcPos.y)) { - vectorNormInverse = {}; - badBezier = true; - } - } - - if (!edgeIsSwapped) { - rs.srcIntn = pairEdges.srcIntn; - rs.tgtIntn = pairEdges.tgtIntn; - } else { - // ensure that the per-edge cached value for intersections are correct for swapped bundled edges - rs.srcIntn = pairEdges.tgtIntn; - rs.tgtIntn = pairEdges.srcIntn; - } - - if (src === tgt) { - // Self-edge - - rs.edgeType = 'self'; - - var j = i; - var loopDist = stepSize; - - if (edgeIsUnbundled) { - j = 0; - loopDist = ctrlptDist; - } - - var loopAngle = loopDir - Math.PI / 2; - var outAngle = loopAngle - loopSwp / 2; - var inAngle = loopAngle + loopSwp / 2; - - // increase by step size for overlapping loops, keyed on direction and sweep values - var dc = String(loopDir + '_' + loopSwp); - j = dirCounts[dc] === undefined ? dirCounts[dc] = 0 : ++dirCounts[dc]; - - rs.ctrlpts = [srcPos.x + Math.cos(outAngle) * 1.4 * loopDist * (j / 3 + 1), srcPos.y + Math.sin(outAngle) * 1.4 * loopDist * (j / 3 + 1), srcPos.x + Math.cos(inAngle) * 1.4 * loopDist * (j / 3 + 1), srcPos.y + Math.sin(inAngle) * 1.4 * loopDist * (j / 3 + 1)]; - } else if (hasCompounds && (src.isParent() || src.isChild() || tgt.isParent() || tgt.isChild()) && (src.parents().anySame(tgt) || tgt.parents().anySame(src))) { - // Compound edge - - rs.edgeType = 'compound'; - - // because the line approximation doesn't apply for compound beziers - // (loop/self edges are already elided b/c of cheap src==tgt check) - rs.badBezier = false; - - var j = i; - var loopDist = stepSize; - - if (edgeIsUnbundled) { - j = 0; - loopDist = ctrlptDist; - } - - var loopW = 50; - - var loopaPos = { - x: srcPos.x - srcW / 2, - y: srcPos.y - srcH / 2 - }; - - var loopbPos = { - x: tgtPos.x - tgtW / 2, - y: tgtPos.y - tgtH / 2 - }; - - var loopPos = { - x: Math.min(loopaPos.x, loopbPos.x), - y: Math.min(loopaPos.y, loopbPos.y) - }; - - // avoids cases with impossible beziers - var minCompoundStretch = 0.5; - var compoundStretchA = Math.max(minCompoundStretch, Math.log(srcW * 0.01)); - var compoundStretchB = Math.max(minCompoundStretch, Math.log(tgtW * 0.01)); - - rs.ctrlpts = [loopPos.x, loopPos.y - (1 + Math.pow(loopW, 1.12) / 100) * loopDist * (j / 3 + 1) * compoundStretchA, loopPos.x - (1 + Math.pow(loopW, 1.12) / 100) * loopDist * (j / 3 + 1) * compoundStretchB, loopPos.y]; - } else if (curveStyle === 'segments') { - // Segments (multiple straight lines) - - rs.edgeType = 'segments'; - rs.segpts = []; - - for (var s = 0; s < segmentsN; s++) { - var w = segmentWs.pfValue[s]; - var d = segmentDs.pfValue[s]; - - var w1 = 1 - w; - var w2 = w; - - var midptPts = edgeDistances === 'node-position' ? posPts : midptSrcPts; - - var adjustedMidpt = { - x: midptPts.x1 * w1 + midptPts.x2 * w2, - y: midptPts.y1 * w1 + midptPts.y2 * w2 - }; - - rs.segpts.push(adjustedMidpt.x + vectorNormInverse.x * d, adjustedMidpt.y + vectorNormInverse.y * d); - } - - // Straight edge - } else if (pairEdges.length % 2 === 1 && i === Math.floor(pairEdges.length / 2) && !edgeIsUnbundled) { - - rs.edgeType = 'straight'; - } else { - // (Multi)bezier - - var multi = edgeIsUnbundled; - - rs.edgeType = multi ? 'multibezier' : 'bezier'; - rs.ctrlpts = []; - - for (var b = 0; b < bezierN; b++) { - var normctrlptDist = (0.5 - pairEdges.length / 2 + i) * stepSize; - var manctrlptDist; - var sign = math.signum(normctrlptDist); - - if (multi) { - ctrlptDist = ctrlptDists ? ctrlptDists.pfValue[b] : stepSize; // fall back on step size - ctrlptWeight = ctrlptWs.value[b]; - } - - if (edgeIsUnbundled) { - // multi or single unbundled - manctrlptDist = ctrlptDist; - } else { - manctrlptDist = ctrlptDist !== undefined ? sign * ctrlptDist : undefined; - } - - var distanceFromMidpoint = manctrlptDist !== undefined ? manctrlptDist : normctrlptDist; - - var w1 = 1 - ctrlptWeight; - var w2 = ctrlptWeight; - - if (edgeIsSwapped) { - var temp = w1; - w1 = w2; - w2 = temp; - } - - var midptPts = edgeDistances === 'node-position' ? posPts : midptSrcPts; - - var adjustedMidpt = { - x: midptPts.x1 * w1 + midptPts.x2 * w2, - y: midptPts.y1 * w1 + midptPts.y2 * w2 - }; - - rs.ctrlpts.push(adjustedMidpt.x + vectorNormInverse.x * distanceFromMidpoint, adjustedMidpt.y + vectorNormInverse.y * distanceFromMidpoint); - } - } - - // find endpts for edge - this.findEndpoints(edge); - - var badStart = !is.number(rs.startX) || !is.number(rs.startY); - var badAStart = !is.number(rs.arrowStartX) || !is.number(rs.arrowStartY); - var badEnd = !is.number(rs.endX) || !is.number(rs.endY); - var badAEnd = !is.number(rs.arrowEndX) || !is.number(rs.arrowEndY); - - var minCpADistFactor = 3; - var arrowW = this.getArrowWidth(edge.pstyle('width').pfValue, edge.pstyle('arrow-scale').value) * this.arrowShapeWidth; - var minCpADist = minCpADistFactor * arrowW; - - if (rs.edgeType === 'bezier') { - var startACpDist = math.dist({ x: rs.ctrlpts[0], y: rs.ctrlpts[1] }, { x: rs.startX, y: rs.startY }); - var closeStartACp = startACpDist < minCpADist; - var endACpDist = math.dist({ x: rs.ctrlpts[0], y: rs.ctrlpts[1] }, { x: rs.endX, y: rs.endY }); - var closeEndACp = endACpDist < minCpADist; - - var overlapping = false; - - if (badStart || badAStart || closeStartACp) { - overlapping = true; - - // project control point along line from src centre to outside the src shape - // (otherwise intersection will yield nothing) - var cpD = { // delta - x: rs.ctrlpts[0] - srcPos.x, - y: rs.ctrlpts[1] - srcPos.y - }; - var cpL = Math.sqrt(cpD.x * cpD.x + cpD.y * cpD.y); // length of line - var cpM = { // normalised delta - x: cpD.x / cpL, - y: cpD.y / cpL - }; - var radius = Math.max(srcW, srcH); - var cpProj = { // *2 radius guarantees outside shape - x: rs.ctrlpts[0] + cpM.x * 2 * radius, - y: rs.ctrlpts[1] + cpM.y * 2 * radius - }; - - var srcCtrlPtIntn = srcShape.intersectLine(srcPos.x, srcPos.y, srcW, srcH, cpProj.x, cpProj.y, 0); - - if (closeStartACp) { - rs.ctrlpts[0] = rs.ctrlpts[0] + cpM.x * (minCpADist - startACpDist); - rs.ctrlpts[1] = rs.ctrlpts[1] + cpM.y * (minCpADist - startACpDist); - } else { - rs.ctrlpts[0] = srcCtrlPtIntn[0] + cpM.x * minCpADist; - rs.ctrlpts[1] = srcCtrlPtIntn[1] + cpM.y * minCpADist; - } - } - - if (badEnd || badAEnd || closeEndACp) { - overlapping = true; - - // project control point along line from tgt centre to outside the tgt shape - // (otherwise intersection will yield nothing) - var cpD = { // delta - x: rs.ctrlpts[0] - tgtPos.x, - y: rs.ctrlpts[1] - tgtPos.y - }; - var cpL = Math.sqrt(cpD.x * cpD.x + cpD.y * cpD.y); // length of line - var cpM = { // normalised delta - x: cpD.x / cpL, - y: cpD.y / cpL - }; - var radius = Math.max(srcW, srcH); - var cpProj = { // *2 radius guarantees outside shape - x: rs.ctrlpts[0] + cpM.x * 2 * radius, - y: rs.ctrlpts[1] + cpM.y * 2 * radius - }; - - var tgtCtrlPtIntn = tgtShape.intersectLine(tgtPos.x, tgtPos.y, tgtW, tgtH, cpProj.x, cpProj.y, 0); - - if (closeEndACp) { - rs.ctrlpts[0] = rs.ctrlpts[0] + cpM.x * (minCpADist - endACpDist); - rs.ctrlpts[1] = rs.ctrlpts[1] + cpM.y * (minCpADist - endACpDist); - } else { - rs.ctrlpts[0] = tgtCtrlPtIntn[0] + cpM.x * minCpADist; - rs.ctrlpts[1] = tgtCtrlPtIntn[1] + cpM.y * minCpADist; - } - } - - if (overlapping) { - // recalc endpts - this.findEndpoints(edge); - } - } - - if (rs.edgeType === 'multibezier' || rs.edgeType === 'bezier' || rs.edgeType === 'self' || rs.edgeType === 'compound') { - rs.allpts = []; - - rs.allpts.push(rs.startX, rs.startY); - - for (var b = 0; b + 1 < rs.ctrlpts.length; b += 2) { - // ctrl pt itself - rs.allpts.push(rs.ctrlpts[b], rs.ctrlpts[b + 1]); - - // the midpt between ctrlpts as intermediate destination pts - if (b + 3 < rs.ctrlpts.length) { - rs.allpts.push((rs.ctrlpts[b] + rs.ctrlpts[b + 2]) / 2, (rs.ctrlpts[b + 1] + rs.ctrlpts[b + 3]) / 2); - } - } - - rs.allpts.push(rs.endX, rs.endY); - - var m, mt; - if (rs.ctrlpts.length / 2 % 2 === 0) { - m = rs.allpts.length / 2 - 1; - - rs.midX = rs.allpts[m]; - rs.midY = rs.allpts[m + 1]; - } else { - m = rs.allpts.length / 2 - 3; - mt = 0.5; - - rs.midX = math.qbezierAt(rs.allpts[m], rs.allpts[m + 2], rs.allpts[m + 4], mt); - rs.midY = math.qbezierAt(rs.allpts[m + 1], rs.allpts[m + 3], rs.allpts[m + 5], mt); - } - } else if (rs.edgeType === 'straight') { - // need to calc these after endpts - rs.allpts = [rs.startX, rs.startY, rs.endX, rs.endY]; - - // default midpt for labels etc - rs.midX = (rs.startX + rs.endX + rs.arrowStartX + rs.arrowEndX) / 4; - rs.midY = (rs.startY + rs.endY + rs.arrowStartY + rs.arrowEndY) / 4; - } else if (rs.edgeType === 'segments') { - rs.allpts = []; - rs.allpts.push(rs.startX, rs.startY); - rs.allpts.push.apply(rs.allpts, rs.segpts); - rs.allpts.push(rs.endX, rs.endY); - - if (rs.segpts.length % 4 === 0) { - var i2 = rs.segpts.length / 2; - var i1 = i2 - 2; - - rs.midX = (rs.segpts[i1] + rs.segpts[i2]) / 2; - rs.midY = (rs.segpts[i1 + 1] + rs.segpts[i2 + 1]) / 2; - } else { - var i1 = rs.segpts.length / 2 - 1; - - rs.midX = rs.segpts[i1]; - rs.midY = rs.segpts[i1 + 1]; - } - } - - this.storeEdgeProjections(edge); - this.calculateArrowAngles(edge); - } // if point cache miss - - this.recalculateEdgeLabelProjections(edge); - this.calculateLabelAngles(edge); - } // for pair edges - } // for pair ids - - for (var i = 0; i < haystackEdges.length; i++) { - var edge = haystackEdges[i]; - var _p = edge._private; - var rscratch = _p.rscratch; - var rs = rscratch; - - if (!rscratch.haystack) { - var angle = Math.random() * 2 * Math.PI; - - rscratch.source = { - x: Math.cos(angle), - y: Math.sin(angle) - }; - - var angle = Math.random() * 2 * Math.PI; - - rscratch.target = { - x: Math.cos(angle), - y: Math.sin(angle) - }; - } - - var src = _p.source; - var tgt = _p.target; - var srcPos = src.position(); - var tgtPos = tgt.position(); - var srcW = src.width(); - var tgtW = tgt.width(); - var srcH = src.height(); - var tgtH = tgt.height(); - var radius = edge.pstyle('haystack-radius').value; - var halfRadius = radius / 2; // b/c have to half width/height - - rs.haystackPts = rs.allpts = [rs.source.x * srcW * halfRadius + srcPos.x, rs.source.y * srcH * halfRadius + srcPos.y, rs.target.x * tgtW * halfRadius + tgtPos.x, rs.target.y * tgtH * halfRadius + tgtPos.y]; - - rs.midX = (rs.allpts[0] + rs.allpts[2]) / 2; - rs.midY = (rs.allpts[1] + rs.allpts[3]) / 2; - - // always override as haystack in case set to different type previously - rscratch.edgeType = rscratch.lastCurveStyle = 'haystack'; - rscratch.haystack = true; - - this.storeEdgeProjections(edge); - this.calculateArrowAngles(edge); - this.recalculateEdgeLabelProjections(edge); - this.calculateLabelAngles(edge); - } -}; - -function getPts(pts) { - var retPts = []; - - if (pts == null) { - return; - } - - for (var i = 0; i < pts.length; i += 2) { - var x = pts[i]; - var y = pts[i + 1]; - - retPts.push({ x: x, y: y }); - } - - return retPts; -} - -BRp.getSegmentPoints = function (edge) { - var rs = edge[0]._private.rscratch; - var type = rs.edgeType; - - if (type === 'segments') { - return getPts(rs.segpts); - } -}; - -BRp.getControlPoints = function (edge) { - var rs = edge[0]._private.rscratch; - var type = rs.edgeType; - - if (type === 'bezier' || type === 'multibezier' || type === 'self' || type === 'compound') { - return getPts(rs.ctrlpts); - } -}; - -BRp.getEdgeMidpoint = function (edge) { - var rs = edge[0]._private.rscratch; - - return { - x: rs.midX, - y: rs.midY - }; -}; - -module.exports = BRp; - -/***/ }), -/* 114 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); -var is = __webpack_require__(0); - -var BRp = {}; - -BRp.manualEndptToPx = function (node, prop) { - var r = this; - var npos = node.position(); - var w = node.outerWidth(); - var h = node.outerHeight(); - - if (prop.value.length === 2) { - var p = [prop.pfValue[0], prop.pfValue[1]]; - - if (prop.units[0] === '%') { - p[0] = p[0] * w; - } - - if (prop.units[1] === '%') { - p[1] = p[1] * h; - } - - p[0] += npos.x; - p[1] += npos.y; - - return p; - } else { - var angle = prop.pfValue[0]; - - angle = -Math.PI / 2 + angle; // start at 12 o'clock - - var l = 2 * Math.max(w, h); - - var _p = [npos.x + Math.cos(angle) * l, npos.y + Math.sin(angle) * l]; - - return r.nodeShapes[this.getNodeShape(node)].intersectLine(npos.x, npos.y, w, h, _p[0], _p[1], 0); - } -}; - -BRp.findEndpoints = function (edge) { - var r = this; - var intersect = void 0; - - var source = edge.source()[0]; - var target = edge.target()[0]; - - var srcPos = source.position(); - var tgtPos = target.position(); - - var tgtArShape = edge.pstyle('target-arrow-shape').value; - var srcArShape = edge.pstyle('source-arrow-shape').value; - - var tgtDist = edge.pstyle('target-distance-from-node').pfValue; - var srcDist = edge.pstyle('source-distance-from-node').pfValue; - - var rs = edge._private.rscratch; - - var et = rs.edgeType; - var self = et === 'self' || et === 'compound'; - var bezier = et === 'bezier' || et === 'multibezier' || self; - var multi = et !== 'bezier'; - var lines = et === 'straight' || et === 'segments'; - var segments = et === 'segments'; - var hasEndpts = bezier || multi || lines; - var srcManEndpt = edge.pstyle('source-endpoint'); - var srcManEndptVal = self ? 'outside-to-node' : srcManEndpt.value; - var tgtManEndpt = edge.pstyle('target-endpoint'); - var tgtManEndptVal = self ? 'outside-to-node' : tgtManEndpt.value; - - rs.srcManEndpt = srcManEndpt; - rs.tgtManEndpt = tgtManEndpt; - - var p1 = void 0; // last known point of edge on target side - var p2 = void 0; // last known point of edge on source side - - var p1_i = void 0; // point to intersect with target shape - var p2_i = void 0; // point to intersect with source shape - - if (bezier) { - var cpStart = [rs.ctrlpts[0], rs.ctrlpts[1]]; - var cpEnd = multi ? [rs.ctrlpts[rs.ctrlpts.length - 2], rs.ctrlpts[rs.ctrlpts.length - 1]] : cpStart; - - p1 = cpEnd; - p2 = cpStart; - } else if (lines) { - var srcArrowFromPt = !segments ? [tgtPos.x, tgtPos.y] : rs.segpts.slice(0, 2); - var tgtArrowFromPt = !segments ? [srcPos.x, srcPos.y] : rs.segpts.slice(rs.segpts.length - 2); - - p1 = tgtArrowFromPt; - p2 = srcArrowFromPt; - } - - if (tgtManEndptVal === 'inside-to-node') { - intersect = [tgtPos.x, tgtPos.y]; - } else if (tgtManEndpt.units) { - intersect = this.manualEndptToPx(target, tgtManEndpt); - } else if (tgtManEndptVal === 'outside-to-line') { - intersect = rs.tgtIntn; // use cached value from ctrlpt calc - } else { - if (tgtManEndptVal === 'outside-to-node') { - p1_i = p1; - } else if (tgtManEndptVal === 'outside-to-line') { - p1_i = [srcPos.x, srcPos.y]; - } - - intersect = r.nodeShapes[this.getNodeShape(target)].intersectLine(tgtPos.x, tgtPos.y, target.outerWidth(), target.outerHeight(), p1_i[0], p1_i[1], 0); - } - - var arrowEnd = math.shortenIntersection(intersect, p1, r.arrowShapes[tgtArShape].spacing(edge) + tgtDist); - var edgeEnd = math.shortenIntersection(intersect, p1, r.arrowShapes[tgtArShape].gap(edge) + tgtDist); - - rs.endX = edgeEnd[0]; - rs.endY = edgeEnd[1]; - - rs.arrowEndX = arrowEnd[0]; - rs.arrowEndY = arrowEnd[1]; - - if (srcManEndptVal === 'inside-to-node') { - intersect = [srcPos.x, srcPos.y]; - } else if (srcManEndpt.units) { - intersect = this.manualEndptToPx(source, srcManEndpt); - } else if (srcManEndptVal === 'outside-to-line') { - intersect = rs.srcIntn; // use cached value from ctrlpt calc - } else { - if (srcManEndptVal === 'outside-to-node') { - p2_i = p2; - } else if (srcManEndptVal === 'outside-to-line') { - p2_i = [tgtPos.x, tgtPos.y]; - } - - intersect = r.nodeShapes[this.getNodeShape(source)].intersectLine(srcPos.x, srcPos.y, source.outerWidth(), source.outerHeight(), p2_i[0], p2_i[1], 0); - } - - var arrowStart = math.shortenIntersection(intersect, p2, r.arrowShapes[srcArShape].spacing(edge) + srcDist); - var edgeStart = math.shortenIntersection(intersect, p2, r.arrowShapes[srcArShape].gap(edge) + srcDist); - - rs.startX = edgeStart[0]; - rs.startY = edgeStart[1]; - - rs.arrowStartX = arrowStart[0]; - rs.arrowStartY = arrowStart[1]; - - if (hasEndpts) { - if (!is.number(rs.startX) || !is.number(rs.startY) || !is.number(rs.endX) || !is.number(rs.endY)) { - rs.badLine = true; - } else { - rs.badLine = false; - } - } -}; - -BRp.getSourceEndpoint = function (edge) { - var rs = edge[0]._private.rscratch; - - switch (rs.edgeType) { - case 'haystack': - return { - x: rs.haystackPts[0], - y: rs.haystackPts[1] - }; - default: - return { - x: rs.arrowStartX, - y: rs.arrowStartY - }; - } -}; - -BRp.getTargetEndpoint = function (edge) { - var rs = edge[0]._private.rscratch; - - switch (rs.edgeType) { - case 'haystack': - return { - x: rs.haystackPts[2], - y: rs.haystackPts[3] - }; - default: - return { - x: rs.arrowEndX, - y: rs.arrowEndY - }; - } -}; - -module.exports = BRp; - -/***/ }), -/* 115 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); - -var BRp = {}; - -function pushBezierPts(r, edge, pts) { - var qbezierAt = function qbezierAt(p1, p2, p3, t) { - return math.qbezierAt(p1, p2, p3, t); - }; - var _p = edge._private; - var bpts = _p.rstyle.bezierPts; - - for (var i = 0; i < r.bezierProjPcts.length; i++) { - var p = r.bezierProjPcts[i]; - - bpts.push({ - x: qbezierAt(pts[0], pts[2], pts[4], p), - y: qbezierAt(pts[1], pts[3], pts[5], p) - }); - } -} - -BRp.storeEdgeProjections = function (edge) { - var _p = edge._private; - var rs = _p.rscratch; - var et = rs.edgeType; - - // clear the cached points state - _p.rstyle.bezierPts = null; - _p.rstyle.linePts = null; - _p.rstyle.haystackPts = null; - - if (et === 'multibezier' || et === 'bezier' || et === 'self' || et === 'compound') { - var bpts = _p.rstyle.bezierPts = []; // jshint ignore:line - - for (var i = 0; i + 5 < rs.allpts.length; i += 4) { - pushBezierPts(this, edge, rs.allpts.slice(i, i + 6)); - } - } else if (et === 'segments') { - var lpts = _p.rstyle.linePts = []; - - for (var i = 0; i + 1 < rs.allpts.length; i += 2) { - lpts.push({ - x: rs.allpts[i], - y: rs.allpts[i + 1] - }); - } - } else if (et === 'haystack') { - var hpts = rs.haystackPts; - - _p.rstyle.haystackPts = [{ x: hpts[0], y: hpts[1] }, { x: hpts[2], y: hpts[3] }]; - } - - _p.rstyle.arrowWidth = this.getArrowWidth(edge.pstyle('width').pfValue, edge.pstyle('arrow-scale').value) * this.arrowShapeWidth; -}; - -BRp.recalculateEdgeProjections = function (edges) { - this.findEdgeControlPoints(edges); -}; - -module.exports = BRp; - -/***/ }), -/* 116 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); -var is = __webpack_require__(0); -var util = __webpack_require__(1); - -var BRp = {}; - -BRp.recalculateNodeLabelProjection = function (node) { - var content = node.pstyle('label').strValue; - - if (is.emptyString(content)) { - return; - } - - var textX, textY; - var _p = node._private; - var nodeWidth = node.width(); - var nodeHeight = node.height(); - var padding = node.padding(); - var nodePos = node.position(); - var textHalign = node.pstyle('text-halign').strValue; - var textValign = node.pstyle('text-valign').strValue; - var rs = _p.rscratch; - var rstyle = _p.rstyle; - - switch (textHalign) { - case 'left': - textX = nodePos.x - nodeWidth / 2 - padding; - break; - - case 'right': - textX = nodePos.x + nodeWidth / 2 + padding; - break; - - default: - // e.g. center - textX = nodePos.x; - } - - switch (textValign) { - case 'top': - textY = nodePos.y - nodeHeight / 2 - padding; - break; - - case 'bottom': - textY = nodePos.y + nodeHeight / 2 + padding; - break; - - default: - // e.g. middle - textY = nodePos.y; - } - - rs.labelX = textX; - rs.labelY = textY; - rstyle.labelX = textX; - rstyle.labelY = textY; - - this.applyLabelDimensions(node); -}; - -var lineAngleFromDelta = function lineAngleFromDelta(dx, dy) { - var angle = Math.atan(dy / dx); - - if (dx === 0 && angle < 0) { - angle = angle * -1; - } - - return angle; -}; - -var lineAngle = function lineAngle(p0, p1) { - var dx = p1.x - p0.x; - var dy = p1.y - p0.y; - - return lineAngleFromDelta(dx, dy); -}; - -var bezierAngle = function bezierAngle(p0, p1, p2, t) { - var t0 = math.bound(0, t - 0.001, 1); - var t1 = math.bound(0, t + 0.001, 1); - - var lp0 = math.qbezierPtAt(p0, p1, p2, t0); - var lp1 = math.qbezierPtAt(p0, p1, p2, t1); - - return lineAngle(lp0, lp1); -}; - -BRp.recalculateEdgeLabelProjections = function (edge) { - var p; - var _p = edge._private; - var rs = _p.rscratch; - var r = this; - var content = { - mid: edge.pstyle('label').strValue, - source: edge.pstyle('source-label').strValue, - target: edge.pstyle('target-label').strValue - }; - - if (content.mid || content.source || content.target) { - // then we have to calculate... - } else { - return; // no labels => no calcs - } - - // add center point to style so bounding box calculations can use it - // - p = { - x: rs.midX, - y: rs.midY - }; - - var setRs = function setRs(propName, prefix, value) { - util.setPrefixedProperty(_p.rscratch, propName, prefix, value); - util.setPrefixedProperty(_p.rstyle, propName, prefix, value); - }; - - setRs('labelX', null, p.x); - setRs('labelY', null, p.y); - - var midAngle = lineAngleFromDelta(rs.midDispX, rs.midDispY); - setRs('labelAutoAngle', null, midAngle); - - var createControlPointInfo = function createControlPointInfo() { - if (createControlPointInfo.cache) { - return createControlPointInfo.cache; - } // use cache so only 1x per edge - - var ctrlpts = []; - - // store each ctrlpt info init - for (var i = 0; i + 5 < rs.allpts.length; i += 4) { - var p0 = { x: rs.allpts[i], y: rs.allpts[i + 1] }; - var p1 = { x: rs.allpts[i + 2], y: rs.allpts[i + 3] }; // ctrlpt - var p2 = { x: rs.allpts[i + 4], y: rs.allpts[i + 5] }; - - ctrlpts.push({ - p0: p0, - p1: p1, - p2: p2, - startDist: 0, - length: 0, - segments: [] - }); - } - - var bpts = _p.rstyle.bezierPts; - var nProjs = r.bezierProjPcts.length; - - function addSegment(cp, p0, p1, t0, t1) { - var length = math.dist(p0, p1); - var prevSegment = cp.segments[cp.segments.length - 1]; - var segment = { - p0: p0, - p1: p1, - t0: t0, - t1: t1, - startDist: prevSegment ? prevSegment.startDist + prevSegment.length : 0, - length: length - }; - - cp.segments.push(segment); - - cp.length += length; - } - - // update each ctrlpt with segment info - for (var i = 0; i < ctrlpts.length; i++) { - var cp = ctrlpts[i]; - var prevCp = ctrlpts[i - 1]; - - if (prevCp) { - cp.startDist = prevCp.startDist + prevCp.length; - } - - addSegment(cp, cp.p0, bpts[i * nProjs], 0, r.bezierProjPcts[0]); // first - - for (var j = 0; j < nProjs - 1; j++) { - addSegment(cp, bpts[i * nProjs + j], bpts[i * nProjs + j + 1], r.bezierProjPcts[j], r.bezierProjPcts[j + 1]); - } - - addSegment(cp, bpts[i * nProjs + nProjs - 1], cp.p2, r.bezierProjPcts[nProjs - 1], 1); // last - } - - return createControlPointInfo.cache = ctrlpts; - }; - - var calculateEndProjection = function calculateEndProjection(prefix) { - var angle; - var isSrc = prefix === 'source'; - - if (!content[prefix]) { - return; - } - - var offset = edge.pstyle(prefix + '-text-offset').pfValue; - - switch (rs.edgeType) { - case 'self': - case 'compound': - case 'bezier': - case 'multibezier': - var cps = createControlPointInfo(); - var selected; - var startDist = 0; - var totalDist = 0; - - // find the segment we're on - for (var i = 0; i < cps.length; i++) { - var cp = cps[isSrc ? i : cps.length - 1 - i]; - - for (var j = 0; j < cp.segments.length; j++) { - var seg = cp.segments[isSrc ? j : cp.segments.length - 1 - j]; - var lastSeg = i === cps.length - 1 && j === cp.segments.length - 1; - - startDist = totalDist; - totalDist += seg.length; - - if (totalDist >= offset || lastSeg) { - selected = { cp: cp, segment: seg }; - break; - } - } - - if (selected) { - break; - } - } - - var cp = selected.cp; - var seg = selected.segment; - var tSegment = (offset - startDist) / seg.length; - var segDt = seg.t1 - seg.t0; - var t = isSrc ? seg.t0 + segDt * tSegment : seg.t1 - segDt * tSegment; - - t = math.bound(0, t, 1); - p = math.qbezierPtAt(cp.p0, cp.p1, cp.p2, t); - angle = bezierAngle(cp.p0, cp.p1, cp.p2, t, p); - - break; - - case 'straight': - case 'segments': - case 'haystack': - var d = 0, - di, - d0; - var p0, p1; - var l = rs.allpts.length; - - for (var i = 0; i + 3 < l; i += 2) { - if (isSrc) { - p0 = { x: rs.allpts[i], y: rs.allpts[i + 1] }; - p1 = { x: rs.allpts[i + 2], y: rs.allpts[i + 3] }; - } else { - p0 = { x: rs.allpts[l - 2 - i], y: rs.allpts[l - 1 - i] }; - p1 = { x: rs.allpts[l - 4 - i], y: rs.allpts[l - 3 - i] }; - } - - di = math.dist(p0, p1); - d0 = d; - d += di; - - if (d >= offset) { - break; - } - } - - var pD = offset - d0; - var t = pD / di; - - t = math.bound(0, t, 1); - p = math.lineAt(p0, p1, t); - angle = lineAngle(p0, p1); - - break; - } - - setRs('labelX', prefix, p.x); - setRs('labelY', prefix, p.y); - setRs('labelAutoAngle', prefix, angle); - }; - - calculateEndProjection('source'); - calculateEndProjection('target'); - - this.applyLabelDimensions(edge); -}; - -BRp.applyLabelDimensions = function (ele) { - this.applyPrefixedLabelDimensions(ele); - - if (ele.isEdge()) { - this.applyPrefixedLabelDimensions(ele, 'source'); - this.applyPrefixedLabelDimensions(ele, 'target'); - } -}; - -BRp.applyPrefixedLabelDimensions = function (ele, prefix) { - var _p = ele._private; - - var text = this.getLabelText(ele, prefix); - var labelDims = this.calculateLabelDimensions(ele, text); - - util.setPrefixedProperty(_p.rstyle, 'labelWidth', prefix, labelDims.width); - util.setPrefixedProperty(_p.rscratch, 'labelWidth', prefix, labelDims.width); - - util.setPrefixedProperty(_p.rstyle, 'labelHeight', prefix, labelDims.height); - util.setPrefixedProperty(_p.rscratch, 'labelHeight', prefix, labelDims.height); -}; - -BRp.getLabelText = function (ele, prefix) { - var _p = ele._private; - var pfd = prefix ? prefix + '-' : ''; - var text = ele.pstyle(pfd + 'label').strValue; - var textTransform = ele.pstyle('text-transform').value; - var rscratch = function rscratch(propName, value) { - if (value) { - util.setPrefixedProperty(_p.rscratch, propName, prefix, value); - return value; - } else { - return util.getPrefixedProperty(_p.rscratch, propName, prefix); - } - }; - - // for empty text, skip all processing - if (!text) { - return ''; - } - - if (textTransform == 'none') { - // passthrough - } else if (textTransform == 'uppercase') { - text = text.toUpperCase(); - } else if (textTransform == 'lowercase') { - text = text.toLowerCase(); - } - - var wrapStyle = ele.pstyle('text-wrap').value; - - if (wrapStyle === 'wrap') { - //console.log('wrap'); - - var labelKey = rscratch('labelKey'); - - // save recalc if the label is the same as before - if (labelKey && rscratch('labelWrapKey') === labelKey) { - // console.log('wrap cache hit'); - return rscratch('labelWrapCachedText'); - } - // console.log('wrap cache miss'); - - var lines = text.split('\n'); - var maxW = ele.pstyle('text-max-width').pfValue; - var wrappedLines = []; - - for (var l = 0; l < lines.length; l++) { - var line = lines[l]; - var lineDims = this.calculateLabelDimensions(ele, line, 'line=' + line); - var lineW = lineDims.width; - - if (lineW > maxW) { - // line is too long - var words = line.split(/\s+/); // NB: assume collapsed whitespace into single space - var subline = ''; - - for (var w = 0; w < words.length; w++) { - var word = words[w]; - var testLine = subline.length === 0 ? word : subline + ' ' + word; - var testDims = this.calculateLabelDimensions(ele, testLine, 'testLine=' + testLine); - var testW = testDims.width; - - if (testW <= maxW) { - // word fits on current line - subline += word + ' '; - } else { - // word starts new line - wrappedLines.push(subline); - subline = word + ' '; - } - } - - // if there's remaining text, put it in a wrapped line - if (!subline.match(/^\s+$/)) { - wrappedLines.push(subline); - } - } else { - // line is already short enough - wrappedLines.push(line); - } - } // for - - rscratch('labelWrapCachedLines', wrappedLines); - text = rscratch('labelWrapCachedText', wrappedLines.join('\n')); - rscratch('labelWrapKey', labelKey); - - // console.log(text) - } else if (wrapStyle === 'ellipsis') { - var maxW = ele.pstyle('text-max-width').pfValue; - var ellipsized = ''; - var ellipsis = '\u2026'; - var incLastCh = false; - - for (var i = 0; i < text.length; i++) { - var widthWithNextCh = this.calculateLabelDimensions(ele, ellipsized + text[i] + ellipsis).width; - - if (widthWithNextCh > maxW) { - break; - } - - ellipsized += text[i]; - - if (i === text.length - 1) { - incLastCh = true; - } - } - - if (!incLastCh) { - ellipsized += ellipsis; - } - - return ellipsized; - } // if ellipsize - - return text; -}; - -BRp.calculateLabelDimensions = function (ele, text, extraKey) { - var r = this; - - var cacheKey = ele._private.labelStyleKey + '$@$' + text; - - if (extraKey) { - cacheKey += '$@$' + extraKey; - } - - var cache = r.labelDimCache || (r.labelDimCache = {}); - - if (cache[cacheKey]) { - return cache[cacheKey]; - } - - var sizeMult = 1; // increase the scale to increase accuracy w.r.t. zoomed text - var fStyle = ele.pstyle('font-style').strValue; - var size = sizeMult * ele.pstyle('font-size').pfValue + 'px'; - var family = ele.pstyle('font-family').strValue; - var weight = ele.pstyle('font-weight').strValue; - - var div = this.labelCalcDiv; - - if (!div) { - div = this.labelCalcDiv = document.createElement('div'); // eslint-disable-line no-undef - document.body.appendChild(div); // eslint-disable-line no-undef - } - - var ds = div.style; - - // from ele style - ds.fontFamily = family; - ds.fontStyle = fStyle; - ds.fontSize = size; - ds.fontWeight = weight; - - // forced style - ds.position = 'absolute'; - ds.left = '-9999px'; - ds.top = '-9999px'; - ds.zIndex = '-1'; - ds.visibility = 'hidden'; - ds.pointerEvents = 'none'; - ds.padding = '0'; - ds.lineHeight = '1'; - - if (ele.pstyle('text-wrap').value === 'wrap') { - ds.whiteSpace = 'pre'; // so newlines are taken into account - } else { - ds.whiteSpace = 'normal'; - } - - // put label content in div - div.textContent = text; - - cache[cacheKey] = { - width: Math.ceil(div.clientWidth / sizeMult), - height: Math.ceil(div.clientHeight / sizeMult) - }; - - return cache[cacheKey]; -}; - -BRp.calculateLabelAngles = function (ele) { - var _p = ele._private; - var rs = _p.rscratch; - var isEdge = ele.isEdge(); - var rot = ele.pstyle('text-rotation'); - var rotStr = rot.strValue; - - if (rotStr === 'none') { - rs.labelAngle = rs.sourceLabelAngle = rs.targetLabelAngle = 0; - } else if (isEdge && rotStr === 'autorotate') { - rs.labelAngle = rs.labelAutoAngle; - rs.sourceLabelAngle = rs.sourceLabelAutoAngle; - rs.targetLabelAngle = rs.targetLabelAutoAngle; - } else if (rotStr === 'autorotate') { - rs.labelAngle = rs.sourceLabelAngle = rs.targetLabelAngle = 0; - } else { - rs.labelAngle = rs.sourceLabelAngle = rs.targetLabelAngle = rot.pfValue; - } -}; - -module.exports = BRp; - -/***/ }), -/* 117 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var BRp = {}; - -BRp.getNodeShape = function (node) { - var r = this; - var shape = node.pstyle('shape').value; - - if (node.isParent()) { - if (shape === 'rectangle' || shape === 'roundrectangle' || shape === 'cutrectangle' || shape === 'barrel') { - return shape; - } else { - return 'rectangle'; - } - } - - if (shape === 'polygon') { - var points = node.pstyle('shape-polygon-points').value; - - return r.nodeShapes.makePolygon(points).name; - } - - return shape; -}; - -module.exports = BRp; - -/***/ }), -/* 118 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var BRp = {}; - -BRp.registerCalculationListeners = function () { - var cy = this.cy; - var elesToUpdate = cy.collection(); - var r = this; - - var enqueue = function enqueue(eles, e) { - var dirtyStyleCaches = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; - - elesToUpdate.merge(eles); - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var _p = ele._private; - var rstyle = _p.rstyle; - - if (dirtyStyleCaches) { - rstyle.clean = false; - _p.bbCache = null; - } - - var evts = rstyle.dirtyEvents = rstyle.dirtyEvents || { length: 0 }; - - if (!evts[e.type]) { - evts[e.type] = true; - evts.length++; - } - } - }; - - r.binder(cy) - // nodes - - .on('position.* style.* free.* bounds.*', 'node', function onDirtyModNode(e) { - var node = e.target; - - enqueue(node, e); - enqueue(node.connectedEdges(), e); - }).on('add.*', 'node', function onDirtyAddNode(e) { - var ele = e.target; - - enqueue(ele, e); - }).on('background.*', 'node', function onDirtyBgNode(e) { - var ele = e.target; - - enqueue(ele, e, false); - }) - - // edges - - .on('add.* style.*', 'edge', function onDirtyEdge(e) { - var edge = e.target; - - enqueue(edge, e); - enqueue(edge.parallelEdges(), e); - }).on('remove.*', 'edge', function onDirtyRemoveEdge(e) { - var edge = e.target; - var pEdges = edge.parallelEdges(); - - for (var i = 0; i < pEdges.length; i++) { - var pEdge = pEdges[i]; - - if (!pEdge.removed()) { - enqueue(pEdge, e); - } - } - }) - - // manual dirtying - - .on('dirty.*', 'node', function onDirtyEle(e) { - var ele = e.target; - - enqueue(ele, e); - }); - - var updateEleCalcs = function updateEleCalcs(willDraw) { - if (willDraw) { - var fns = r.onUpdateEleCalcsFns; - - if (fns) { - for (var i = 0; i < fns.length; i++) { - var fn = fns[i]; - - fn(willDraw, elesToUpdate); - } - } - - r.recalculateRenderedStyle(elesToUpdate, false); - - for (var i = 0; i < elesToUpdate.length; i++) { - elesToUpdate[i]._private.rstyle.dirtyEvents = null; - } - - elesToUpdate = cy.collection(); - } - }; - - r.beforeRender(updateEleCalcs, r.beforeRenderPriorities.eleCalcs); -}; - -BRp.onUpdateEleCalcs = function (fn) { - var fns = this.onUpdateEleCalcsFns = this.onUpdateEleCalcsFns || []; - - fns.push(fn); -}; - -BRp.recalculateRenderedStyle = function (eles, useCache) { - var edges = []; - var nodes = []; - - // the renderer can't be used for calcs when destroyed, e.g. ele.boundingBox() - if (this.destroyed) { - return; - } - - // use cache by default for perf - if (useCache === undefined) { - useCache = true; - } - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var _p = ele._private; - var rstyle = _p.rstyle; - - // only update if dirty and in graph - if (useCache && rstyle.clean || ele.removed()) { - continue; - } - - // only update if not display: none - if (ele.pstyle('display').value === 'none') { - continue; - } - - if (_p.group === 'nodes') { - nodes.push(ele); - } else { - // edges - edges.push(ele); - } - - rstyle.clean = true; - // rstyle.dirtyEvents = null; - } - - // update node data from projections - for (var i = 0; i < nodes.length; i++) { - var ele = nodes[i]; - var _p = ele._private; - var rstyle = _p.rstyle; - var pos = ele.position(); - - this.recalculateNodeLabelProjection(ele); - - rstyle.nodeX = pos.x; - rstyle.nodeY = pos.y; - rstyle.nodeW = ele.pstyle('width').pfValue; - rstyle.nodeH = ele.pstyle('height').pfValue; - } - - this.recalculateEdgeProjections(edges); - - // update edge data from projections - for (var i = 0; i < edges.length; i++) { - var ele = edges[i]; - var _p = ele._private; - var rstyle = _p.rstyle; - var rs = _p.rscratch; - - this.recalculateEdgeLabelProjections(ele); - - // update rstyle positions - rstyle.srcX = rs.arrowStartX; - rstyle.srcY = rs.arrowStartY; - rstyle.tgtX = rs.arrowEndX; - rstyle.tgtY = rs.arrowEndY; - rstyle.midX = rs.midX; - rstyle.midY = rs.midY; - rstyle.labelAngle = rs.labelAngle; - rstyle.sourceLabelAngle = rs.sourceLabelAngle; - rstyle.targetLabelAngle = rs.targetLabelAngle; - } -}; - -module.exports = BRp; - -/***/ }), -/* 119 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var zIndexSort = __webpack_require__(17); - -var BRp = {}; - -BRp.updateCachedGrabbedEles = function () { - var eles = this.cachedZSortedEles; - - if (!eles) { - // just let this be recalculated on the next z sort tick - return; - } - - eles.drag = []; - eles.nondrag = []; - - var grabTargets = []; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var rs = ele._private.rscratch; - - if (ele.grabbed() && !ele.isParent()) { - grabTargets.push(ele); - } else if (rs.inDragLayer) { - eles.drag.push(ele); - } else { - eles.nondrag.push(ele); - } - } - - // put the grab target nodes last so it's on top of its neighbourhood - for (var i = 0; i < grabTargets.length; i++) { - var ele = grabTargets[i]; - - eles.drag.push(ele); - } -}; - -BRp.invalidateCachedZSortedEles = function () { - this.cachedZSortedEles = null; -}; - -BRp.getCachedZSortedEles = function (forceRecalc) { - if (forceRecalc || !this.cachedZSortedEles) { - //console.time('cachezorder') - - var eles = this.cy.mutableElements().toArray(); - - eles.sort(zIndexSort); - - eles.interactive = eles.filter(function (ele) { - return ele.interactive(); - }); - - this.cachedZSortedEles = eles; - - this.updateCachedGrabbedEles(); - } else { - eles = this.cachedZSortedEles; - } - - return eles; -}; - -module.exports = BRp; - -/***/ }), -/* 120 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var BRp = {}; - -BRp.getCachedImage = function (url, crossOrigin, onLoad) { - var r = this; - var imageCache = r.imageCache = r.imageCache || {}; - var cache = imageCache[url]; - - if (cache) { - if (!cache.image.complete) { - cache.image.addEventListener('load', onLoad); - } - - return cache.image; - } else { - cache = imageCache[url] = imageCache[url] || {}; - - var image = cache.image = new Image(); // eslint-disable-line no-undef - - image.addEventListener('load', onLoad); - image.addEventListener('error', function () { - image.error = true; - }); - - // #1582 safari doesn't load data uris with crossOrigin properly - // https://bugs.webkit.org/show_bug.cgi?id=123978 - var dataUriPrefix = 'data:'; - var isDataUri = url.substring(0, dataUriPrefix.length).toLowerCase() === dataUriPrefix; - if (!isDataUri) { - image.crossOrigin = crossOrigin; // prevent tainted canvas - } - - image.src = url; - - return image; - } -}; - -module.exports = BRp; - -/***/ }), -/* 121 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var math = __webpack_require__(2); -var Event = __webpack_require__(16); - -var BRp = {}; - -BRp.registerBinding = function (target, event, handler, useCapture) { - var args = Array.prototype.slice.apply(arguments, [1]); // copy - var b = this.binder(target); - - return b.on.apply(b, args); -}; - -BRp.binder = function (tgt) { - var r = this; - - var tgtIsDom = tgt === window || tgt === document || tgt === document.body || is.domElement(tgt); - - if (r.supportsPassiveEvents == null) { - - // from https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md#feature-detection - var supportsPassive = false; - try { - var opts = Object.defineProperty({}, 'passive', { - get: function get() { - supportsPassive = true; - } - }); - - window.addEventListener('test', null, opts); - } catch (err) {} - - r.supportsPassiveEvents = supportsPassive; - } - - var on = function on(event, handler, useCapture) { - var args = Array.prototype.slice.call(arguments); - - if (tgtIsDom && r.supportsPassiveEvents) { - // replace useCapture w/ opts obj - args[2] = { - capture: useCapture != null ? useCapture : false, - passive: false, - once: false - }; - } - - r.bindings.push({ - target: tgt, - args: args - }); - - (tgt.addEventListener || tgt.on).apply(tgt, args); - - return this; - }; - - return { - on: on, - addEventListener: on, - addListener: on, - bind: on - }; -}; - -BRp.nodeIsDraggable = function (node) { - return node && node.isNode() && !node.locked() && node.grabbable(); -}; - -BRp.nodeIsGrabbable = function (node) { - return this.nodeIsDraggable(node) && node.interactive(); -}; - -BRp.load = function () { - var r = this; - - var triggerEvents = function triggerEvents(target, names, e, props) { - if (target == null) { - target = r.cy; - } - - for (var i = 0; i < names.length; i++) { - var name = names[i]; - - target.emit(util.extend({ originalEvent: e, type: name }, props)); - } - }; - - var isMultSelKeyDown = function isMultSelKeyDown(e) { - return e.shiftKey || e.metaKey || e.ctrlKey; // maybe e.altKey - }; - - var allowPanningPassthrough = function allowPanningPassthrough(down, downs) { - var allowPassthrough = true; - - if (r.cy.hasCompoundNodes() && down && down.isEdge()) { - // a compound node below the edge => no passthrough panning - for (var i = 0; downs && i < downs.length; i++) { - var down = downs[i]; - - if (down.isNode() && down.isParent()) { - allowPassthrough = false; - break; - } - } - } else { - allowPassthrough = true; - } - - return allowPassthrough; - }; - - var getDragListIds = function getDragListIds(opts) { - var listHasId; - - if (opts.addToList && r.cy.hasCompoundNodes()) { - // only needed for compound graphs - if (!opts.addToList.hasId) { - // build ids lookup if doesn't already exist - opts.addToList.hasId = {}; - - for (var i = 0; i < opts.addToList.length; i++) { - var ele = opts.addToList[i]; - - opts.addToList.hasId[ele.id()] = true; - } - } - - listHasId = opts.addToList.hasId; - } - - return listHasId || {}; - }; - - var setGrabbed = function setGrabbed(ele) { - ele[0]._private.grabbed = true; - }; - - var setFreed = function setFreed(ele) { - ele[0]._private.grabbed = false; - }; - - var setInDragLayer = function setInDragLayer(ele) { - ele[0]._private.rscratch.inDragLayer = true; - }; - - var setOutDragLayer = function setOutDragLayer(ele) { - ele[0]._private.rscratch.inDragLayer = false; - }; - - var setGrabTarget = function setGrabTarget(ele) { - ele[0]._private.rscratch.isGrabTarget = true; - }; - - var removeGrabTarget = function removeGrabTarget(ele) { - ele[0]._private.rscratch.isGrabTarget = false; - }; - - var addToDragList = function addToDragList(ele, opts) { - var listHasId = getDragListIds(opts); - - if (!listHasId[ele.id()]) { - opts.addToList.push(ele); - listHasId[ele.id()] = true; - - setGrabbed(ele); - } - }; - - // helper function to determine which child nodes and inner edges - // of a compound node to be dragged as well as the grabbed and selected nodes - var addDescendantsToDrag = function addDescendantsToDrag(node, opts) { - if (!node.cy().hasCompoundNodes()) { - return; - } - - if (opts.inDragLayer == null && opts.addToList == null) { - return; - } // nothing to do - - var innerNodes = node.descendants(); - - if (opts.inDragLayer) { - innerNodes.forEach(setInDragLayer); - innerNodes.connectedEdges().forEach(setInDragLayer); - } - - if (opts.addToList) { - innerNodes.forEach(function (ele) { - addToDragList(ele, opts); - }); - } - }; - - // adds the given nodes and its neighbourhood to the drag layer - var addNodesToDrag = function addNodesToDrag(nodes, opts) { - opts = opts || {}; - - var hasCompoundNodes = nodes.cy().hasCompoundNodes(); - - if (opts.inDragLayer) { - nodes.forEach(setInDragLayer); - - nodes.neighborhood().stdFilter(function (ele) { - return !hasCompoundNodes || ele.isEdge(); - }).forEach(setInDragLayer); - } - - if (opts.addToList) { - nodes.forEach(function (ele) { - addToDragList(ele, opts); - }); - } - - addDescendantsToDrag(nodes, opts); // always add to drag - - // also add nodes and edges related to the topmost ancestor - updateAncestorsInDragLayer(nodes, { - inDragLayer: opts.inDragLayer - }); - - r.updateCachedGrabbedEles(); - }; - - var addNodeToDrag = addNodesToDrag; - - var freeDraggedElements = function freeDraggedElements(grabbedEles) { - if (!grabbedEles) { - return; - } - - grabbedEles.hasId = {}; // clear the id list - - // just go over all elements rather than doing a bunch of (possibly expensive) traversals - r.getCachedZSortedEles().forEach(function (ele) { - setFreed(ele); - setOutDragLayer(ele); - removeGrabTarget(ele); - }); - - r.updateCachedGrabbedEles(); - }; - - // helper function to determine which ancestor nodes and edges should go - // to the drag layer (or should be removed from drag layer). - var updateAncestorsInDragLayer = function updateAncestorsInDragLayer(node, opts) { - - if (opts.inDragLayer == null && opts.addToList == null) { - return; - } // nothing to do - - if (!node.cy().hasCompoundNodes()) { - return; - } - - // find top-level parent - var parent = node.ancestors().orphans(); - - // no parent node: no nodes to add to the drag layer - if (parent.same(node)) { - return; - } - - var nodes = parent.descendants().spawnSelf().merge(parent).unmerge(node).unmerge(node.descendants()); - - var edges = nodes.connectedEdges(); - - if (opts.inDragLayer) { - edges.forEach(setInDragLayer); - nodes.forEach(setInDragLayer); - } - - if (opts.addToList) { - nodes.forEach(function (ele) { - addToDragList(ele, opts); - }); - } - }; - - var blurActiveDomElement = function blurActiveDomElement() { - if (document.activeElement != null && document.activeElement.blur != null) { - document.activeElement.blur(); - } - }; - - var haveMutationsApi = typeof MutationObserver !== 'undefined'; - - // watch for when the cy container is removed from the dom - if (haveMutationsApi) { - r.removeObserver = new MutationObserver(function (mutns) { - // eslint-disable-line no-undef - for (var i = 0; i < mutns.length; i++) { - var mutn = mutns[i]; - var rNodes = mutn.removedNodes; - - if (rNodes) { - for (var j = 0; j < rNodes.length; j++) { - var rNode = rNodes[j]; - - if (rNode === r.container) { - r.destroy(); - break; - } - } - } - } - }); - - if (r.container.parentNode) { - r.removeObserver.observe(r.container.parentNode, { childList: true }); - } - } else { - r.registerBinding(r.container, 'DOMNodeRemoved', function (e) { - r.destroy(); - }); - } - - var onResize = util.debounce(function () { - r.cy.resize(); - }, 100); - - if (haveMutationsApi) { - r.styleObserver = new MutationObserver(onResize); // eslint-disable-line no-undef - - r.styleObserver.observe(r.container, { attributes: true }); - } - - // auto resize - r.registerBinding(window, 'resize', onResize); // eslint-disable-line no-undef - - var forEachUp = function forEachUp(domEle, fn) { - while (domEle != null) { - fn(domEle); - - domEle = domEle.parentNode; - } - }; - - var invalidateCoords = function invalidateCoords() { - r.invalidateContainerClientCoordsCache(); - }; - - forEachUp(r.container, function (domEle) { - r.registerBinding(domEle, 'transitionend', invalidateCoords); - r.registerBinding(domEle, 'animationend', invalidateCoords); - r.registerBinding(domEle, 'scroll', invalidateCoords); - }); - - // stop right click menu from appearing on cy - r.registerBinding(r.container, 'contextmenu', function (e) { - e.preventDefault(); - }); - - var inBoxSelection = function inBoxSelection() { - return r.selection[4] !== 0; - }; - - var eventInContainer = function eventInContainer(e) { - // save cycles if mouse events aren't to be captured - var containerPageCoords = r.findContainerClientCoords(); - var x = containerPageCoords[0]; - var y = containerPageCoords[1]; - var width = containerPageCoords[2]; - var height = containerPageCoords[3]; - - var positions = e.touches ? e.touches : [e]; - var atLeastOnePosInside = false; - - for (var i = 0; i < positions.length; i++) { - var p = positions[i]; - - if (x <= p.clientX && p.clientX <= x + width && y <= p.clientY && p.clientY <= y + height) { - atLeastOnePosInside = true; - break; - } - } - - if (!atLeastOnePosInside) { - return false; - } - - var container = r.container; - var target = e.target; - var tParent = target.parentNode; - var containerIsTarget = false; - - while (tParent) { - if (tParent === container) { - containerIsTarget = true; - break; - } - - tParent = tParent.parentNode; - } - - if (!containerIsTarget) { - return false; - } // if target is outisde cy container, then this event is not for us - - return true; - }; - - // Primary key - r.registerBinding(r.container, 'mousedown', function mousedownHandler(e) { - if (!eventInContainer(e)) { - return; - } - - e.preventDefault(); - - blurActiveDomElement(); - - r.hoverData.capture = true; - r.hoverData.which = e.which; - - var cy = r.cy; - var gpos = [e.clientX, e.clientY]; - var pos = r.projectIntoViewport(gpos[0], gpos[1]); - var select = r.selection; - var nears = r.findNearestElements(pos[0], pos[1], true, false); - var near = nears[0]; - var draggedElements = r.dragData.possibleDragElements; - - r.hoverData.mdownPos = pos; - r.hoverData.mdownGPos = gpos; - - var checkForTaphold = function checkForTaphold() { - r.hoverData.tapholdCancelled = false; - - clearTimeout(r.hoverData.tapholdTimeout); - - r.hoverData.tapholdTimeout = setTimeout(function () { - - if (r.hoverData.tapholdCancelled) { - return; - } else { - var ele = r.hoverData.down; - - if (ele) { - ele.emit({ - originalEvent: e, - type: 'taphold', - position: { x: pos[0], y: pos[1] } - }); - } else { - cy.emit({ - originalEvent: e, - type: 'taphold', - position: { x: pos[0], y: pos[1] } - }); - } - } - }, r.tapholdDuration); - }; - - // Right click button - if (e.which == 3) { - - r.hoverData.cxtStarted = true; - - var cxtEvt = { - originalEvent: e, - type: 'cxttapstart', - position: { x: pos[0], y: pos[1] } - }; - - if (near) { - near.activate(); - near.emit(cxtEvt); - - r.hoverData.down = near; - } else { - cy.emit(cxtEvt); - } - - r.hoverData.downTime = new Date().getTime(); - r.hoverData.cxtDragged = false; - - // Primary button - } else if (e.which == 1) { - - if (near) { - near.activate(); - } - - // Element dragging - { - // If something is under the cursor and it is draggable, prepare to grab it - if (near != null) { - - if (r.nodeIsGrabbable(near)) { - - var makeEvent = function makeEvent(type) { - return { - originalEvent: e, - type: type, - position: { x: pos[0], y: pos[1] } - }; - }; - - var triggerGrab = function triggerGrab(ele) { - ele.emit(makeEvent('grab')); - }; - - setGrabTarget(near); - - if (!near.selected()) { - - draggedElements = r.dragData.possibleDragElements = []; - addNodeToDrag(near, { addToList: draggedElements }); - - near.emit(makeEvent('grabon')).emit(makeEvent('grab')); - } else { - draggedElements = r.dragData.possibleDragElements = []; - - var selectedNodes = cy.$(function (ele) { - return ele.isNode() && ele.selected() && r.nodeIsGrabbable(ele); - }); - - addNodesToDrag(selectedNodes, { addToList: draggedElements }); - - near.emit(makeEvent('grabon')); - - selectedNodes.forEach(triggerGrab); - } - - r.redrawHint('eles', true); - r.redrawHint('drag', true); - } - } - - r.hoverData.down = near; - r.hoverData.downs = nears; - r.hoverData.downTime = new Date().getTime(); - } - - triggerEvents(near, ['mousedown', 'tapstart', 'vmousedown'], e, { - position: { x: pos[0], y: pos[1] } - }); - - if (near == null) { - select[4] = 1; - - r.data.bgActivePosistion = { - x: pos[0], - y: pos[1] - }; - - r.redrawHint('select', true); - - r.redraw(); - } else if (near.isEdge()) { - select[4] = 1; // for future pan - } - - checkForTaphold(); - } - - // Initialize selection box coordinates - select[0] = select[2] = pos[0]; - select[1] = select[3] = pos[1]; - }, false); - - r.registerBinding(window, 'mousemove', function mousemoveHandler(e) { - // eslint-disable-line no-undef - var capture = r.hoverData.capture; - - if (!capture && !eventInContainer(e)) { - return; - } - - var preventDefault = false; - var cy = r.cy; - var zoom = cy.zoom(); - var gpos = [e.clientX, e.clientY]; - var pos = r.projectIntoViewport(gpos[0], gpos[1]); - var mdownPos = r.hoverData.mdownPos; - var mdownGPos = r.hoverData.mdownGPos; - var select = r.selection; - - var near = null; - if (!r.hoverData.draggingEles && !r.hoverData.dragging && !r.hoverData.selecting) { - near = r.findNearestElement(pos[0], pos[1], true, false); - } - var last = r.hoverData.last; - var down = r.hoverData.down; - - var disp = [pos[0] - select[2], pos[1] - select[3]]; - - var draggedElements = r.dragData.possibleDragElements; - - var isOverThresholdDrag; - - if (mdownGPos) { - var dx = gpos[0] - mdownGPos[0]; - var dx2 = dx * dx; - var dy = gpos[1] - mdownGPos[1]; - var dy2 = dy * dy; - var dist2 = dx2 + dy2; - - r.hoverData.isOverThresholdDrag = isOverThresholdDrag = dist2 >= r.desktopTapThreshold2; - } - - var multSelKeyDown = isMultSelKeyDown(e); - - if (isOverThresholdDrag) { - r.hoverData.tapholdCancelled = true; - } - - var updateDragDelta = function updateDragDelta() { - var dragDelta = r.hoverData.dragDelta = r.hoverData.dragDelta || []; - - if (dragDelta.length === 0) { - dragDelta.push(disp[0]); - dragDelta.push(disp[1]); - } else { - dragDelta[0] += disp[0]; - dragDelta[1] += disp[1]; - } - }; - - preventDefault = true; - - triggerEvents(near, ['mousemove', 'vmousemove', 'tapdrag'], e, { - position: { x: pos[0], y: pos[1] } - }); - - var goIntoBoxMode = function goIntoBoxMode() { - r.data.bgActivePosistion = undefined; - - if (!r.hoverData.selecting) { - cy.emit('boxstart'); - } - - select[4] = 1; - r.hoverData.selecting = true; - - r.redrawHint('select', true); - r.redraw(); - }; - - // trigger context drag if rmouse down - if (r.hoverData.which === 3) { - // but only if over threshold - if (isOverThresholdDrag) { - var cxtEvt = { - originalEvent: e, - type: 'cxtdrag', - position: { x: pos[0], y: pos[1] } - }; - - if (down) { - down.emit(cxtEvt); - } else { - cy.emit(cxtEvt); - } - - r.hoverData.cxtDragged = true; - - if (!r.hoverData.cxtOver || near !== r.hoverData.cxtOver) { - - if (r.hoverData.cxtOver) { - r.hoverData.cxtOver.emit({ - originalEvent: e, - type: 'cxtdragout', - position: { x: pos[0], y: pos[1] } - }); - } - - r.hoverData.cxtOver = near; - - if (near) { - near.emit({ - originalEvent: e, - type: 'cxtdragover', - position: { x: pos[0], y: pos[1] } - }); - } - } - } - - // Check if we are drag panning the entire graph - } else if (r.hoverData.dragging) { - preventDefault = true; - - if (cy.panningEnabled() && cy.userPanningEnabled()) { - var deltaP; - - if (r.hoverData.justStartedPan) { - var mdPos = r.hoverData.mdownPos; - - deltaP = { - x: (pos[0] - mdPos[0]) * zoom, - y: (pos[1] - mdPos[1]) * zoom - }; - - r.hoverData.justStartedPan = false; - } else { - deltaP = { - x: disp[0] * zoom, - y: disp[1] * zoom - }; - } - - cy.panBy(deltaP); - - r.hoverData.dragged = true; - } - - // Needs reproject due to pan changing viewport - pos = r.projectIntoViewport(e.clientX, e.clientY); - - // Checks primary button down & out of time & mouse not moved much - } else if (select[4] == 1 && (down == null || down.isEdge())) { - - if (isOverThresholdDrag) { - - if (!r.hoverData.dragging && cy.boxSelectionEnabled() && (multSelKeyDown || !cy.panningEnabled() || !cy.userPanningEnabled())) { - goIntoBoxMode(); - } else if (!r.hoverData.selecting && cy.panningEnabled() && cy.userPanningEnabled()) { - var allowPassthrough = allowPanningPassthrough(down, r.hoverData.downs); - - if (allowPassthrough) { - r.hoverData.dragging = true; - r.hoverData.justStartedPan = true; - select[4] = 0; - - r.data.bgActivePosistion = math.array2point(mdownPos); - - r.redrawHint('select', true); - r.redraw(); - } - } - - if (down && down.isEdge() && down.active()) { - down.unactivate(); - } - } - } else { - if (down && down.isEdge() && down.active()) { - down.unactivate(); - } - - if ((!down || !down.grabbed()) && near != last) { - - if (last) { - triggerEvents(last, ['mouseout', 'tapdragout'], e, { - position: { x: pos[0], y: pos[1] } - }); - } - - if (near) { - triggerEvents(near, ['mouseover', 'tapdragover'], e, { - position: { x: pos[0], y: pos[1] } - }); - } - - r.hoverData.last = near; - } - - if (down) { - - if (isOverThresholdDrag) { - // then we can take action - - if (cy.boxSelectionEnabled() && multSelKeyDown) { - // then selection overrides - if (down && down.grabbed()) { - freeDraggedElements(draggedElements); - - down.emit('free'); - } - - goIntoBoxMode(); - } else if (down && down.grabbed() && r.nodeIsDraggable(down)) { - // drag node - var justStartedDrag = !r.dragData.didDrag; - - if (justStartedDrag) { - r.redrawHint('eles', true); - } - - r.dragData.didDrag = true; // indicate that we actually did drag the node - - var toTrigger = []; - - // now, add the elements to the drag layer if not done already - if (!r.hoverData.draggingEles) { - addNodesToDrag(cy.collection(draggedElements), { inDragLayer: true }); - } - - for (var i = 0; i < draggedElements.length; i++) { - var dEle = draggedElements[i]; - - // Locked nodes not draggable, as well as non-visible nodes - if (r.nodeIsDraggable(dEle) && dEle.grabbed()) { - var dPos = dEle.position(); - - toTrigger.push(dEle); - - if (is.number(disp[0]) && is.number(disp[1])) { - dPos.x += disp[0]; - dPos.y += disp[1]; - - if (justStartedDrag) { - var dragDelta = r.hoverData.dragDelta; - - if (dragDelta && is.number(dragDelta[0]) && is.number(dragDelta[1])) { - dPos.x += dragDelta[0]; - dPos.y += dragDelta[1]; - } - } - } - } - } - - r.hoverData.draggingEles = true; - - var tcol = cy.collection(toTrigger); - - tcol.dirtyCompoundBoundsCache(); - tcol.emit('position drag'); - - r.redrawHint('drag', true); - r.redraw(); - } - } else { - // otherwise save drag delta for when we actually start dragging so the relative grab pos is constant - updateDragDelta(); - } - } - - // prevent the dragging from triggering text selection on the page - preventDefault = true; - } - - select[2] = pos[0];select[3] = pos[1]; - - if (preventDefault) { - if (e.stopPropagation) e.stopPropagation(); - if (e.preventDefault) e.preventDefault(); - return false; - } - }, false); - - r.registerBinding(window, 'mouseup', function mouseupHandler(e) { - // eslint-disable-line no-undef - var capture = r.hoverData.capture; - if (!capture) { - return; - } - r.hoverData.capture = false; - - var cy = r.cy;var pos = r.projectIntoViewport(e.clientX, e.clientY);var select = r.selection; - var near = r.findNearestElement(pos[0], pos[1], true, false); - var draggedElements = r.dragData.possibleDragElements;var down = r.hoverData.down; - var multSelKeyDown = isMultSelKeyDown(e); - - if (r.data.bgActivePosistion) { - r.redrawHint('select', true); - r.redraw(); - } - - r.hoverData.tapholdCancelled = true; - - r.data.bgActivePosistion = undefined; // not active bg now - - if (down) { - down.unactivate(); - } - - if (r.hoverData.which === 3) { - var cxtEvt = { - originalEvent: e, - type: 'cxttapend', - position: { x: pos[0], y: pos[1] } - }; - - if (down) { - down.emit(cxtEvt); - } else { - cy.emit(cxtEvt); - } - - if (!r.hoverData.cxtDragged) { - var cxtTap = { - originalEvent: e, - type: 'cxttap', - position: { x: pos[0], y: pos[1] } - }; - - if (down) { - down.emit(cxtTap); - } else { - cy.emit(cxtTap); - } - } - - r.hoverData.cxtDragged = false; - r.hoverData.which = null; - } else if (r.hoverData.which === 1) { - - // Deselect all elements if nothing is currently under the mouse cursor and we aren't dragging something - if (down == null && // not mousedown on node - !r.dragData.didDrag // didn't move the node around - && !r.hoverData.selecting // not box selection - && !r.hoverData.dragged // didn't pan - && !isMultSelKeyDown(e)) { - - cy.$(function (ele) { - return ele.selected(); - }).unselect(); - - if (draggedElements.length > 0) { - r.redrawHint('eles', true); - } - - r.dragData.possibleDragElements = draggedElements = []; - } - - triggerEvents(near, ['mouseup', 'tapend', 'vmouseup'], e, { - position: { x: pos[0], y: pos[1] } - }); - - if (!r.dragData.didDrag // didn't move a node around - && !r.hoverData.dragged // didn't pan - && !r.hoverData.selecting // not box selection - && !r.hoverData.isOverThresholdDrag // didn't move too much - ) { - triggerEvents(down, ['click', 'tap', 'vclick'], e, { - position: { x: pos[0], y: pos[1] } - }); - } - - // Single selection - if (near == down && !r.dragData.didDrag && !r.hoverData.selecting) { - if (near != null && near._private.selectable) { - - if (r.hoverData.dragging) { - // if panning, don't change selection state - } else if (cy.selectionType() === 'additive' || multSelKeyDown) { - if (near.selected()) { - near.unselect(); - } else { - near.select(); - } - } else { - if (!multSelKeyDown) { - cy.$(':selected').unmerge(near).unselect(); - near.select(); - } - } - - r.redrawHint('eles', true); - } - } - - if (r.hoverData.selecting) { - var box = cy.collection(r.getAllInBox(select[0], select[1], select[2], select[3])); - - r.redrawHint('select', true); - - if (box.length > 0) { - r.redrawHint('eles', true); - } - - cy.emit('boxend'); - - var eleWouldBeSelected = function eleWouldBeSelected(ele) { - return ele.selectable() && !ele.selected(); - }; - - if (cy.selectionType() === 'additive') { - box.emit('box').stdFilter(eleWouldBeSelected).select().emit('boxselect'); - } else { - if (!multSelKeyDown) { - cy.$(':selected').unmerge(box).unselect(); - } - - box.emit('box').stdFilter(eleWouldBeSelected).select().emit('boxselect'); - } - - // always need redraw in case eles unselectable - r.redraw(); - } - - // Cancel drag pan - if (r.hoverData.dragging) { - r.hoverData.dragging = false; - - r.redrawHint('select', true); - r.redrawHint('eles', true); - - r.redraw(); - } - - if (!select[4]) { - r.redrawHint('drag', true); - r.redrawHint('eles', true); - - var downWasGrabbed = down && down.grabbed(); - - freeDraggedElements(draggedElements); - - if (downWasGrabbed) { - down.emit('free'); - } - } - } // else not right mouse - - select[4] = 0;r.hoverData.down = null; - - r.hoverData.cxtStarted = false; - r.hoverData.draggingEles = false; - r.hoverData.selecting = false; - r.hoverData.isOverThresholdDrag = false; - r.dragData.didDrag = false; - r.hoverData.dragged = false; - r.hoverData.dragDelta = []; - r.hoverData.mdownPos = null; - r.hoverData.mdownGPos = null; - }, false); - - var wheelHandler = function wheelHandler(e) { - - if (r.scrollingPage) { - return; - } // while scrolling, ignore wheel-to-zoom - - var cy = r.cy; - var pos = r.projectIntoViewport(e.clientX, e.clientY); - var rpos = [pos[0] * cy.zoom() + cy.pan().x, pos[1] * cy.zoom() + cy.pan().y]; - - if (r.hoverData.draggingEles || r.hoverData.dragging || r.hoverData.cxtStarted || inBoxSelection()) { - // if pan dragging or cxt dragging, wheel movements make no zoom - e.preventDefault(); - return; - } - - if (cy.panningEnabled() && cy.userPanningEnabled() && cy.zoomingEnabled() && cy.userZoomingEnabled()) { - e.preventDefault(); - - r.data.wheelZooming = true; - clearTimeout(r.data.wheelTimeout); - r.data.wheelTimeout = setTimeout(function () { - r.data.wheelZooming = false; - - r.redrawHint('eles', true); - r.redraw(); - }, 150); - - var diff; - - if (e.deltaY != null) { - diff = e.deltaY / -250; - } else if (e.wheelDeltaY != null) { - diff = e.wheelDeltaY / 1000; - } else { - diff = e.wheelDelta / 1000; - } - - diff = diff * r.wheelSensitivity; - - var needsWheelFix = e.deltaMode === 1; - if (needsWheelFix) { - // fixes slow wheel events on ff/linux and ff/windows - diff *= 33; - } - - cy.zoom({ - level: cy.zoom() * Math.pow(10, diff), - renderedPosition: { x: rpos[0], y: rpos[1] } - }); - } - }; - - // Functions to help with whether mouse wheel should trigger zooming - // -- - r.registerBinding(r.container, 'wheel', wheelHandler, true); - - // disable nonstandard wheel events - // r.registerBinding(r.container, 'mousewheel', wheelHandler, true); - // r.registerBinding(r.container, 'DOMMouseScroll', wheelHandler, true); - // r.registerBinding(r.container, 'MozMousePixelScroll', wheelHandler, true); // older firefox - - r.registerBinding(window, 'scroll', function scrollHandler(e) { - // eslint-disable-line no-undef - r.scrollingPage = true; - - clearTimeout(r.scrollingPageTimeout); - r.scrollingPageTimeout = setTimeout(function () { - r.scrollingPage = false; - }, 250); - }, true); - - // Functions to help with handling mouseout/mouseover on the Cytoscape container - // Handle mouseout on Cytoscape container - r.registerBinding(r.container, 'mouseout', function mouseOutHandler(e) { - var pos = r.projectIntoViewport(e.clientX, e.clientY); - - r.cy.emit({ - originalEvent: e, - type: 'mouseout', - position: { x: pos[0], y: pos[1] } - }); - }, false); - - r.registerBinding(r.container, 'mouseover', function mouseOverHandler(e) { - var pos = r.projectIntoViewport(e.clientX, e.clientY); - - r.cy.emit({ - originalEvent: e, - type: 'mouseover', - position: { x: pos[0], y: pos[1] } - }); - }, false); - - var f1x1, f1y1, f2x1, f2y1; // starting points for pinch-to-zoom - var distance1, distance1Sq; // initial distance between finger 1 and finger 2 for pinch-to-zoom - var center1, modelCenter1; // center point on start pinch to zoom - var offsetLeft, offsetTop; - var containerWidth, containerHeight; - var twoFingersStartInside; - - var distance = function distance(x1, y1, x2, y2) { - return Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); - }; - - var distanceSq = function distanceSq(x1, y1, x2, y2) { - return (x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1); - }; - - var touchstartHandler; - r.registerBinding(r.container, 'touchstart', touchstartHandler = function touchstartHandler(e) { - if (!eventInContainer(e)) { - return; - } - - blurActiveDomElement(); - - r.touchData.capture = true; - r.data.bgActivePosistion = undefined; - - var cy = r.cy; - var now = r.touchData.now; - var earlier = r.touchData.earlier; - - if (e.touches[0]) { - var pos = r.projectIntoViewport(e.touches[0].clientX, e.touches[0].clientY);now[0] = pos[0];now[1] = pos[1]; - } - if (e.touches[1]) { - var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY);now[2] = pos[0];now[3] = pos[1]; - } - if (e.touches[2]) { - var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY);now[4] = pos[0];now[5] = pos[1]; - } - - // record starting points for pinch-to-zoom - if (e.touches[1]) { - - freeDraggedElements(r.dragData.touchDragEles); - - var offsets = r.findContainerClientCoords(); - offsetLeft = offsets[0]; - offsetTop = offsets[1]; - containerWidth = offsets[2]; - containerHeight = offsets[3]; - - f1x1 = e.touches[0].clientX - offsetLeft; - f1y1 = e.touches[0].clientY - offsetTop; - - f2x1 = e.touches[1].clientX - offsetLeft; - f2y1 = e.touches[1].clientY - offsetTop; - - twoFingersStartInside = 0 <= f1x1 && f1x1 <= containerWidth && 0 <= f2x1 && f2x1 <= containerWidth && 0 <= f1y1 && f1y1 <= containerHeight && 0 <= f2y1 && f2y1 <= containerHeight; - - var pan = cy.pan(); - var zoom = cy.zoom(); - - distance1 = distance(f1x1, f1y1, f2x1, f2y1); - distance1Sq = distanceSq(f1x1, f1y1, f2x1, f2y1); - center1 = [(f1x1 + f2x1) / 2, (f1y1 + f2y1) / 2]; - modelCenter1 = [(center1[0] - pan.x) / zoom, (center1[1] - pan.y) / zoom]; - - // consider context tap - var cxtDistThreshold = 200; - var cxtDistThresholdSq = cxtDistThreshold * cxtDistThreshold; - if (distance1Sq < cxtDistThresholdSq && !e.touches[2]) { - - var near1 = r.findNearestElement(now[0], now[1], true, true); - var near2 = r.findNearestElement(now[2], now[3], true, true); - - if (near1 && near1.isNode()) { - near1.activate().emit({ - originalEvent: e, - type: 'cxttapstart', - position: { x: now[0], y: now[1] } - }); - r.touchData.start = near1; - } else if (near2 && near2.isNode()) { - near2.activate().emit({ - originalEvent: e, - type: 'cxttapstart', - position: { x: now[0], y: now[1] } - }); - r.touchData.start = near2; - } else { - cy.emit({ - originalEvent: e, - type: 'cxttapstart', - position: { x: now[0], y: now[1] } - }); - } - - if (r.touchData.start) { - r.touchData.start._private.grabbed = false; - } - r.touchData.cxt = true; - r.touchData.cxtDragged = false; - r.data.bgActivePosistion = undefined; - - r.redraw(); - return; - } - } - - if (e.touches[2]) { - // ignore - } else if (e.touches[1]) { - // ignore - } else if (e.touches[0]) { - var nears = r.findNearestElements(now[0], now[1], true, true); - var near = nears[0]; - - if (near != null) { - near.activate(); - - r.touchData.start = near; - r.touchData.starts = nears; - - if (r.nodeIsGrabbable(near)) { - - var draggedEles = r.dragData.touchDragEles = []; - var selectedNodes = null; - - r.redrawHint('eles', true); - r.redrawHint('drag', true); - - if (near.selected()) { - // reset drag elements, since near will be added again - - selectedNodes = cy.$(function (ele) { - return ele.selected() && r.nodeIsGrabbable(ele); - }); - - addNodesToDrag(selectedNodes, { addToList: draggedEles }); - } else { - addNodeToDrag(near, { addToList: draggedEles }); - } - - setGrabTarget(near); - - var makeEvent = function makeEvent(type) { - return { - originalEvent: e, - type: type, - position: { x: now[0], y: now[1] } - }; - }; - - near.emit(makeEvent('grabon')); - - if (selectedNodes) { - selectedNodes.forEach(function (n) { - n.emit(makeEvent('grab')); - }); - } else { - near.emit(makeEvent('grab')); - } - } - } - - triggerEvents(near, ['touchstart', 'tapstart', 'vmousedown'], e, { - position: { x: now[0], y: now[1] } - }); - - if (near == null) { - r.data.bgActivePosistion = { - x: pos[0], - y: pos[1] - }; - - r.redrawHint('select', true); - r.redraw(); - } - - // Tap, taphold - // ----- - - r.touchData.singleTouchMoved = false; - r.touchData.singleTouchStartTime = +new Date(); - - clearTimeout(r.touchData.tapholdTimeout); - r.touchData.tapholdTimeout = setTimeout(function () { - if (r.touchData.singleTouchMoved === false && !r.pinching // if pinching, then taphold unselect shouldn't take effect - && !r.touchData.selecting // box selection shouldn't allow taphold through - ) { - triggerEvents(r.touchData.start, ['taphold'], e, { - position: { x: now[0], y: now[1] } - }); - - if (!r.touchData.start) { - cy.$(':selected').unselect(); - } - } - }, r.tapholdDuration); - } - - if (e.touches.length >= 1) { - var sPos = r.touchData.startPosition = []; - - for (var i = 0; i < now.length; i++) { - sPos[i] = earlier[i] = now[i]; - } - - var touch0 = e.touches[0]; - - r.touchData.startGPosition = [touch0.clientX, touch0.clientY]; - } - }, false); - - var touchmoveHandler; - r.registerBinding(window, 'touchmove', touchmoveHandler = function touchmoveHandler(e) { - // eslint-disable-line no-undef - var capture = r.touchData.capture; - - if (!capture && !eventInContainer(e)) { - return; - } - - var select = r.selection; - var cy = r.cy; - var now = r.touchData.now; - var earlier = r.touchData.earlier; - var zoom = cy.zoom(); - - if (e.touches[0]) { - var pos = r.projectIntoViewport(e.touches[0].clientX, e.touches[0].clientY);now[0] = pos[0];now[1] = pos[1]; - } - if (e.touches[1]) { - var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY);now[2] = pos[0];now[3] = pos[1]; - } - if (e.touches[2]) { - var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY);now[4] = pos[0];now[5] = pos[1]; - } - - var startGPos = r.touchData.startGPosition; - var isOverThresholdDrag; - - if (capture && e.touches[0] && startGPos) { - var disp = [];for (var j = 0; j < now.length; j++) { - disp[j] = now[j] - earlier[j]; - } - var dx = e.touches[0].clientX - startGPos[0]; - var dx2 = dx * dx; - var dy = e.touches[0].clientY - startGPos[1]; - var dy2 = dy * dy; - var dist2 = dx2 + dy2; - - isOverThresholdDrag = dist2 >= r.touchTapThreshold2; - } - - // context swipe cancelling - if (capture && r.touchData.cxt) { - e.preventDefault(); - - var f1x2 = e.touches[0].clientX - offsetLeft, - f1y2 = e.touches[0].clientY - offsetTop; - var f2x2 = e.touches[1].clientX - offsetLeft, - f2y2 = e.touches[1].clientY - offsetTop; - // var distance2 = distance( f1x2, f1y2, f2x2, f2y2 ); - var distance2Sq = distanceSq(f1x2, f1y2, f2x2, f2y2); - var factorSq = distance2Sq / distance1Sq; - - var distThreshold = 150; - var distThresholdSq = distThreshold * distThreshold; - var factorThreshold = 1.5; - var factorThresholdSq = factorThreshold * factorThreshold; - - // cancel ctx gestures if the distance b/t the fingers increases - if (factorSq >= factorThresholdSq || distance2Sq >= distThresholdSq) { - r.touchData.cxt = false; - - r.data.bgActivePosistion = undefined; - - r.redrawHint('select', true); - - var cxtEvt = { - originalEvent: e, - type: 'cxttapend', - position: { x: now[0], y: now[1] } - }; - - if (r.touchData.start) { - r.touchData.start.unactivate().emit(cxtEvt); - - r.touchData.start = null; - } else { - cy.emit(cxtEvt); - } - } - } - - // context swipe - if (capture && r.touchData.cxt) { - var cxtEvt = { - originalEvent: e, - type: 'cxtdrag', - position: { x: now[0], y: now[1] } - }; - r.data.bgActivePosistion = undefined; - r.redrawHint('select', true); - - if (r.touchData.start) { - r.touchData.start.emit(cxtEvt); - } else { - cy.emit(cxtEvt); - } - - if (r.touchData.start) { - r.touchData.start._private.grabbed = false; - } - r.touchData.cxtDragged = true; - - var near = r.findNearestElement(now[0], now[1], true, true); - - if (!r.touchData.cxtOver || near !== r.touchData.cxtOver) { - - if (r.touchData.cxtOver) { - r.touchData.cxtOver.emit({ - originalEvent: e, - type: 'cxtdragout', - position: { x: now[0], y: now[1] } - }); - } - - r.touchData.cxtOver = near; - - if (near) { - near.emit({ - originalEvent: e, - type: 'cxtdragover', - position: { x: now[0], y: now[1] } - }); - } - } - - // box selection - } else if (capture && e.touches[2] && cy.boxSelectionEnabled()) { - e.preventDefault(); - - r.data.bgActivePosistion = undefined; - - this.lastThreeTouch = +new Date(); - - if (!r.touchData.selecting) { - cy.emit('boxstart'); - } - - r.touchData.selecting = true; - - r.redrawHint('select', true); - - if (!select || select.length === 0 || select[0] === undefined) { - select[0] = (now[0] + now[2] + now[4]) / 3; - select[1] = (now[1] + now[3] + now[5]) / 3; - select[2] = (now[0] + now[2] + now[4]) / 3 + 1; - select[3] = (now[1] + now[3] + now[5]) / 3 + 1; - } else { - select[2] = (now[0] + now[2] + now[4]) / 3; - select[3] = (now[1] + now[3] + now[5]) / 3; - } - - select[4] = 1; - r.touchData.selecting = true; - - r.redraw(); - - // pinch to zoom - } else if (capture && e.touches[1] && cy.zoomingEnabled() && cy.panningEnabled() && cy.userZoomingEnabled() && cy.userPanningEnabled()) { - // two fingers => pinch to zoom - e.preventDefault(); - - r.data.bgActivePosistion = undefined; - r.redrawHint('select', true); - - var draggedEles = r.dragData.touchDragEles; - if (draggedEles) { - r.redrawHint('drag', true); - - for (var i = 0; i < draggedEles.length; i++) { - var de_p = draggedEles[i]._private; - - de_p.grabbed = false; - de_p.rscratch.inDragLayer = false; - } - } - - // (x2, y2) for fingers 1 and 2 - var f1x2 = e.touches[0].clientX - offsetLeft, - f1y2 = e.touches[0].clientY - offsetTop; - var f2x2 = e.touches[1].clientX - offsetLeft, - f2y2 = e.touches[1].clientY - offsetTop; - - var distance2 = distance(f1x2, f1y2, f2x2, f2y2); - // var distance2Sq = distanceSq( f1x2, f1y2, f2x2, f2y2 ); - // var factor = Math.sqrt( distance2Sq ) / Math.sqrt( distance1Sq ); - var factor = distance2 / distance1; - - if (twoFingersStartInside) { - // delta finger1 - var df1x = f1x2 - f1x1; - var df1y = f1y2 - f1y1; - - // delta finger 2 - var df2x = f2x2 - f2x1; - var df2y = f2y2 - f2y1; - - // translation is the normalised vector of the two fingers movement - // i.e. so pinching cancels out and moving together pans - var tx = (df1x + df2x) / 2; - var ty = (df1y + df2y) / 2; - - // adjust factor by the speed multiplier - // var speed = 1.5; - // if( factor > 1 ){ - // factor = (factor - 1) * speed + 1; - // } else { - // factor = 1 - (1 - factor) * speed; - // } - - // now calculate the zoom - var zoom1 = cy.zoom(); - var zoom2 = zoom1 * factor; - var pan1 = cy.pan(); - - // the model center point converted to the current rendered pos - var ctrx = modelCenter1[0] * zoom1 + pan1.x; - var ctry = modelCenter1[1] * zoom1 + pan1.y; - - var pan2 = { - x: -zoom2 / zoom1 * (ctrx - pan1.x - tx) + ctrx, - y: -zoom2 / zoom1 * (ctry - pan1.y - ty) + ctry - }; - - // remove dragged eles - if (r.touchData.start && r.touchData.start.active()) { - var draggedEles = r.dragData.touchDragEles; - - freeDraggedElements(draggedEles); - - r.redrawHint('drag', true); - r.redrawHint('eles', true); - - r.touchData.start.unactivate().emit('free'); - } - - cy.viewport({ - zoom: zoom2, - pan: pan2, - cancelOnFailedZoom: true - }); - - distance1 = distance2; - f1x1 = f1x2; - f1y1 = f1y2; - f2x1 = f2x2; - f2y1 = f2y2; - - r.pinching = true; - } - - // Re-project - if (e.touches[0]) { - var pos = r.projectIntoViewport(e.touches[0].clientX, e.touches[0].clientY);now[0] = pos[0];now[1] = pos[1]; - } - if (e.touches[1]) { - var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY);now[2] = pos[0];now[3] = pos[1]; - } - if (e.touches[2]) { - var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY);now[4] = pos[0];now[5] = pos[1]; - } - } else if (e.touches[0]) { - var start = r.touchData.start; - var last = r.touchData.last; - var near; - - if (!r.hoverData.draggingEles && !r.swipePanning) { - near = r.findNearestElement(now[0], now[1], true, true); - } - - if (capture && start != null) { - e.preventDefault(); - } - - // dragging nodes - if (capture && start != null && r.nodeIsDraggable(start)) { - - if (isOverThresholdDrag) { - // then dragging can happen - var draggedEles = r.dragData.touchDragEles; - var justStartedDrag = !r.dragData.didDrag; - - if (justStartedDrag) { - addNodesToDrag(cy.collection(draggedEles), { inDragLayer: true }); - } - - for (var k = 0; k < draggedEles.length; k++) { - var draggedEle = draggedEles[k]; - - if (r.nodeIsDraggable(draggedEle) && draggedEle.grabbed()) { - r.dragData.didDrag = true; - var dPos = draggedEle.position(); - - if (is.number(disp[0]) && is.number(disp[1])) { - dPos.x += disp[0]; - dPos.y += disp[1]; - } - - if (justStartedDrag) { - r.redrawHint('eles', true); - - var dragDelta = r.touchData.dragDelta; - - if (dragDelta && is.number(dragDelta[0]) && is.number(dragDelta[1])) { - dPos.x += dragDelta[0]; - dPos.y += dragDelta[1]; - } - } - } - } - - var tcol = cy.collection(draggedEles); - - tcol.dirtyCompoundBoundsCache(); - tcol.emit('position drag'); - - r.hoverData.draggingEles = true; - - r.redrawHint('drag', true); - - if (r.touchData.startPosition[0] == earlier[0] && r.touchData.startPosition[1] == earlier[1]) { - - r.redrawHint('eles', true); - } - - r.redraw(); - } else { - // otherise keep track of drag delta for later - var dragDelta = r.touchData.dragDelta = r.touchData.dragDelta || []; - - if (dragDelta.length === 0) { - dragDelta.push(disp[0]); - dragDelta.push(disp[1]); - } else { - dragDelta[0] += disp[0]; - dragDelta[1] += disp[1]; - } - } - } - - // touchmove - { - triggerEvents(start || near, ['touchmove', 'tapdrag', 'vmousemove'], e, { - position: { x: now[0], y: now[1] } - }); - - if ((!start || !start.grabbed()) && near != last) { - if (last) { - last.emit({ originalEvent: e, type: 'tapdragout', position: { x: now[0], y: now[1] } }); - } - if (near) { - near.emit({ originalEvent: e, type: 'tapdragover', position: { x: now[0], y: now[1] } }); - } - } - - r.touchData.last = near; - } - - // check to cancel taphold - if (capture) { - for (var i = 0; i < now.length; i++) { - if (now[i] && r.touchData.startPosition[i] && isOverThresholdDrag) { - - r.touchData.singleTouchMoved = true; - } - } - } - - // panning - if (capture && (start == null || start.isEdge()) && cy.panningEnabled() && cy.userPanningEnabled()) { - - var allowPassthrough = allowPanningPassthrough(start, r.touchData.starts); - - if (allowPassthrough) { - e.preventDefault(); - - if (r.swipePanning) { - cy.panBy({ - x: disp[0] * zoom, - y: disp[1] * zoom - }); - } else if (isOverThresholdDrag) { - r.swipePanning = true; - - cy.panBy({ - x: dx * zoom, - y: dy * zoom - }); - - if (start) { - start.unactivate(); - - if (!r.data.bgActivePosistion) { - r.data.bgActivePosistion = math.array2point(r.touchData.startPosition); - } - - r.redrawHint('select', true); - - r.touchData.start = null; - } - } - } - - // Re-project - var pos = r.projectIntoViewport(e.touches[0].clientX, e.touches[0].clientY); - now[0] = pos[0];now[1] = pos[1]; - } - } - - for (var j = 0; j < now.length; j++) { - earlier[j] = now[j]; - } - //r.redraw(); - - // the active bg indicator should be removed when making a swipe that is neither for dragging nodes or panning - if (capture && e.touches.length > 0 && !r.hoverData.draggingEles && !r.swipePanning && r.data.bgActivePosistion != null) { - r.data.bgActivePosistion = undefined; - r.redrawHint('select', true); - r.redraw(); - } - }, false); - var touchcancelHandler; - r.registerBinding(window, 'touchcancel', touchcancelHandler = function touchcancelHandler(e) { - // eslint-disable-line no-undef - var start = r.touchData.start; - - r.touchData.capture = false; - - if (start) { - start.unactivate(); - } - }); - - var touchendHandler; - r.registerBinding(window, 'touchend', touchendHandler = function touchendHandler(e) { - // eslint-disable-line no-undef - var start = r.touchData.start; - - var capture = r.touchData.capture; - - if (capture) { - if (e.touches.length === 0) { - r.touchData.capture = false; - } - - e.preventDefault(); - } else { - return; - } - - var select = r.selection; - - r.swipePanning = false; - r.hoverData.draggingEles = false; - - var cy = r.cy; - var zoom = cy.zoom(); - var now = r.touchData.now; - var earlier = r.touchData.earlier; - - if (e.touches[0]) { - var pos = r.projectIntoViewport(e.touches[0].clientX, e.touches[0].clientY);now[0] = pos[0];now[1] = pos[1]; - } - if (e.touches[1]) { - var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY);now[2] = pos[0];now[3] = pos[1]; - } - if (e.touches[2]) { - var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY);now[4] = pos[0];now[5] = pos[1]; - } - - if (start) { - start.unactivate(); - } - - var ctxTapend; - if (r.touchData.cxt) { - ctxTapend = { - originalEvent: e, - type: 'cxttapend', - position: { x: now[0], y: now[1] } - }; - - if (start) { - start.emit(ctxTapend); - } else { - cy.emit(ctxTapend); - } - - if (!r.touchData.cxtDragged) { - var ctxTap = { - originalEvent: e, - type: 'cxttap', - position: { x: now[0], y: now[1] } - }; - - if (start) { - start.emit(ctxTap); - } else { - cy.emit(ctxTap); - } - } - - if (r.touchData.start) { - r.touchData.start._private.grabbed = false; - } - r.touchData.cxt = false; - r.touchData.start = null; - - r.redraw(); - return; - } - - // no more box selection if we don't have three fingers - if (!e.touches[2] && cy.boxSelectionEnabled() && r.touchData.selecting) { - r.touchData.selecting = false; - - var box = cy.collection(r.getAllInBox(select[0], select[1], select[2], select[3])); - - select[0] = undefined; - select[1] = undefined; - select[2] = undefined; - select[3] = undefined; - select[4] = 0; - - r.redrawHint('select', true); - - cy.emit('boxend'); - - var eleWouldBeSelected = function eleWouldBeSelected(ele) { - return ele.selectable() && !ele.selected(); - }; - - box.emit('box').stdFilter(eleWouldBeSelected).select().emit('boxselect'); - - if (box.nonempty()) { - r.redrawHint('eles', true); - } - - r.redraw(); - } - - if (start != null) { - start.unactivate(); - } - - if (e.touches[2]) { - r.data.bgActivePosistion = undefined; - r.redrawHint('select', true); - } else if (e.touches[1]) { - // ignore - } else if (e.touches[0]) { - // ignore - - // Last touch released - } else if (!e.touches[0]) { - - r.data.bgActivePosistion = undefined; - r.redrawHint('select', true); - - var draggedEles = r.dragData.touchDragEles; - - if (start != null) { - - var startWasGrabbed = start._private.grabbed; - - freeDraggedElements(draggedEles); - - r.redrawHint('drag', true); - r.redrawHint('eles', true); - - if (startWasGrabbed) { - start.emit('free'); - } - - triggerEvents(start, ['touchend', 'tapend', 'vmouseup', 'tapdragout'], e, { - position: { x: now[0], y: now[1] } - }); - - start.unactivate(); - - r.touchData.start = null; - } else { - var near = r.findNearestElement(now[0], now[1], true, true); - - triggerEvents(near, ['touchend', 'tapend', 'vmouseup', 'tapdragout'], e, { - position: { x: now[0], y: now[1] } - }); - } - - var dx = r.touchData.startPosition[0] - now[0]; - var dx2 = dx * dx; - var dy = r.touchData.startPosition[1] - now[1]; - var dy2 = dy * dy; - var dist2 = dx2 + dy2; - var rdist2 = dist2 * zoom * zoom; - - // Prepare to select the currently touched node, only if it hasn't been dragged past a certain distance - if (start != null && !r.dragData.didDrag // didn't drag nodes around - && start._private.selectable && rdist2 < r.touchTapThreshold2 && !r.pinching // pinch to zoom should not affect selection - ) { - - if (cy.selectionType() === 'single') { - cy.$(':selected').unmerge(start).unselect(); - start.select(); - } else { - if (start.selected()) { - start.unselect(); - } else { - start.select(); - } - } - - r.redrawHint('eles', true); - } - - // Tap event, roughly same as mouse click event for touch - if (!r.touchData.singleTouchMoved) { - triggerEvents(start, ['tap', 'vclick'], e, { - position: { x: now[0], y: now[1] } - }); - } - - r.touchData.singleTouchMoved = true; - } - - for (var j = 0; j < now.length; j++) { - earlier[j] = now[j]; - } - - r.dragData.didDrag = false; // reset for next mousedown - - if (e.touches.length === 0) { - r.touchData.dragDelta = []; - r.touchData.startPosition = null; - r.touchData.startGPosition = null; - } - - if (e.touches.length < 2) { - r.pinching = false; - r.redrawHint('eles', true); - r.redraw(); - } - - //r.redraw(); - }, false); - - // fallback compatibility layer for ms pointer events - if (typeof TouchEvent === 'undefined') { - - var pointers = []; - - var makeTouch = function makeTouch(e) { - return { - clientX: e.clientX, - clientY: e.clientY, - force: 1, - identifier: e.pointerId, - pageX: e.pageX, - pageY: e.pageY, - radiusX: e.width / 2, - radiusY: e.height / 2, - screenX: e.screenX, - screenY: e.screenY, - target: e.target - }; - }; - - var makePointer = function makePointer(e) { - return { - event: e, - touch: makeTouch(e) - }; - }; - - var addPointer = function addPointer(e) { - pointers.push(makePointer(e)); - }; - - var removePointer = function removePointer(e) { - for (var i = 0; i < pointers.length; i++) { - var p = pointers[i]; - - if (p.event.pointerId === e.pointerId) { - pointers.splice(i, 1); - return; - } - } - }; - - var updatePointer = function updatePointer(e) { - var p = pointers.filter(function (p) { - return p.event.pointerId === e.pointerId; - })[0]; - - p.event = e; - p.touch = makeTouch(e); - }; - - var addTouchesToEvent = function addTouchesToEvent(e) { - e.touches = pointers.map(function (p) { - return p.touch; - }); - }; - - var pointerIsMouse = function pointerIsMouse(e) { - return e.pointerType === 'mouse' || e.pointerType === 4; - }; - - r.registerBinding(r.container, 'pointerdown', function (e) { - if (pointerIsMouse(e)) { - return; - } // mouse already handled - - e.preventDefault(); - - addPointer(e); - - addTouchesToEvent(e); - touchstartHandler(e); - }); - - r.registerBinding(r.container, 'pointerup', function (e) { - if (pointerIsMouse(e)) { - return; - } // mouse already handled - - removePointer(e); - - addTouchesToEvent(e); - touchendHandler(e); - }); - - r.registerBinding(r.container, 'pointercancel', function (e) { - if (pointerIsMouse(e)) { - return; - } // mouse already handled - - removePointer(e); - - addTouchesToEvent(e); - touchcancelHandler(e); - }); - - r.registerBinding(r.container, 'pointermove', function (e) { - if (pointerIsMouse(e)) { - return; - } // mouse already handled - - e.preventDefault(); - - updatePointer(e); - - addTouchesToEvent(e); - touchmoveHandler(e); - }); - } -}; - -module.exports = BRp; - -/***/ }), -/* 122 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); - -var BRp = {}; - -BRp.generatePolygon = function (name, points) { - return this.nodeShapes[name] = { - renderer: this, - - name: name, - - points: points, - - draw: function draw(context, centerX, centerY, width, height) { - this.renderer.nodeShapeImpl('polygon', context, centerX, centerY, width, height, this.points); - }, - - intersectLine: function intersectLine(nodeX, nodeY, width, height, x, y, padding) { - return math.polygonIntersectLine(x, y, this.points, nodeX, nodeY, width / 2, height / 2, padding); - }, - - checkPoint: function checkPoint(x, y, padding, width, height, centerX, centerY) { - return math.pointInsidePolygon(x, y, this.points, centerX, centerY, width, height, [0, -1], padding); - } - }; -}; - -BRp.generateEllipse = function () { - return this.nodeShapes['ellipse'] = { - renderer: this, - - name: 'ellipse', - - draw: function draw(context, centerX, centerY, width, height) { - this.renderer.nodeShapeImpl(this.name, context, centerX, centerY, width, height); - }, - - intersectLine: function intersectLine(nodeX, nodeY, width, height, x, y, padding) { - return math.intersectLineEllipse(x, y, nodeX, nodeY, width / 2 + padding, height / 2 + padding); - }, - - checkPoint: function checkPoint(x, y, padding, width, height, centerX, centerY) { - return math.checkInEllipse(x, y, width, height, centerX, centerY, padding); - } - }; -}; - -BRp.generateRoundRectangle = function () { - return this.nodeShapes['roundrectangle'] = { - renderer: this, - - name: 'roundrectangle', - - points: math.generateUnitNgonPointsFitToSquare(4, 0), - - draw: function draw(context, centerX, centerY, width, height) { - this.renderer.nodeShapeImpl(this.name, context, centerX, centerY, width, height); - }, - - intersectLine: function intersectLine(nodeX, nodeY, width, height, x, y, padding) { - return math.roundRectangleIntersectLine(x, y, nodeX, nodeY, width, height, padding); - }, - - checkPoint: function checkPoint(x, y, padding, width, height, centerX, centerY) { - - var cornerRadius = math.getRoundRectangleRadius(width, height); - var diam = cornerRadius * 2; - - // Check hBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width, height - diam, [0, -1], padding)) { - return true; - } - - // Check vBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width - diam, height, [0, -1], padding)) { - return true; - } - - // Check top left quarter circle - if (math.checkInEllipse(x, y, diam, diam, centerX - width / 2 + cornerRadius, centerY - height / 2 + cornerRadius, padding)) { - - return true; - } - - // Check top right quarter circle - if (math.checkInEllipse(x, y, diam, diam, centerX + width / 2 - cornerRadius, centerY - height / 2 + cornerRadius, padding)) { - - return true; - } - - // Check bottom right quarter circle - if (math.checkInEllipse(x, y, diam, diam, centerX + width / 2 - cornerRadius, centerY + height / 2 - cornerRadius, padding)) { - - return true; - } - - // Check bottom left quarter circle - if (math.checkInEllipse(x, y, diam, diam, centerX - width / 2 + cornerRadius, centerY + height / 2 - cornerRadius, padding)) { - - return true; - } - - return false; - } - }; -}; - -BRp.generateCutRectangle = function () { - return this.nodeShapes['cutrectangle'] = { - renderer: this, - - name: 'cutrectangle', - - cornerLength: math.getCutRectangleCornerLength(), - - points: math.generateUnitNgonPointsFitToSquare(4, 0), - - draw: function draw(context, centerX, centerY, width, height) { - this.renderer.nodeShapeImpl(this.name, context, centerX, centerY, width, height); - }, - - generateCutTrianglePts: function generateCutTrianglePts(width, height, centerX, centerY) { - var cl = this.cornerLength; - var hh = height / 2; - var hw = width / 2; - var xBegin = centerX - hw; - var xEnd = centerX + hw; - var yBegin = centerY - hh; - var yEnd = centerY + hh; - - // points are in clockwise order, inner (imaginary) triangle pt on [4, 5] - return { - topLeft: [xBegin, yBegin + cl, xBegin + cl, yBegin, xBegin + cl, yBegin + cl], - topRight: [xEnd - cl, yBegin, xEnd, yBegin + cl, xEnd - cl, yBegin + cl], - bottomRight: [xEnd, yEnd - cl, xEnd - cl, yEnd, xEnd - cl, yEnd - cl], - bottomLeft: [xBegin + cl, yEnd, xBegin, yEnd - cl, xBegin + cl, yEnd - cl] - }; - }, - - intersectLine: function intersectLine(nodeX, nodeY, width, height, x, y, padding) { - var cPts = this.generateCutTrianglePts(width + 2 * padding, height + 2 * padding, nodeX, nodeY); - var pts = [].concat.apply([], [cPts.topLeft.splice(0, 4), cPts.topRight.splice(0, 4), cPts.bottomRight.splice(0, 4), cPts.bottomLeft.splice(0, 4)]); - - return math.polygonIntersectLine(x, y, pts, nodeX, nodeY); - }, - - checkPoint: function checkPoint(x, y, padding, width, height, centerX, centerY) { - // Check hBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width, height - 2 * this.cornerLength, [0, -1], padding)) { - return true; - } - - // Check vBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width - 2 * this.cornerLength, height, [0, -1], padding)) { - return true; - } - var cutTrianglePts = this.generateCutTrianglePts(width, height, centerX, centerY); - return math.pointInsidePolygonPoints(x, y, cutTrianglePts.topLeft) || math.pointInsidePolygonPoints(x, y, cutTrianglePts.topRight) || math.pointInsidePolygonPoints(x, y, cutTrianglePts.bottomRight) || math.pointInsidePolygonPoints(x, y, cutTrianglePts.bottomLeft); - } - - }; -}; - -BRp.generateBarrel = function () { - return this.nodeShapes['barrel'] = { - renderer: this, - - name: 'barrel', - - points: math.generateUnitNgonPointsFitToSquare(4, 0), - - draw: function draw(context, centerX, centerY, width, height) { - this.renderer.nodeShapeImpl(this.name, context, centerX, centerY, width, height); - }, - - intersectLine: function intersectLine(nodeX, nodeY, width, height, x, y, padding) { - // use two fixed t values for the bezier curve approximation - - var t0 = 0.15; - var t1 = 0.5; - var t2 = 0.85; - - var bPts = this.generateBarrelBezierPts(width + 2 * padding, height + 2 * padding, nodeX, nodeY); - - var approximateBarrelCurvePts = function approximateBarrelCurvePts(pts) { - // approximate curve pts based on the two t values - var m0 = math.qbezierPtAt({ x: pts[0], y: pts[1] }, { x: pts[2], y: pts[3] }, { x: pts[4], y: pts[5] }, t0); - var m1 = math.qbezierPtAt({ x: pts[0], y: pts[1] }, { x: pts[2], y: pts[3] }, { x: pts[4], y: pts[5] }, t1); - var m2 = math.qbezierPtAt({ x: pts[0], y: pts[1] }, { x: pts[2], y: pts[3] }, { x: pts[4], y: pts[5] }, t2); - - return [pts[0], pts[1], m0.x, m0.y, m1.x, m1.y, m2.x, m2.y, pts[4], pts[5]]; - }; - - var pts = [].concat(approximateBarrelCurvePts(bPts.topLeft), approximateBarrelCurvePts(bPts.topRight), approximateBarrelCurvePts(bPts.bottomRight), approximateBarrelCurvePts(bPts.bottomLeft)); - - return math.polygonIntersectLine(x, y, pts, nodeX, nodeY); - }, - - generateBarrelBezierPts: function generateBarrelBezierPts(width, height, centerX, centerY) { - var hh = height / 2; - var hw = width / 2; - var xBegin = centerX - hw; - var xEnd = centerX + hw; - var yBegin = centerY - hh; - var yEnd = centerY + hh; - - var curveConstants = math.getBarrelCurveConstants(width, height); - var hOffset = curveConstants.heightOffset; - var wOffset = curveConstants.widthOffset; - var ctrlPtXOffset = curveConstants.ctrlPtOffsetPct * width; - - // points are in clockwise order, inner (imaginary) control pt on [4, 5] - var pts = { - topLeft: [xBegin, yBegin + hOffset, xBegin + ctrlPtXOffset, yBegin, xBegin + wOffset, yBegin], - topRight: [xEnd - wOffset, yBegin, xEnd - ctrlPtXOffset, yBegin, xEnd, yBegin + hOffset], - bottomRight: [xEnd, yEnd - hOffset, xEnd - ctrlPtXOffset, yEnd, xEnd - wOffset, yEnd], - bottomLeft: [xBegin + wOffset, yEnd, xBegin + ctrlPtXOffset, yEnd, xBegin, yEnd - hOffset] - }; - - pts.topLeft.isTop = true; - pts.topRight.isTop = true; - pts.bottomLeft.isBottom = true; - pts.bottomRight.isBottom = true; - - return pts; - }, - - checkPoint: function checkPoint(x, y, padding, width, height, centerX, centerY) { - - var curveConstants = math.getBarrelCurveConstants(width, height); - var hOffset = curveConstants.heightOffset; - var wOffset = curveConstants.widthOffset; - - // Check hBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width, height - 2 * hOffset, [0, -1], padding)) { - return true; - } - - // Check vBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width - 2 * wOffset, height, [0, -1], padding)) { - return true; - } - - var barrelCurvePts = this.generateBarrelBezierPts(width, height, centerX, centerY); - - var getCurveT = function getCurveT(x, y, curvePts) { - var x0 = curvePts[4]; - var x1 = curvePts[2]; - var x2 = curvePts[0]; - var y0 = curvePts[5]; - // var y1 = curvePts[ 3 ]; - var y2 = curvePts[1]; - - var xMin = Math.min(x0, x2); - var xMax = Math.max(x0, x2); - var yMin = Math.min(y0, y2); - var yMax = Math.max(y0, y2); - - if (xMin <= x && x <= xMax && yMin <= y && y <= yMax) { - var coeff = math.bezierPtsToQuadCoeff(x0, x1, x2); - var roots = math.solveQuadratic(coeff[0], coeff[1], coeff[2], x); - - var validRoots = roots.filter(function (r) { - return 0 <= r && r <= 1; - }); - - if (validRoots.length > 0) { - return validRoots[0]; - } - } - return null; - }; - - var curveRegions = Object.keys(barrelCurvePts); - for (var i = 0; i < curveRegions.length; i++) { - var corner = curveRegions[i]; - var cornerPts = barrelCurvePts[corner]; - var t = getCurveT(x, y, cornerPts); - - if (t == null) { - continue; - } - - var y0 = cornerPts[5]; - var y1 = cornerPts[3]; - var y2 = cornerPts[1]; - var bezY = math.qbezierAt(y0, y1, y2, t); - - if (cornerPts.isTop && bezY <= y) { - return true; - } - if (cornerPts.isBottom && y <= bezY) { - return true; - } - } - return false; - } - }; -}; - -BRp.generateBottomRoundrectangle = function () { - return this.nodeShapes['bottomroundrectangle'] = { - renderer: this, - - name: 'bottomroundrectangle', - - points: math.generateUnitNgonPointsFitToSquare(4, 0), - - draw: function draw(context, centerX, centerY, width, height) { - this.renderer.nodeShapeImpl(this.name, context, centerX, centerY, width, height); - }, - - intersectLine: function intersectLine(nodeX, nodeY, width, height, x, y, padding) { - var topStartX = nodeX - (width / 2 + padding); - var topStartY = nodeY - (height / 2 + padding); - var topEndY = topStartY; - var topEndX = nodeX + (width / 2 + padding); - - var topIntersections = math.finiteLinesIntersect(x, y, nodeX, nodeY, topStartX, topStartY, topEndX, topEndY, false); - if (topIntersections.length > 0) { - return topIntersections; - } - - return math.roundRectangleIntersectLine(x, y, nodeX, nodeY, width, height, padding); - }, - - checkPoint: function checkPoint(x, y, padding, width, height, centerX, centerY) { - - var cornerRadius = math.getRoundRectangleRadius(width, height); - var diam = 2 * cornerRadius; - - // Check hBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width, height - diam, [0, -1], padding)) { - return true; - } - - // Check vBox - if (math.pointInsidePolygon(x, y, this.points, centerX, centerY, width - diam, height, [0, -1], padding)) { - return true; - } - - // check non-rounded top side - var outerWidth = width / 2 + 2 * padding; - var outerHeight = height / 2 + 2 * padding; - var points = [centerX - outerWidth, centerY - outerHeight, centerX - outerWidth, centerY, centerX + outerWidth, centerY, centerX + outerWidth, centerY - outerHeight]; - if (math.pointInsidePolygonPoints(x, y, points)) { - return true; - } - - // Check bottom right quarter circle - if (math.checkInEllipse(x, y, diam, diam, centerX + width / 2 - cornerRadius, centerY + height / 2 - cornerRadius, padding)) { - - return true; - } - - // Check bottom left quarter circle - if (math.checkInEllipse(x, y, diam, diam, centerX - width / 2 + cornerRadius, centerY + height / 2 - cornerRadius, padding)) { - - return true; - } - - return false; - } - }; -}; - -BRp.registerNodeShapes = function () { - var nodeShapes = this.nodeShapes = {}; - var renderer = this; - - this.generateEllipse(); - - this.generatePolygon('triangle', math.generateUnitNgonPointsFitToSquare(3, 0)); - - this.generatePolygon('rectangle', math.generateUnitNgonPointsFitToSquare(4, 0)); - nodeShapes['square'] = nodeShapes['rectangle']; - - this.generateRoundRectangle(); - - this.generateCutRectangle(); - - this.generateBarrel(); - - this.generateBottomRoundrectangle(); - - this.generatePolygon('diamond', [0, 1, 1, 0, 0, -1, -1, 0]); - - this.generatePolygon('pentagon', math.generateUnitNgonPointsFitToSquare(5, 0)); - - this.generatePolygon('hexagon', math.generateUnitNgonPointsFitToSquare(6, 0)); - - this.generatePolygon('heptagon', math.generateUnitNgonPointsFitToSquare(7, 0)); - - this.generatePolygon('octagon', math.generateUnitNgonPointsFitToSquare(8, 0)); - - var star5Points = new Array(20); - { - var outerPoints = math.generateUnitNgonPoints(5, 0); - var innerPoints = math.generateUnitNgonPoints(5, Math.PI / 5); - - // Outer radius is 1; inner radius of star is smaller - var innerRadius = 0.5 * (3 - Math.sqrt(5)); - innerRadius *= 1.57; - - for (var i = 0; i < innerPoints.length / 2; i++) { - innerPoints[i * 2] *= innerRadius; - innerPoints[i * 2 + 1] *= innerRadius; - } - - for (var i = 0; i < 20 / 4; i++) { - star5Points[i * 4] = outerPoints[i * 2]; - star5Points[i * 4 + 1] = outerPoints[i * 2 + 1]; - - star5Points[i * 4 + 2] = innerPoints[i * 2]; - star5Points[i * 4 + 3] = innerPoints[i * 2 + 1]; - } - } - - star5Points = math.fitPolygonToSquare(star5Points); - - this.generatePolygon('star', star5Points); - - this.generatePolygon('vee', [-1, -1, 0, -0.333, 1, -1, 0, 1]); - - this.generatePolygon('rhomboid', [-1, -1, 0.333, -1, 1, 1, -0.333, 1]); - - this.generatePolygon('concavehexagon', [-1, -0.95, -0.75, 0, -1, 0.95, 1, 0.95, 0.75, 0, 1, -0.95]); - - this.generatePolygon('tag', [-1, -1, 0.25, -1, 1, 0, 0.25, 1, -1, 1]); - - nodeShapes.makePolygon = function (points) { - - // use caching on user-specified polygons so they are as fast as native shapes - - var key = points.join('$'); - var name = 'polygon-' + key; - var shape; - - if (shape = this[name]) { - // got cached shape - return shape; - } - - // create and cache new shape - return renderer.generatePolygon(name, points); - }; -}; - -module.exports = BRp; - -/***/ }), -/* 123 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); - -var BRp = {}; - -BRp.timeToRender = function () { - return this.redrawTotalTime / this.redrawCount; -}; - -BRp.redraw = function (options) { - options = options || util.staticEmptyObject(); - - var r = this; - - if (r.averageRedrawTime === undefined) { - r.averageRedrawTime = 0; - } - if (r.lastRedrawTime === undefined) { - r.lastRedrawTime = 0; - } - if (r.lastDrawTime === undefined) { - r.lastDrawTime = 0; - } - - r.requestedFrame = true; - r.renderOptions = options; -}; - -BRp.beforeRender = function (fn, priority) { - // the renderer can't add tick callbacks when destroyed - if (this.destroyed) { - return; - } - - priority = priority || 0; - - var cbs = this.beforeRenderCallbacks; - - cbs.push({ fn: fn, priority: priority }); - - // higher priority callbacks executed first - cbs.sort(function (a, b) { - return b.priority - a.priority; - }); -}; - -var beforeRenderCallbacks = function beforeRenderCallbacks(r, willDraw, startTime) { - var cbs = r.beforeRenderCallbacks; - - for (var i = 0; i < cbs.length; i++) { - cbs[i].fn(willDraw, startTime); - } -}; - -BRp.startRenderLoop = function () { - var r = this; - - if (r.renderLoopStarted) { - return; - } else { - r.renderLoopStarted = true; - } - - var renderFn = function renderFn(requestTime) { - if (r.destroyed) { - return; - } - - if (r.requestedFrame && !r.skipFrame) { - beforeRenderCallbacks(r, true, requestTime); - - var startTime = util.performanceNow(); - - r.render(r.renderOptions); - - var endTime = r.lastDrawTime = util.performanceNow(); - - if (r.averageRedrawTime === undefined) { - r.averageRedrawTime = endTime - startTime; - } - - if (r.redrawCount === undefined) { - r.redrawCount = 0; - } - - r.redrawCount++; - - if (r.redrawTotalTime === undefined) { - r.redrawTotalTime = 0; - } - - var duration = endTime - startTime; - - r.redrawTotalTime += duration; - r.lastRedrawTime = duration; - - // use a weighted average with a bias from the previous average so we don't spike so easily - r.averageRedrawTime = r.averageRedrawTime / 2 + duration / 2; - - r.requestedFrame = false; - } else { - beforeRenderCallbacks(r, false, requestTime); - } - - r.skipFrame = false; - - util.requestAnimationFrame(renderFn); - }; - - util.requestAnimationFrame(renderFn); -}; - -module.exports = BRp; - -/***/ }), -/* 124 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/* -The canvas renderer was written by Yue Dong. - -Modifications tracked on Github. -*/ - -var util = __webpack_require__(1); -var is = __webpack_require__(0); -var ElementTextureCache = __webpack_require__(125); -var LayeredTextureCache = __webpack_require__(126); - -var CR = CanvasRenderer; -var CRp = CanvasRenderer.prototype; - -CRp.CANVAS_LAYERS = 3; -// -CRp.SELECT_BOX = 0; -CRp.DRAG = 1; -CRp.NODE = 2; - -CRp.BUFFER_COUNT = 3; -// -CRp.TEXTURE_BUFFER = 0; -CRp.MOTIONBLUR_BUFFER_NODE = 1; -CRp.MOTIONBLUR_BUFFER_DRAG = 2; - -function CanvasRenderer(options) { - var r = this; - - r.data = { - canvases: new Array(CRp.CANVAS_LAYERS), - contexts: new Array(CRp.CANVAS_LAYERS), - canvasNeedsRedraw: new Array(CRp.CANVAS_LAYERS), - - bufferCanvases: new Array(CRp.BUFFER_COUNT), - bufferContexts: new Array(CRp.CANVAS_LAYERS) - }; - - var tapHlOff = '-webkit-tap-highlight-color: rgba(0,0,0,0);'; - - r.data.canvasContainer = document.createElement('div'); // eslint-disable-line no-undef - var containerStyle = r.data.canvasContainer.style; - r.data.canvasContainer.setAttribute('style', tapHlOff); - containerStyle.position = 'relative'; - containerStyle.zIndex = '0'; - containerStyle.overflow = 'hidden'; - - var container = options.cy.container(); - container.appendChild(r.data.canvasContainer); - - if ((container.getAttribute('style') || '').indexOf(tapHlOff) < 0) { - container.setAttribute('style', (container.getAttribute('style') || '') + tapHlOff); - } - - for (var i = 0; i < CRp.CANVAS_LAYERS; i++) { - var canvas = r.data.canvases[i] = document.createElement('canvas'); // eslint-disable-line no-undef - r.data.contexts[i] = canvas.getContext('2d'); - canvas.setAttribute('style', '-webkit-user-select: none; -moz-user-select: -moz-none; user-select: none; -webkit-tap-highlight-color: rgba(0,0,0,0); outline-style: none;' + (is.ms() ? ' -ms-touch-action: none; touch-action: none; ' : '')); - canvas.style.position = 'absolute'; - canvas.setAttribute('data-id', 'layer' + i); - canvas.style.zIndex = String(CRp.CANVAS_LAYERS - i); - r.data.canvasContainer.appendChild(canvas); - - r.data.canvasNeedsRedraw[i] = false; - } - r.data.topCanvas = r.data.canvases[0]; - - r.data.canvases[CRp.NODE].setAttribute('data-id', 'layer' + CRp.NODE + '-node'); - r.data.canvases[CRp.SELECT_BOX].setAttribute('data-id', 'layer' + CRp.SELECT_BOX + '-selectbox'); - r.data.canvases[CRp.DRAG].setAttribute('data-id', 'layer' + CRp.DRAG + '-drag'); - - for (var i = 0; i < CRp.BUFFER_COUNT; i++) { - r.data.bufferCanvases[i] = document.createElement('canvas'); // eslint-disable-line no-undef - r.data.bufferContexts[i] = r.data.bufferCanvases[i].getContext('2d'); - r.data.bufferCanvases[i].style.position = 'absolute'; - r.data.bufferCanvases[i].setAttribute('data-id', 'buffer' + i); - r.data.bufferCanvases[i].style.zIndex = String(-i - 1); - r.data.bufferCanvases[i].style.visibility = 'hidden'; - //r.data.canvasContainer.appendChild(r.data.bufferCanvases[i]); - } - - r.pathsEnabled = true; - - r.data.eleTxrCache = new ElementTextureCache(r); - r.data.lyrTxrCache = new LayeredTextureCache(r, r.data.eleTxrCache); - - r.onUpdateEleCalcs(function invalidateTextureCaches(willDraw, eles) { - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var rs = ele._private.rstyle; - var de = rs.dirtyEvents; - - if (ele.isNode() && de && de.length === 1 && de['position']) { - // then keep cached ele texture - } else { - r.data.eleTxrCache.invalidateElement(ele); - - // NB this block of code should not be ported to 3.3 (unstable branch). - // - This check is unneccesary in 3.3 as caches will be stored without respect to opacity. - // - This fix may result in lowered performance for compound graphs. - // - Ref : Opacity of child node is not updated for certain zoom levels after parent opacity is overriden #2078 - if (ele.isParent() && de['style']) { - var op1 = rs.prevParentOpacity; - var op2 = ele.pstyle('opacity').pfValue; - - rs.prevParentOpacity = op2; - - if (op1 !== op2) { - var descs = ele.descendants(); - - for (var j = 0; j < descs.length; j++) { - r.data.eleTxrCache.invalidateElement(descs[j]); - } - } - } - } - } - - if (eles.length > 0) { - r.data.lyrTxrCache.invalidateElements(eles); - } - }); -} - -CRp.redrawHint = function (group, bool) { - var r = this; - - switch (group) { - case 'eles': - r.data.canvasNeedsRedraw[CRp.NODE] = bool; - break; - case 'drag': - r.data.canvasNeedsRedraw[CRp.DRAG] = bool; - break; - case 'select': - r.data.canvasNeedsRedraw[CRp.SELECT_BOX] = bool; - break; - } -}; - -// whether to use Path2D caching for drawing -var pathsImpld = typeof Path2D !== 'undefined'; - -CRp.path2dEnabled = function (on) { - if (on === undefined) { - return this.pathsEnabled; - } - - this.pathsEnabled = on ? true : false; -}; - -CRp.usePaths = function () { - return pathsImpld && this.pathsEnabled; -}; - -[__webpack_require__(127), __webpack_require__(128), __webpack_require__(129), __webpack_require__(130), __webpack_require__(131), __webpack_require__(132), __webpack_require__(133), __webpack_require__(134), __webpack_require__(135), __webpack_require__(136)].forEach(function (props) { - util.extend(CRp, props); -}); - -module.exports = CR; - -/***/ }), -/* 125 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); -var util = __webpack_require__(1); -var Heap = __webpack_require__(9); -var defs = __webpack_require__(19); - -var minTxrH = 25; // the size of the texture cache for small height eles (special case) -var txrStepH = 50; // the min size of the regular cache, and the size it increases with each step up -var minLvl = -4; // when scaling smaller than that we don't need to re-render -var maxLvl = 2; // when larger than this scale just render directly (caching is not helpful) -var maxZoom = 3.99; // beyond this zoom level, layered textures are not used -var eleTxrSpacing = 8; // spacing between elements on textures to avoid blitting overlaps -var defTxrWidth = 1024; // default/minimum texture width -var maxTxrW = 1024; // the maximum width of a texture -var maxTxrH = 1024; // the maximum height of a texture -var minUtility = 0.5; // if usage of texture is less than this, it is retired -var maxFullness = 0.8; // fullness of texture after which queue removal is checked -var maxFullnessChecks = 10; // dequeued after this many checks -var allowEdgeTxrCaching = false; // whether edges can be cached as textures (TODO maybe better on if webgl supported?) -var allowParentTxrCaching = false; // whether parent nodes can be cached as textures (TODO maybe better on if webgl supported?) -var deqCost = 0.15; // % of add'l rendering cost allowed for dequeuing ele caches each frame -var deqAvgCost = 0.1; // % of add'l rendering cost compared to average overall redraw time -var deqNoDrawCost = 0.9; // % of avg frame time that can be used for dequeueing when not drawing -var deqFastCost = 0.9; // % of frame time to be used when >60fps -var deqRedrawThreshold = 100; // time to batch redraws together from dequeueing to allow more dequeueing calcs to happen in the meanwhile -var maxDeqSize = 1; // number of eles to dequeue and render at higher texture in each batch - -var getTxrReasons = { - dequeue: 'dequeue', - downscale: 'downscale', - highQuality: 'highQuality' -}; - -var ElementTextureCache = function ElementTextureCache(renderer) { - var self = this; - - self.renderer = renderer; - self.onDequeues = []; - - self.setupDequeueing(); -}; - -var ETCp = ElementTextureCache.prototype; - -ETCp.reasons = getTxrReasons; - -// the list of textures in which new subtextures for elements can be placed -ETCp.getTextureQueue = function (txrH) { - var self = this; - self.eleImgCaches = self.eleImgCaches || {}; - - return self.eleImgCaches[txrH] = self.eleImgCaches[txrH] || []; -}; - -// the list of usused textures which can be recycled (in use in texture queue) -ETCp.getRetiredTextureQueue = function (txrH) { - var self = this; - - var rtxtrQs = self.eleImgCaches.retired = self.eleImgCaches.retired || {}; - var rtxtrQ = rtxtrQs[txrH] = rtxtrQs[txrH] || []; - - return rtxtrQ; -}; - -// queue of element draw requests at different scale levels -ETCp.getElementQueue = function () { - var self = this; - - var q = self.eleCacheQueue = self.eleCacheQueue || new Heap(function (a, b) { - return b.reqs - a.reqs; - }); - - return q; -}; - -// queue of element draw requests at different scale levels (element id lookup) -ETCp.getElementIdToQueue = function () { - var self = this; - - var id2q = self.eleIdToCacheQueue = self.eleIdToCacheQueue || {}; - - return id2q; -}; - -ETCp.getElement = function (ele, bb, pxRatio, lvl, reason) { - var self = this; - var r = this.renderer; - var rs = ele._private.rscratch; - var zoom = r.cy.zoom(); - - if (bb.w === 0 || bb.h === 0 || !ele.visible()) { - return null; - } - - if (lvl == null) { - lvl = Math.ceil(math.log2(zoom * pxRatio)); - } - - if (lvl < minLvl) { - lvl = minLvl; - } else if (zoom >= maxZoom || lvl > maxLvl) { - return null; - } - - var scale = Math.pow(2, lvl); - var eleScaledH = bb.h * scale; - var eleScaledW = bb.w * scale; - var caches = rs.imgCaches = rs.imgCaches || {}; - var eleCache = caches[lvl]; - - if (eleCache) { - return eleCache; - } - - var txrH; // which texture height this ele belongs to - - if (eleScaledH <= minTxrH) { - txrH = minTxrH; - } else if (eleScaledH <= txrStepH) { - txrH = txrStepH; - } else { - txrH = Math.ceil(eleScaledH / txrStepH) * txrStepH; - } - - if (eleScaledH > maxTxrH || eleScaledW > maxTxrW || !allowEdgeTxrCaching && ele.isEdge() || !allowParentTxrCaching && ele.isParent()) { - return null; // caching large elements is not efficient - } - - var txrQ = self.getTextureQueue(txrH); - - // first try the second last one in case it has space at the end - var txr = txrQ[txrQ.length - 2]; - - var addNewTxr = function addNewTxr() { - return self.recycleTexture(txrH, eleScaledW) || self.addTexture(txrH, eleScaledW); - }; - - // try the last one if there is no second last one - if (!txr) { - txr = txrQ[txrQ.length - 1]; - } - - // if the last one doesn't exist, we need a first one - if (!txr) { - txr = addNewTxr(); - } - - // if there's no room in the current texture, we need a new one - if (txr.width - txr.usedWidth < eleScaledW) { - txr = addNewTxr(); - } - - var scaledLabelShown = r.eleTextBiggerThanMin(ele, scale); - var scalableFrom = function scalableFrom(otherCache) { - return otherCache && otherCache.scaledLabelShown === scaledLabelShown; - }; - - var deqing = reason && reason === getTxrReasons.dequeue; - var highQualityReq = reason && reason === getTxrReasons.highQuality; - var downscaleReq = reason && reason === getTxrReasons.downscale; - - var higherCache; // the nearest cache with a higher level - for (var l = lvl + 1; l <= maxLvl; l++) { - var c = caches[l]; - - if (c) { - higherCache = c;break; - } - } - - var oneUpCache = higherCache && higherCache.level === lvl + 1 ? higherCache : null; - - var downscale = function downscale() { - txr.context.drawImage(oneUpCache.texture.canvas, oneUpCache.x, 0, oneUpCache.width, oneUpCache.height, txr.usedWidth, 0, eleScaledW, eleScaledH); - }; - - // reset ele area in texture - txr.context.setTransform(1, 0, 0, 1, 0, 0); - txr.context.clearRect(txr.usedWidth, 0, eleScaledW, txrH); - - if (scalableFrom(oneUpCache)) { - // then we can relatively cheaply rescale the existing image w/o rerendering - downscale(); - } else if (scalableFrom(higherCache)) { - // then use the higher cache for now and queue the next level down - // to cheaply scale towards the smaller level - - if (highQualityReq) { - for (var l = higherCache.level; l > lvl; l--) { - oneUpCache = self.getElement(ele, bb, pxRatio, l, getTxrReasons.downscale); - } - - downscale(); - } else { - self.queueElement(ele, higherCache.level - 1); - - return higherCache; - } - } else { - - var lowerCache; // the nearest cache with a lower level - if (!deqing && !highQualityReq && !downscaleReq) { - for (var l = lvl - 1; l >= minLvl; l--) { - var c = caches[l]; - - if (c) { - lowerCache = c;break; - } - } - } - - if (scalableFrom(lowerCache)) { - // then use the lower quality cache for now and queue the better one for later - - self.queueElement(ele, lvl); - - return lowerCache; - } - - txr.context.translate(txr.usedWidth, 0); - txr.context.scale(scale, scale); - - r.drawElement(txr.context, ele, bb, scaledLabelShown); - - txr.context.scale(1 / scale, 1 / scale); - txr.context.translate(-txr.usedWidth, 0); - } - - eleCache = caches[lvl] = { - ele: ele, - x: txr.usedWidth, - texture: txr, - level: lvl, - scale: scale, - width: eleScaledW, - height: eleScaledH, - scaledLabelShown: scaledLabelShown - }; - - txr.usedWidth += Math.ceil(eleScaledW + eleTxrSpacing); - - txr.eleCaches.push(eleCache); - - self.checkTextureFullness(txr); - - return eleCache; -}; - -ETCp.invalidateElement = function (ele) { - var self = this; - var caches = ele._private.rscratch.imgCaches; - - if (caches) { - for (var lvl = minLvl; lvl <= maxLvl; lvl++) { - var cache = caches[lvl]; - - if (cache) { - var txr = cache.texture; - - // remove space from the texture it belongs to - txr.invalidatedWidth += cache.width; - - // remove refs with the element - caches[lvl] = null; - util.removeFromArray(txr.eleCaches, cache); - - // remove from queue since the old req was for the old state - self.removeFromQueue(ele); - - // might have to remove the entire texture if it's not efficiently using its space - self.checkTextureUtility(txr); - } - } - } -}; - -ETCp.checkTextureUtility = function (txr) { - // invalidate all entries in the cache if the cache size is small - if (txr.invalidatedWidth >= minUtility * txr.width) { - this.retireTexture(txr); - } -}; - -ETCp.checkTextureFullness = function (txr) { - // if texture has been mostly filled and passed over several times, remove - // it from the queue so we don't need to waste time looking at it to put new things - - var self = this; - var txrQ = self.getTextureQueue(txr.height); - - if (txr.usedWidth / txr.width > maxFullness && txr.fullnessChecks >= maxFullnessChecks) { - util.removeFromArray(txrQ, txr); - } else { - txr.fullnessChecks++; - } -}; - -ETCp.retireTexture = function (txr) { - var self = this; - var txrH = txr.height; - var txrQ = self.getTextureQueue(txrH); - - // retire the texture from the active / searchable queue: - - util.removeFromArray(txrQ, txr); - - txr.retired = true; - - // remove the refs from the eles to the caches: - - var eleCaches = txr.eleCaches; - - for (var i = 0; i < eleCaches.length; i++) { - var eleCache = eleCaches[i]; - var ele = eleCache.ele; - var lvl = eleCache.level; - var imgCaches = ele._private.rscratch.imgCaches; - - if (imgCaches) { - imgCaches[lvl] = null; - } - } - - util.clearArray(eleCaches); - - // add the texture to a retired queue so it can be recycled in future: - - var rtxtrQ = self.getRetiredTextureQueue(txrH); - - rtxtrQ.push(txr); -}; - -ETCp.addTexture = function (txrH, minW) { - var self = this; - var txrQ = self.getTextureQueue(txrH); - var txr = {}; - - txrQ.push(txr); - - txr.eleCaches = []; - - txr.height = txrH; - txr.width = Math.max(defTxrWidth, minW); - txr.usedWidth = 0; - txr.invalidatedWidth = 0; - txr.fullnessChecks = 0; - - txr.canvas = document.createElement('canvas'); // eslint-disable-line no-undef - txr.canvas.width = txr.width; - txr.canvas.height = txr.height; - - txr.context = txr.canvas.getContext('2d'); - - return txr; -}; - -ETCp.recycleTexture = function (txrH, minW) { - var self = this; - var txrQ = self.getTextureQueue(txrH); - var rtxtrQ = self.getRetiredTextureQueue(txrH); - - for (var i = 0; i < rtxtrQ.length; i++) { - var txr = rtxtrQ[i]; - - if (txr.width >= minW) { - txr.retired = false; - - txr.usedWidth = 0; - txr.invalidatedWidth = 0; - txr.fullnessChecks = 0; - - util.clearArray(txr.eleCaches); - - txr.context.setTransform(1, 0, 0, 1, 0, 0); - txr.context.clearRect(0, 0, txr.width, txr.height); - - util.removeFromArray(rtxtrQ, txr); - txrQ.push(txr); - - return txr; - } - } -}; - -ETCp.queueElement = function (ele, lvl) { - var self = this; - var q = self.getElementQueue(); - var id2q = self.getElementIdToQueue(); - var id = ele.id(); - var existingReq = id2q[id]; - - if (existingReq) { - // use the max lvl b/c in between lvls are cheap to make - existingReq.level = Math.max(existingReq.level, lvl); - existingReq.reqs++; - - q.updateItem(existingReq); - } else { - var req = { - ele: ele, - level: lvl, - reqs: 1 - }; - - q.push(req); - - id2q[id] = req; - } -}; - -ETCp.dequeue = function (pxRatio /*, extent*/) { - var self = this; - var q = self.getElementQueue(); - var id2q = self.getElementIdToQueue(); - var dequeued = []; - - for (var i = 0; i < maxDeqSize; i++) { - if (q.size() > 0) { - var req = q.pop(); - var ele = req.ele; - var caches = ele._private.rscratch.imgCaches; - - // dequeueing isn't necessary when an existing cache exists - if (caches[req.level] != null) { - continue; - } - - id2q[ele.id()] = null; - - dequeued.push(req); - - var bb = ele.boundingBox(); - - self.getElement(ele, bb, pxRatio, req.level, getTxrReasons.dequeue); - } else { - break; - } - } - - return dequeued; -}; - -ETCp.removeFromQueue = function (ele) { - var self = this; - var q = self.getElementQueue(); - var id2q = self.getElementIdToQueue(); - var req = id2q[ele.id()]; - - if (req != null) { - // bring to front of queue - req.reqs = util.MAX_INT; - q.updateItem(req); - - q.pop(); // remove from queue - - id2q[ele.id()] = null; // remove from lookup map - } -}; - -ETCp.onDequeue = function (fn) { - this.onDequeues.push(fn); -}; -ETCp.offDequeue = function (fn) { - util.removeFromArray(this.onDequeues, fn); -}; - -ETCp.setupDequeueing = defs.setupDequeueing({ - deqRedrawThreshold: deqRedrawThreshold, - deqCost: deqCost, - deqAvgCost: deqAvgCost, - deqNoDrawCost: deqNoDrawCost, - deqFastCost: deqFastCost, - deq: function deq(self, pxRatio, extent) { - return self.dequeue(pxRatio, extent); - }, - onDeqd: function onDeqd(self, deqd) { - for (var i = 0; i < self.onDequeues.length; i++) { - var fn = self.onDequeues[i]; - - fn(deqd); - } - }, - shouldRedraw: function shouldRedraw(self, deqd, pxRatio, extent) { - for (var i = 0; i < deqd.length; i++) { - var bb = deqd[i].ele.boundingBox(); - - if (math.boundingBoxesIntersect(bb, extent)) { - return true; - } - } - - return false; - }, - priority: function priority(self) { - return self.renderer.beforeRenderPriorities.eleTxrDeq; - } -}); - -module.exports = ElementTextureCache; - -/***/ }), -/* 126 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var math = __webpack_require__(2); -var Heap = __webpack_require__(9); -var is = __webpack_require__(0); -var defs = __webpack_require__(19); - -var defNumLayers = 1; // default number of layers to use -var minLvl = -4; // when scaling smaller than that we don't need to re-render -var maxLvl = 2; // when larger than this scale just render directly (caching is not helpful) -var maxZoom = 3.99; // beyond this zoom level, layered textures are not used -var deqRedrawThreshold = 50; // time to batch redraws together from dequeueing to allow more dequeueing calcs to happen in the meanwhile -var refineEleDebounceTime = 50; // time to debounce sharper ele texture updates -var disableEleImgSmoothing = true; // when drawing eles on layers from an ele cache ; crisper and more performant when true -var deqCost = 0.15; // % of add'l rendering cost allowed for dequeuing ele caches each frame -var deqAvgCost = 0.1; // % of add'l rendering cost compared to average overall redraw time -var deqNoDrawCost = 0.9; // % of avg frame time that can be used for dequeueing when not drawing -var deqFastCost = 0.9; // % of frame time to be used when >60fps -var maxDeqSize = 1; // number of eles to dequeue and render at higher texture in each batch -var invalidThreshold = 250; // time threshold for disabling b/c of invalidations -var maxLayerArea = 4000 * 4000; // layers can't be bigger than this -var alwaysQueue = true; // never draw all the layers in a level on a frame; draw directly until all dequeued -var useHighQualityEleTxrReqs = true; // whether to use high quality ele txr requests (generally faster and cheaper in the longterm) - -var useEleTxrCaching = true; // whether to use individual ele texture caching underneath this cache - -// var log = function(){ console.log.apply( console, arguments ); }; - -var LayeredTextureCache = function LayeredTextureCache(renderer, eleTxrCache) { - var self = this; - - var r = self.renderer = renderer; - - self.layersByLevel = {}; // e.g. 2 => [ layer1, layer2, ..., layerN ] - - self.firstGet = true; - - self.lastInvalidationTime = util.performanceNow() - 2 * invalidThreshold; - - self.skipping = false; - - r.beforeRender(function (willDraw, now) { - if (now - self.lastInvalidationTime <= invalidThreshold) { - self.skipping = true; - } else { - self.skipping = false; - } - }); - - var qSort = function qSort(a, b) { - return b.reqs - a.reqs; - }; - - self.layersQueue = new Heap(qSort); - - self.eleTxrCache = eleTxrCache; - - self.setupEleCacheInvalidation(); - - self.setupDequeueing(); -}; - -var LTCp = LayeredTextureCache.prototype; - -var layerIdPool = 0; -var MAX_INT = Math.pow(2, 53) - 1; - -LTCp.makeLayer = function (bb, lvl) { - var scale = Math.pow(2, lvl); - - var w = Math.ceil(bb.w * scale); - var h = Math.ceil(bb.h * scale); - - var canvas = document.createElement('canvas'); // eslint-disable-line no-undef - - canvas.width = w; - canvas.height = h; - - var layer = { - id: layerIdPool = ++layerIdPool % MAX_INT, - bb: bb, - level: lvl, - width: w, - height: h, - canvas: canvas, - context: canvas.getContext('2d'), - eles: [], - elesQueue: [], - reqs: 0 - }; - - // log('make layer %s with w %s and h %s and lvl %s', layer.id, layer.width, layer.height, layer.level); - - var cxt = layer.context; - var dx = -layer.bb.x1; - var dy = -layer.bb.y1; - - // do the transform on creation to save cycles (it's the same for all eles) - cxt.scale(scale, scale); - cxt.translate(dx, dy); - - return layer; -}; - -LTCp.getLayers = function (eles, pxRatio, lvl) { - var self = this; - var r = self.renderer; - var cy = r.cy; - var zoom = cy.zoom(); - var firstGet = self.firstGet; - - self.firstGet = false; - - // log('--\nget layers with %s eles', eles.length); - //log eles.map(function(ele){ return ele.id() }) ); - - if (lvl == null) { - lvl = Math.ceil(math.log2(zoom * pxRatio)); - - if (lvl < minLvl) { - lvl = minLvl; - } else if (zoom >= maxZoom || lvl > maxLvl) { - return null; - } - } - - self.validateLayersElesOrdering(lvl, eles); - - var layersByLvl = self.layersByLevel; - var scale = Math.pow(2, lvl); - var layers = layersByLvl[lvl] = layersByLvl[lvl] || []; - var bb; - - var lvlComplete = self.levelIsComplete(lvl, eles); - var tmpLayers; - - var checkTempLevels = function checkTempLevels() { - var canUseAsTmpLvl = function canUseAsTmpLvl(l) { - self.validateLayersElesOrdering(l, eles); - - if (self.levelIsComplete(l, eles)) { - tmpLayers = layersByLvl[l]; - return true; - } - }; - - var checkLvls = function checkLvls(dir) { - if (tmpLayers) { - return; - } - - for (var l = lvl + dir; minLvl <= l && l <= maxLvl; l += dir) { - if (canUseAsTmpLvl(l)) { - break; - } - } - }; - - checkLvls(+1); - checkLvls(-1); - - // remove the invalid layers; they will be replaced as needed later in this function - for (var i = layers.length - 1; i >= 0; i--) { - var layer = layers[i]; - - if (layer.invalid) { - util.removeFromArray(layers, layer); - } - } - }; - - if (!lvlComplete) { - // if the current level is incomplete, then use the closest, best quality layerset temporarily - // and later queue the current layerset so we can get the proper quality level soon - - checkTempLevels(); - } else { - // log('level complete, using existing layers\n--'); - return layers; - } - - var getBb = function getBb() { - if (!bb) { - bb = math.makeBoundingBox(); - - for (var i = 0; i < eles.length; i++) { - math.updateBoundingBox(bb, eles[i].boundingBox()); - } - } - - return bb; - }; - - var makeLayer = function makeLayer(opts) { - opts = opts || {}; - - var after = opts.after; - - getBb(); - - var area = bb.w * scale * (bb.h * scale); - - if (area > maxLayerArea) { - return null; - } - - var layer = self.makeLayer(bb, lvl); - - if (after != null) { - var index = layers.indexOf(after) + 1; - - layers.splice(index, 0, layer); - } else if (opts.insert === undefined || opts.insert) { - // no after specified => first layer made so put at start - layers.unshift(layer); - } - - // if( tmpLayers ){ - //self.queueLayer( layer ); - // } - - return layer; - }; - - if (self.skipping && !firstGet) { - // log('skip layers'); - return null; - } - - // log('do layers'); - - var layer = null; - var maxElesPerLayer = eles.length / defNumLayers; - var allowLazyQueueing = alwaysQueue && !firstGet; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var rs = ele._private.rscratch; - var caches = rs.imgLayerCaches = rs.imgLayerCaches || {}; - - // log('look at ele', ele.id()); - - var existingLayer = caches[lvl]; - - if (existingLayer) { - // reuse layer for later eles - // log('reuse layer for', ele.id()); - layer = existingLayer; - continue; - } - - if (!layer || layer.eles.length >= maxElesPerLayer || !math.boundingBoxInBoundingBox(layer.bb, ele.boundingBox())) { - // log('make new layer for ele %s', ele.id()); - - layer = makeLayer({ insert: true, after: layer }); - - // if now layer can be built then we can't use layers at this level - if (!layer) { - return null; - } - - // log('new layer with id %s', layer.id); - } - - if (tmpLayers || allowLazyQueueing) { - // log('queue ele %s in layer %s', ele.id(), layer.id); - self.queueLayer(layer, ele); - } else { - // log('draw ele %s in layer %s', ele.id(), layer.id); - self.drawEleInLayer(layer, ele, lvl, pxRatio); - } - - layer.eles.push(ele); - - caches[lvl] = layer; - } - - // log('--'); - - if (tmpLayers) { - // then we only queued the current layerset and can't draw it yet - return tmpLayers; - } - - if (allowLazyQueueing) { - // log('lazy queue level', lvl); - return null; - } - - return layers; -}; - -// a layer may want to use an ele cache of a higher level to avoid blurriness -// so the layer level might not equal the ele level -LTCp.getEleLevelForLayerLevel = function (lvl, pxRatio) { - return lvl; -}; - -function imgSmoothing(context, bool) { - if (context.imageSmoothingEnabled != null) { - context.imageSmoothingEnabled = bool; - } else { - context.webkitImageSmoothingEnabled = bool; - context.mozImageSmoothingEnabled = bool; - context.msImageSmoothingEnabled = bool; - } -} - -LTCp.drawEleInLayer = function (layer, ele, lvl, pxRatio) { - var self = this; - var r = this.renderer; - var context = layer.context; - var bb = ele.boundingBox(); - - if (bb.w === 0 || bb.h === 0 || !ele.visible()) { - return; - } - - var eleCache = self.eleTxrCache; - var reason = useHighQualityEleTxrReqs ? eleCache.reasons.highQuality : undefined; - - lvl = self.getEleLevelForLayerLevel(lvl, pxRatio); - - var cache = useEleTxrCaching ? eleCache.getElement(ele, bb, null, lvl, reason) : null; - - if (cache) { - if (disableEleImgSmoothing) { - imgSmoothing(context, false); - } - - context.drawImage(cache.texture.canvas, cache.x, 0, cache.width, cache.height, bb.x1, bb.y1, bb.w, bb.h); - - if (disableEleImgSmoothing) { - imgSmoothing(context, true); - } - } else { - // if the element is not cacheable, then draw directly - r.drawElement(context, ele); - } -}; - -LTCp.levelIsComplete = function (lvl, eles) { - var self = this; - var layers = self.layersByLevel[lvl]; - - if (!layers || layers.length === 0) { - return false; - } - - var numElesInLayers = 0; - - for (var i = 0; i < layers.length; i++) { - var layer = layers[i]; - - // if there are any eles needed to be drawn yet, the level is not complete - if (layer.reqs > 0) { - return false; - } - - // if the layer is invalid, the level is not complete - if (layer.invalid) { - return false; - } - - numElesInLayers += layer.eles.length; - } - - // we should have exactly the number of eles passed in to be complete - if (numElesInLayers !== eles.length) { - return false; - } - - return true; -}; - -LTCp.validateLayersElesOrdering = function (lvl, eles) { - var layers = this.layersByLevel[lvl]; - - if (!layers) { - return; - } - - // if in a layer the eles are not in the same order, then the layer is invalid - // (i.e. there is an ele in between the eles in the layer) - - for (var i = 0; i < layers.length; i++) { - var layer = layers[i]; - var offset = -1; - - // find the offset - for (var j = 0; j < eles.length; j++) { - if (layer.eles[0] === eles[j]) { - offset = j; - break; - } - } - - if (offset < 0) { - // then the layer has nonexistant elements and is invalid - this.invalidateLayer(layer); - continue; - } - - // the eles in the layer must be in the same continuous order, else the layer is invalid - - var o = offset; - - for (var j = 0; j < layer.eles.length; j++) { - if (layer.eles[j] !== eles[o + j]) { - // log('invalidate based on ordering', layer.id); - - this.invalidateLayer(layer); - break; - } - } - } -}; - -LTCp.updateElementsInLayers = function (eles, update) { - var self = this; - var isEles = is.element(eles[0]); - - // collect udpated elements (cascaded from the layers) and update each - // layer itself along the way - for (var i = 0; i < eles.length; i++) { - var req = isEles ? null : eles[i]; - var ele = isEles ? eles[i] : eles[i].ele; - var rs = ele._private.rscratch; - var caches = rs.imgLayerCaches = rs.imgLayerCaches || {}; - - for (var l = minLvl; l <= maxLvl; l++) { - var layer = caches[l]; - - if (!layer) { - continue; - } - - // if update is a request from the ele cache, then it affects only - // the matching level - if (req && self.getEleLevelForLayerLevel(layer.level) !== req.level) { - continue; - } - - update(layer, ele, req); - } - } -}; - -LTCp.haveLayers = function () { - var self = this; - var haveLayers = false; - - for (var l = minLvl; l <= maxLvl; l++) { - var layers = self.layersByLevel[l]; - - if (layers && layers.length > 0) { - haveLayers = true; - break; - } - } - - return haveLayers; -}; - -LTCp.invalidateElements = function (eles) { - var self = this; - - self.lastInvalidationTime = util.performanceNow(); - - // log('update invalidate layer time from eles'); - - if (eles.length === 0 || !self.haveLayers()) { - return; - } - - self.updateElementsInLayers(eles, function invalAssocLayers(layer, ele, req) { - self.invalidateLayer(layer); - }); -}; - -LTCp.invalidateLayer = function (layer) { - // log('update invalidate layer time'); - - this.lastInvalidationTime = util.performanceNow(); - - if (layer.invalid) { - return; - } // save cycles - - var lvl = layer.level; - var eles = layer.eles; - var layers = this.layersByLevel[lvl]; - - // log('invalidate layer', layer.id ); - - util.removeFromArray(layers, layer); - // layer.eles = []; - - layer.elesQueue = []; - - layer.invalid = true; - - if (layer.replacement) { - layer.replacement.invalid = true; - } - - for (var i = 0; i < eles.length; i++) { - var caches = eles[i]._private.rscratch.imgLayerCaches; - - if (caches) { - caches[lvl] = null; - } - } -}; - -LTCp.refineElementTextures = function (eles) { - var self = this; - - // log('refine', eles.length); - - self.updateElementsInLayers(eles, function refineEachEle(layer, ele, req) { - var rLyr = layer.replacement; - - if (!rLyr) { - rLyr = layer.replacement = self.makeLayer(layer.bb, layer.level); - rLyr.replaces = layer; - rLyr.eles = layer.eles; - - // log('make replacement layer %s for %s with level %s', rLyr.id, layer.id, rLyr.level); - } - - if (!rLyr.reqs) { - for (var i = 0; i < rLyr.eles.length; i++) { - self.queueLayer(rLyr, rLyr.eles[i]); - } - - // log('queue replacement layer refinement', rLyr.id); - } - }); -}; - -LTCp.setupEleCacheInvalidation = function () { - var self = this; - var eleDeqs = []; - - if (!useEleTxrCaching) { - return; - } - - var updatedElesInLayers = util.debounce(function () { - self.refineElementTextures(eleDeqs); - - eleDeqs = []; - }, refineEleDebounceTime); - - self.eleTxrCache.onDequeue(function (reqs) { - for (var i = 0; i < reqs.length; i++) { - eleDeqs.push(reqs[i]); - } - - updatedElesInLayers(); - }); -}; - -LTCp.queueLayer = function (layer, ele) { - var self = this; - var q = self.layersQueue; - var elesQ = layer.elesQueue; - var hasId = elesQ.hasId = elesQ.hasId || {}; - - // if a layer is going to be replaced, queuing is a waste of time - if (layer.replacement) { - return; - } - - if (ele) { - if (hasId[ele.id()]) { - return; - } - - elesQ.push(ele); - hasId[ele.id()] = true; - } - - if (layer.reqs) { - layer.reqs++; - - q.updateItem(layer); - } else { - layer.reqs = 1; - - q.push(layer); - } -}; - -LTCp.dequeue = function (pxRatio) { - var self = this; - var q = self.layersQueue; - var deqd = []; - var eleDeqs = 0; - - while (eleDeqs < maxDeqSize) { - if (q.size() === 0) { - break; - } - - var layer = q.peek(); - - // if a layer has been or will be replaced, then don't waste time with it - if (layer.replacement) { - // log('layer %s in queue skipped b/c it already has a replacement', layer.id); - q.pop(); - continue; - } - - // if this is a replacement layer that has been superceded, then forget it - if (layer.replaces && layer !== layer.replaces.replacement) { - // log('layer is no longer the most uptodate replacement; dequeued', layer.id) - q.pop(); - continue; - } - - if (layer.invalid) { - // log('replacement layer %s is invalid; dequeued', layer.id); - q.pop(); - continue; - } - - var ele = layer.elesQueue.shift(); - - if (ele) { - // log('dequeue layer %s', layer.id); - - self.drawEleInLayer(layer, ele, layer.level, pxRatio); - - eleDeqs++; - } - - if (deqd.length === 0) { - // we need only one entry in deqd to queue redrawing etc - deqd.push(true); - } - - // if the layer has all its eles done, then remove from the queue - if (layer.elesQueue.length === 0) { - q.pop(); - - layer.reqs = 0; - - // log('dequeue of layer %s complete', layer.id); - - // when a replacement layer is dequeued, it replaces the old layer in the level - if (layer.replaces) { - self.applyLayerReplacement(layer); - } - - self.requestRedraw(); - } - } - - return deqd; -}; - -LTCp.applyLayerReplacement = function (layer) { - var self = this; - var layersInLevel = self.layersByLevel[layer.level]; - var replaced = layer.replaces; - var index = layersInLevel.indexOf(replaced); - - // if the replaced layer is not in the active list for the level, then replacing - // refs would be a mistake (i.e. overwriting the true active layer) - if (index < 0 || replaced.invalid) { - // log('replacement layer would have no effect', layer.id); - return; - } - - layersInLevel[index] = layer; // replace level ref - - // replace refs in eles - for (var i = 0; i < layer.eles.length; i++) { - var _p = layer.eles[i]._private; - var cache = _p.imgLayerCaches = _p.imgLayerCaches || {}; - - if (cache) { - cache[layer.level] = layer; - } - } - - // log('apply replacement layer %s over %s', layer.id, replaced.id); - - self.requestRedraw(); -}; - -LTCp.requestRedraw = util.debounce(function () { - var r = this.renderer; - - r.redrawHint('eles', true); - r.redrawHint('drag', true); - r.redraw(); -}, 100); - -LTCp.setupDequeueing = defs.setupDequeueing({ - deqRedrawThreshold: deqRedrawThreshold, - deqCost: deqCost, - deqAvgCost: deqAvgCost, - deqNoDrawCost: deqNoDrawCost, - deqFastCost: deqFastCost, - deq: function deq(self, pxRatio) { - return self.dequeue(pxRatio); - }, - onDeqd: util.noop, - shouldRedraw: util.trueify, - priority: function priority(self) { - return self.renderer.beforeRenderPriorities.lyrTxrDeq; - } -}); - -module.exports = LayeredTextureCache; - -/***/ }), -/* 127 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var CRp = {}; - -var impl; - -CRp.arrowShapeImpl = function (name) { - return (impl || (impl = { - 'polygon': function polygon(context, points) { - for (var i = 0; i < points.length; i++) { - var pt = points[i]; - - context.lineTo(pt.x, pt.y); - } - }, - - 'triangle-backcurve': function triangleBackcurve(context, points, controlPoint) { - var firstPt; - - for (var i = 0; i < points.length; i++) { - var pt = points[i]; - - if (i === 0) { - firstPt = pt; - } - - context.lineTo(pt.x, pt.y); - } - - context.quadraticCurveTo(controlPoint.x, controlPoint.y, firstPt.x, firstPt.y); - }, - - 'triangle-tee': function triangleTee(context, trianglePoints, teePoints) { - if (context.beginPath) { - context.beginPath(); - } - - var triPts = trianglePoints; - for (var i = 0; i < triPts.length; i++) { - var pt = triPts[i]; - - context.lineTo(pt.x, pt.y); - } - - if (context.closePath) { - context.closePath(); - } - - if (context.beginPath) { - context.beginPath(); - } - - var teePts = teePoints; - var firstTeePt = teePoints[0]; - context.moveTo(firstTeePt.x, firstTeePt.y); - - for (var i = 0; i < teePts.length; i++) { - var pt = teePts[i]; - - context.lineTo(pt.x, pt.y); - } - if (context.closePath) { - context.closePath(); - } - }, - - 'triangle-cross': function triangleCross(context, trianglePoints, crossLinePoints) { - if (context.beginPath) { - context.beginPath(); - } - - var triPts = trianglePoints; - for (var i = 0; i < triPts.length; i++) { - var pt = triPts[i]; - - context.lineTo(pt.x, pt.y); - } - - if (context.closePath) { - context.closePath(); - } - - if (context.beginPath) { - context.beginPath(); - } - - var teePts = crossLinePoints; - var firstTeePt = crossLinePoints[0]; - context.moveTo(firstTeePt.x, firstTeePt.y); - - for (var i = 0; i < teePts.length; i++) { - var pt = teePts[i]; - - context.lineTo(pt.x, pt.y); - } - if (context.closePath) { - context.closePath(); - } - }, - - 'circle': function circle(context, rx, ry, r) { - context.arc(rx, ry, r, 0, Math.PI * 2, false); - } - }))[name]; -}; - -module.exports = CRp; - -/***/ }), -/* 128 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); - -var CRp = {}; - -CRp.drawElement = function (context, ele, shiftToOriginWithBb, showLabel) { - var r = this; - - if (ele.isNode()) { - r.drawNode(context, ele, shiftToOriginWithBb, showLabel); - } else { - r.drawEdge(context, ele, shiftToOriginWithBb, showLabel); - } -}; - -CRp.drawCachedElement = function (context, ele, pxRatio, extent) { - var r = this; - var bb = ele.boundingBox(); - - if (bb.w === 0 || bb.h === 0) { - return; - } - - if (!extent || math.boundingBoxesIntersect(bb, extent)) { - var cache = r.data.eleTxrCache.getElement(ele, bb, pxRatio); - - if (cache != null) { - context.drawImage(cache.texture.canvas, cache.x, 0, cache.width, cache.height, bb.x1, bb.y1, bb.w, bb.h); - } else { - // if the element is not cacheable, then draw directly - r.drawElement(context, ele); - } - } -}; - -CRp.drawElements = function (context, eles) { - var r = this; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - r.drawElement(context, ele); - } -}; - -CRp.drawCachedElements = function (context, eles, pxRatio, extent) { - var r = this; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - r.drawCachedElement(context, ele, pxRatio, extent); - } -}; - -CRp.drawCachedNodes = function (context, eles, pxRatio, extent) { - var r = this; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - - if (!ele.isNode()) { - continue; - } - - r.drawCachedElement(context, ele, pxRatio, extent); - } -}; - -CRp.drawLayeredElements = function (context, eles, pxRatio, extent) { - var r = this; - - var layers = r.data.lyrTxrCache.getLayers(eles, pxRatio); - - if (layers) { - for (var i = 0; i < layers.length; i++) { - var layer = layers[i]; - var bb = layer.bb; - - if (bb.w === 0 || bb.h === 0) { - continue; - } - - context.drawImage(layer.canvas, bb.x1, bb.y1, bb.w, bb.h); - } - } else { - // fall back on plain caching if no layers - r.drawCachedElements(context, eles, pxRatio, extent); - } -}; - -CRp.drawDebugPoints = function (context, eles) { - var draw = function draw(x, y, color) { - context.fillStyle = color; - context.fillRect(x - 1, y - 1, 3, 3); - }; - - for (var i = 0; i < eles.length; i++) { - var ele = eles[i]; - var rs = ele._private.rscratch; - - if (ele.isNode()) { - var p = ele.position(); - - draw(p.x, p.y, 'magenta'); - } else { - var pts = rs.allpts; - - for (var j = 0; j + 1 < pts.length; j += 2) { - var x = pts[j]; - var y = pts[j + 1]; - - draw(x, y, 'cyan'); - } - - draw(rs.midX, rs.midY, 'yellow'); - } - } -}; - -module.exports = CRp; - -/***/ }), -/* 129 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var CRp = {}; - -CRp.drawEdge = function (context, edge, shiftToOriginWithBb, drawLabel) { - var r = this; - var rs = edge._private.rscratch; - var usePaths = r.usePaths(); - - if (!edge.visible()) { - return; - } - - // if bezier ctrl pts can not be calculated, then die - if (rs.badLine || rs.allpts == null || isNaN(rs.allpts[0])) { - // isNaN in case edge is impossible and browser bugs (e.g. safari) - return; - } - - var bb = void 0; - if (shiftToOriginWithBb) { - bb = shiftToOriginWithBb; - - context.translate(-bb.x1, -bb.y1); - } - - var overlayPadding = edge.pstyle('overlay-padding').pfValue; - var overlayWidth = 2 * overlayPadding; - var overlayOpacity = edge.pstyle('overlay-opacity').value; - var overlayColor = edge.pstyle('overlay-color').value; - var lineColor = edge.pstyle('line-color').value; - var opacity = edge.pstyle('opacity').value; - var lineStyle = edge.pstyle('line-style').value; - var edgeWidth = edge.pstyle('width').pfValue; - - var drawLine = function drawLine() { - var strokeOpacity = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : opacity; - - context.lineWidth = edgeWidth; - context.lineCap = 'butt'; - - r.strokeStyle(context, lineColor[0], lineColor[1], lineColor[2], strokeOpacity); - - r.drawEdgePath(edge, context, rs.allpts, lineStyle); - }; - - var drawOverlay = function drawOverlay() { - var strokeOpacity = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : overlayOpacity; - - context.lineWidth = overlayWidth; - - if (rs.edgeType === 'self' && !usePaths) { - context.lineCap = 'butt'; - } else { - context.lineCap = 'round'; - } - - r.strokeStyle(context, overlayColor[0], overlayColor[1], overlayColor[2], strokeOpacity); - - r.drawEdgePath(edge, context, rs.allpts, 'solid'); - }; - - var drawArrows = function drawArrows() { - var arrowOpacity = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : opacity; - - r.drawArrowheads(context, edge, arrowOpacity); - }; - - var drawText = function drawText() { - r.drawElementText(context, edge, drawLabel); - }; - - context.lineJoin = 'round'; - - var ghost = edge.pstyle('ghost').value === 'yes'; - - if (ghost) { - var gx = edge.pstyle('ghost-offset-x').pfValue; - var gy = edge.pstyle('ghost-offset-y').pfValue; - var ghostOpacity = edge.pstyle('ghost-opacity').value; - var effectiveGhostOpacity = opacity * ghostOpacity; - - context.translate(gx, gy); - - drawLine(effectiveGhostOpacity); - drawArrows(effectiveGhostOpacity); - - context.translate(-gx, -gy); - } - - drawLine(); - drawArrows(); - drawOverlay(); - drawText(); - - if (shiftToOriginWithBb) { - context.translate(bb.x1, bb.y1); - } -}; - -CRp.drawEdgePath = function (edge, context, pts, type) { - var rs = edge._private.rscratch; - var canvasCxt = context; - var path = void 0; - var pathCacheHit = false; - var usePaths = this.usePaths(); - - if (usePaths) { - var pathCacheKey = pts.join('$'); - var keyMatches = rs.pathCacheKey && rs.pathCacheKey === pathCacheKey; - - if (keyMatches) { - path = context = rs.pathCache; - pathCacheHit = true; - } else { - path = context = new Path2D(); // eslint-disable-line no-undef - rs.pathCacheKey = pathCacheKey; - rs.pathCache = path; - } - } - - if (canvasCxt.setLineDash) { - // for very outofdate browsers - switch (type) { - case 'dotted': - canvasCxt.setLineDash([1, 1]); - break; - - case 'dashed': - canvasCxt.setLineDash([6, 3]); - break; - - case 'solid': - canvasCxt.setLineDash([]); - break; - } - } - - if (!pathCacheHit && !rs.badLine) { - if (context.beginPath) { - context.beginPath(); - } - context.moveTo(pts[0], pts[1]); - - switch (rs.edgeType) { - case 'bezier': - case 'self': - case 'compound': - case 'multibezier': - for (var i = 2; i + 3 < pts.length; i += 4) { - context.quadraticCurveTo(pts[i], pts[i + 1], pts[i + 2], pts[i + 3]); - } - break; - - case 'straight': - case 'segments': - case 'haystack': - for (var _i = 2; _i + 1 < pts.length; _i += 2) { - context.lineTo(pts[_i], pts[_i + 1]); - } - break; - } - } - - context = canvasCxt; - if (usePaths) { - context.stroke(path); - } else { - context.stroke(); - } - - // reset any line dashes - if (context.setLineDash) { - // for very outofdate browsers - context.setLineDash([]); - } -}; - -CRp.drawArrowheads = function (context, edge, opacity) { - var rs = edge._private.rscratch; - var isHaystack = rs.edgeType === 'haystack'; - - if (!isHaystack) { - this.drawArrowhead(context, edge, 'source', rs.arrowStartX, rs.arrowStartY, rs.srcArrowAngle, opacity); - } - - this.drawArrowhead(context, edge, 'mid-target', rs.midX, rs.midY, rs.midtgtArrowAngle, opacity); - - this.drawArrowhead(context, edge, 'mid-source', rs.midX, rs.midY, rs.midsrcArrowAngle, opacity); - - if (!isHaystack) { - this.drawArrowhead(context, edge, 'target', rs.arrowEndX, rs.arrowEndY, rs.tgtArrowAngle, opacity); - } -}; - -CRp.drawArrowhead = function (context, edge, prefix, x, y, angle, opacity) { - if (isNaN(x) || x == null || isNaN(y) || y == null || isNaN(angle) || angle == null) { - return; - } - - var self = this; - var arrowShape = edge.pstyle(prefix + '-arrow-shape').value; - if (arrowShape === 'none') { - return; - } - - var arrowClearFill = edge.pstyle(prefix + '-arrow-fill').value === 'hollow' ? 'both' : 'filled'; - var arrowFill = edge.pstyle(prefix + '-arrow-fill').value; - var edgeWidth = edge.pstyle('width').pfValue; - var edgeOpacity = edge.pstyle('opacity').value; - - if (opacity === undefined) { - opacity = edgeOpacity; - } - - var gco = context.globalCompositeOperation; - - if (opacity !== 1 || arrowFill === 'hollow') { - // then extra clear is needed - context.globalCompositeOperation = 'destination-out'; - - self.fillStyle(context, 255, 255, 255, 1); - self.strokeStyle(context, 255, 255, 255, 1); - - self.drawArrowShape(edge, prefix, context, arrowClearFill, edgeWidth, arrowShape, x, y, angle); - - context.globalCompositeOperation = gco; - } // otherwise, the opaque arrow clears it for free :) - - var color = edge.pstyle(prefix + '-arrow-color').value; - self.fillStyle(context, color[0], color[1], color[2], opacity); - self.strokeStyle(context, color[0], color[1], color[2], opacity); - - self.drawArrowShape(edge, prefix, context, arrowFill, edgeWidth, arrowShape, x, y, angle); -}; - -CRp.drawArrowShape = function (edge, arrowType, context, fill, edgeWidth, shape, x, y, angle) { - var r = this; - var usePaths = this.usePaths(); - var rs = edge._private.rscratch; - var pathCacheHit = false; - var path = void 0; - var canvasContext = context; - var translation = { x: x, y: y }; - var scale = edge.pstyle('arrow-scale').value; - var size = this.getArrowWidth(edgeWidth, scale); - var shapeImpl = r.arrowShapes[shape]; - - if (usePaths) { - var pathCacheKey = size + '$' + shape + '$' + angle + '$' + x + '$' + y; - rs.arrowPathCacheKey = rs.arrowPathCacheKey || {}; - rs.arrowPathCache = rs.arrowPathCache || {}; - - var alreadyCached = rs.arrowPathCacheKey[arrowType] === pathCacheKey; - if (alreadyCached) { - path = context = rs.arrowPathCache[arrowType]; - pathCacheHit = true; - } else { - path = context = new Path2D(); // eslint-disable-line no-undef - rs.arrowPathCacheKey[arrowType] = pathCacheKey; - rs.arrowPathCache[arrowType] = path; - } - } - - if (context.beginPath) { - context.beginPath(); - } - - if (!pathCacheHit) { - shapeImpl.draw(context, size, angle, translation, edgeWidth); - } - - if (!shapeImpl.leavePathOpen && context.closePath) { - context.closePath(); - } - - context = canvasContext; - - if (fill === 'filled' || fill === 'both') { - if (usePaths) { - context.fill(path); - } else { - context.fill(); - } - } - - if (fill === 'hollow' || fill === 'both') { - context.lineWidth = shapeImpl.matchEdgeWidth ? edgeWidth : 1; - context.lineJoin = 'miter'; - - if (usePaths) { - context.stroke(path); - } else { - context.stroke(); - } - } -}; - -module.exports = CRp; - -/***/ }), -/* 130 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var CRp = {}; - -CRp.safeDrawImage = function (context, img, ix, iy, iw, ih, x, y, w, h) { - var r = this; - - // detect problematic cases for old browsers with bad images (cheaper than try-catch) - if (iw <= 0 || ih <= 0 || w <= 0 || h <= 0) { - return; - } - - context.drawImage(img, ix, iy, iw, ih, x, y, w, h); -}; - -CRp.drawInscribedImage = function (context, img, node, index, nodeOpacity) { - var r = this; - var pos = node.position(); - var nodeX = pos.x; - var nodeY = pos.y; - var styleObj = node.cy().style(); - var getIndexedStyle = styleObj.getIndexedStyle.bind(styleObj); - var fit = getIndexedStyle(node, 'background-fit', 'value', index); - var repeat = getIndexedStyle(node, 'background-repeat', 'value', index); - var nodeW = node.width(); - var nodeH = node.height(); - var paddingX2 = node.padding() * 2; - var nodeTW = nodeW + (getIndexedStyle(node, 'background-width-relative-to', 'value', index) === 'inner' ? 0 : paddingX2); - var nodeTH = nodeH + (getIndexedStyle(node, 'background-height-relative-to', 'value', index) === 'inner' ? 0 : paddingX2); - var rs = node._private.rscratch; - var clip = node.pstyle('background-clip').value; - var shouldClip = clip === 'node'; - var imgOpacity = getIndexedStyle(node, 'background-image-opacity', 'value', index) * nodeOpacity; - - var imgW = img.width || img.cachedW; - var imgH = img.height || img.cachedH; - - // workaround for broken browsers like ie - if (null == imgW || null == imgH) { - document.body.appendChild(img); // eslint-disable-line no-undef - - imgW = img.cachedW = img.width || img.offsetWidth; - imgH = img.cachedH = img.height || img.offsetHeight; - - document.body.removeChild(img); // eslint-disable-line no-undef - } - - var w = imgW; - var h = imgH; - - if (getIndexedStyle(node, 'background-width', 'value', index) !== 'auto') { - if (getIndexedStyle(node, 'background-width', 'units', index) === '%') { - w = getIndexedStyle(node, 'background-width', 'pfValue', index) * nodeTW; - } else { - w = getIndexedStyle(node, 'background-width', 'pfValue', index); - } - } - - if (getIndexedStyle(node, 'background-height', 'value', index) !== 'auto') { - if (getIndexedStyle(node, 'background-height', 'units', index) === '%') { - h = getIndexedStyle(node, 'background-height', 'pfValue', index) * nodeTH; - } else { - h = getIndexedStyle(node, 'background-height', 'pfValue', index); - } - } - - if (w === 0 || h === 0) { - return; // no point in drawing empty image (and chrome is broken in this case) - } - - if (fit === 'contain') { - var scale = Math.min(nodeTW / w, nodeTH / h); - - w *= scale; - h *= scale; - } else if (fit === 'cover') { - var scale = Math.max(nodeTW / w, nodeTH / h); - - w *= scale; - h *= scale; - } - - var x = nodeX - nodeTW / 2; // left - if (getIndexedStyle(node, 'background-position-x', 'units', index) === '%') { - x += (nodeTW - w) * getIndexedStyle(node, 'background-position-x', 'pfValue', index); - } else { - x += getIndexedStyle(node, 'background-position-x', 'pfValue', index); - } - - var y = nodeY - nodeTH / 2; // top - if (getIndexedStyle(node, 'background-position-y', 'units', index) === '%') { - y += (nodeTH - h) * getIndexedStyle(node, 'background-position-y', 'pfValue', index); - } else { - y += getIndexedStyle(node, 'background-position-y', 'pfValue', index); - } - - if (rs.pathCache) { - x -= nodeX; - y -= nodeY; - - nodeX = 0; - nodeY = 0; - } - - var gAlpha = context.globalAlpha; - - context.globalAlpha = imgOpacity; - - if (repeat === 'no-repeat') { - - if (shouldClip) { - context.save(); - - if (rs.pathCache) { - context.clip(rs.pathCache); - } else { - r.nodeShapes[r.getNodeShape(node)].draw(context, nodeX, nodeY, nodeTW, nodeTH); - - context.clip(); - } - } - - r.safeDrawImage(context, img, 0, 0, imgW, imgH, x, y, w, h); - - if (shouldClip) { - context.restore(); - } - } else { - var pattern = context.createPattern(img, repeat); - context.fillStyle = pattern; - - r.nodeShapes[r.getNodeShape(node)].draw(context, nodeX, nodeY, nodeTW, nodeTH); - - context.translate(x, y); - context.fill(); - context.translate(-x, -y); - } - - context.globalAlpha = gAlpha; -}; - -module.exports = CRp; - -/***/ }), -/* 131 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var util = __webpack_require__(1); -var math = __webpack_require__(2); - -var CRp = {}; - -CRp.eleTextBiggerThanMin = function (ele, scale) { - if (!scale) { - var zoom = ele.cy().zoom(); - var pxRatio = this.getPixelRatio(); - var lvl = Math.ceil(math.log2(zoom * pxRatio)); // the effective texture level - - scale = Math.pow(2, lvl); - } - - var computedSize = ele.pstyle('font-size').pfValue * scale; - var minSize = ele.pstyle('min-zoomed-font-size').pfValue; - - if (computedSize < minSize) { - return false; - } - - return true; -}; - -CRp.drawElementText = function (context, ele, force) { - var r = this; - - if (force === undefined) { - if (!r.eleTextBiggerThanMin(ele)) { - return; - } - } else { - if (!force) { - return; - } - } - - if (ele.isNode()) { - var label = ele.pstyle('label'); - - if (!label || !label.value) { - return; - } - - var textHalign = ele.pstyle('text-halign').strValue; - var textValign = ele.pstyle('text-valign').strValue; - - switch (textHalign) { - case 'left': - context.textAlign = 'right'; - break; - - case 'right': - context.textAlign = 'left'; - break; - - default: - // e.g. center - context.textAlign = 'center'; - } - - context.textBaseline = 'bottom'; - } else { - var label = ele.pstyle('label'); - var srcLabel = ele.pstyle('source-label'); - var tgtLabel = ele.pstyle('target-label'); - - if ((!label || !label.value) && (!srcLabel || !srcLabel.value) && (!tgtLabel || !tgtLabel.value)) { - return; - } - - context.textAlign = 'center'; - context.textBaseline = 'bottom'; - } - - r.drawText(context, ele); - - if (ele.isEdge()) { - r.drawText(context, ele, 'source'); - - r.drawText(context, ele, 'target'); - } -}; - -CRp.drawNodeText = CRp.drawEdgeText = CRp.drawElementText; - -CRp.getFontCache = function (context) { - var cache; - - this.fontCaches = this.fontCaches || []; - - for (var i = 0; i < this.fontCaches.length; i++) { - cache = this.fontCaches[i]; - - if (cache.context === context) { - return cache; - } - } - - cache = { - context: context - }; - this.fontCaches.push(cache); - - return cache; -}; - -// set up canvas context with font -// returns transformed text string -CRp.setupTextStyle = function (context, ele) { - // Font style - var parentOpacity = ele.effectiveOpacity(); - var labelStyle = ele.pstyle('font-style').strValue; - var labelSize = ele.pstyle('font-size').pfValue + 'px'; - var labelFamily = ele.pstyle('font-family').strValue; - var labelWeight = ele.pstyle('font-weight').strValue; - var opacity = ele.pstyle('text-opacity').value * ele.pstyle('opacity').value * parentOpacity; - var outlineOpacity = ele.pstyle('text-outline-opacity').value * opacity; - var color = ele.pstyle('color').value; - var outlineColor = ele.pstyle('text-outline-color').value; - - var fontCacheKey = ele._private.fontKey; - var cache = this.getFontCache(context); - - if (cache.key !== fontCacheKey) { - context.font = labelStyle + ' ' + labelWeight + ' ' + labelSize + ' ' + labelFamily; - - cache.key = fontCacheKey; - } - - // Calculate text draw position based on text alignment - - // so text outlines aren't jagged - context.lineJoin = 'round'; - - this.fillStyle(context, color[0], color[1], color[2], opacity); - - this.strokeStyle(context, outlineColor[0], outlineColor[1], outlineColor[2], outlineOpacity); -}; - -function roundRect(ctx, x, y, width, height, radius) { - var radius = radius || 5; - ctx.beginPath(); - ctx.moveTo(x + radius, y); - ctx.lineTo(x + width - radius, y); - ctx.quadraticCurveTo(x + width, y, x + width, y + radius); - ctx.lineTo(x + width, y + height - radius); - ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height); - ctx.lineTo(x + radius, y + height); - ctx.quadraticCurveTo(x, y + height, x, y + height - radius); - ctx.lineTo(x, y + radius); - ctx.quadraticCurveTo(x, y, x + radius, y); - ctx.closePath(); - ctx.fill(); -} - -// Draw text -CRp.drawText = function (context, ele, prefix) { - var _p = ele._private; - var rscratch = _p.rscratch; - var parentOpacity = ele.effectiveOpacity(); - if (parentOpacity === 0 || ele.pstyle('text-opacity').value === 0) { - return; - } - - var textX = util.getPrefixedProperty(rscratch, 'labelX', prefix); - var textY = util.getPrefixedProperty(rscratch, 'labelY', prefix); - var text = this.getLabelText(ele, prefix); - - if (text != null && text !== '' && !isNaN(textX) && !isNaN(textY)) { - this.setupTextStyle(context, ele); - - var pdash = prefix ? prefix + '-' : ''; - var textW = util.getPrefixedProperty(rscratch, 'labelWidth', prefix); - var textH = util.getPrefixedProperty(rscratch, 'labelHeight', prefix); - var textAngle = util.getPrefixedProperty(rscratch, 'labelAngle', prefix); - var marginX = ele.pstyle(pdash + 'text-margin-x').pfValue; - var marginY = ele.pstyle(pdash + 'text-margin-y').pfValue; - - var isEdge = ele.isEdge(); - var isNode = ele.isNode(); - - var halign = ele.pstyle('text-halign').value; - var valign = ele.pstyle('text-valign').value; - - if (isEdge) { - halign = 'center'; - valign = 'center'; - } - - textX += marginX; - textY += marginY; - - var rotation = ele.pstyle(pdash + 'text-rotation'); - var theta; - - if (rotation.strValue === 'autorotate') { - theta = isEdge ? textAngle : 0; - } else if (rotation.strValue === 'none') { - theta = 0; - } else { - theta = rotation.pfValue; - } - - if (theta !== 0) { - var orgTextX = textX; - var orgTextY = textY; - - context.translate(orgTextX, orgTextY); - context.rotate(theta); - - textX = 0; - textY = 0; - } - - switch (valign) { - case 'top': - break; - case 'center': - textY += textH / 2; - break; - case 'bottom': - textY += textH; - break; - } - - var backgroundOpacity = ele.pstyle('text-background-opacity').value; - var borderOpacity = ele.pstyle('text-border-opacity').value; - var textBorderWidth = ele.pstyle('text-border-width').pfValue; - var backgroundPadding = ele.pstyle('text-background-padding').pfValue; - - if (backgroundOpacity > 0 || textBorderWidth > 0 && borderOpacity > 0) { - var bgX = textX - backgroundPadding; - - switch (halign) { - case 'left': - bgX -= textW; - break; - case 'center': - bgX -= textW / 2; - break; - case 'right': - break; - } - - var bgY = textY - textH - backgroundPadding; - var bgW = textW + 2 * backgroundPadding; - var bgH = textH + 2 * backgroundPadding; - - if (backgroundOpacity > 0) { - var textFill = context.fillStyle; - var textBackgroundColor = ele.pstyle('text-background-color').value; - - context.fillStyle = 'rgba(' + textBackgroundColor[0] + ',' + textBackgroundColor[1] + ',' + textBackgroundColor[2] + ',' + backgroundOpacity * parentOpacity + ')'; - var styleShape = ele.pstyle('text-background-shape').strValue; - if (styleShape == 'roundrectangle') { - roundRect(context, bgX, bgY, bgW, bgH, 2); - } else { - context.fillRect(bgX, bgY, bgW, bgH); - } - context.fillStyle = textFill; - } - - if (textBorderWidth > 0 && borderOpacity > 0) { - var textStroke = context.strokeStyle; - var textLineWidth = context.lineWidth; - var textBorderColor = ele.pstyle('text-border-color').value; - var textBorderStyle = ele.pstyle('text-border-style').value; - - context.strokeStyle = 'rgba(' + textBorderColor[0] + ',' + textBorderColor[1] + ',' + textBorderColor[2] + ',' + borderOpacity * parentOpacity + ')'; - context.lineWidth = textBorderWidth; - - if (context.setLineDash) { - // for very outofdate browsers - switch (textBorderStyle) { - case 'dotted': - context.setLineDash([1, 1]); - break; - case 'dashed': - context.setLineDash([4, 2]); - break; - case 'double': - context.lineWidth = textBorderWidth / 4; // 50% reserved for white between the two borders - context.setLineDash([]); - break; - case 'solid': - context.setLineDash([]); - break; - } - } - - context.strokeRect(bgX, bgY, bgW, bgH); - - if (textBorderStyle === 'double') { - var whiteWidth = textBorderWidth / 2; - - context.strokeRect(bgX + whiteWidth, bgY + whiteWidth, bgW - whiteWidth * 2, bgH - whiteWidth * 2); - } - - if (context.setLineDash) { - // for very outofdate browsers - context.setLineDash([]); - } - context.lineWidth = textLineWidth; - context.strokeStyle = textStroke; - } - } - - var lineWidth = 2 * ele.pstyle('text-outline-width').pfValue; // *2 b/c the stroke is drawn centred on the middle - - if (lineWidth > 0) { - context.lineWidth = lineWidth; - } - - if (ele.pstyle('text-wrap').value === 'wrap') { - var lines = util.getPrefixedProperty(rscratch, 'labelWrapCachedLines', prefix); - var lineHeight = textH / lines.length; - - switch (valign) { - case 'top': - textY -= (lines.length - 1) * lineHeight; - break; - case 'center': - case 'bottom': - textY -= (lines.length - 1) * lineHeight; - break; - } - - for (var l = 0; l < lines.length; l++) { - if (lineWidth > 0) { - context.strokeText(lines[l], textX, textY); - } - - context.fillText(lines[l], textX, textY); - - textY += lineHeight; - } - } else { - if (lineWidth > 0) { - context.strokeText(text, textX, textY); - } - - context.fillText(text, textX, textY); - } - - if (theta !== 0) { - context.rotate(-theta); - context.translate(-orgTextX, -orgTextY); - } - } -}; - -module.exports = CRp; - -/***/ }), -/* 132 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/* global Path2D */ - -var is = __webpack_require__(0); - -var CRp = {}; - -CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) { - var r = this; - var nodeWidth = void 0, - nodeHeight = void 0; - var _p = node._private; - var rs = _p.rscratch; - var pos = node.position(); - - if (!is.number(pos.x) || !is.number(pos.y)) { - return; // can't draw node with undefined position - } - - if (!node.visible()) { - return; - } - - var parentOpacity = node.effectiveOpacity(); - - var usePaths = r.usePaths(); - var path = void 0; - var pathCacheHit = false; - - var padding = node.padding(); - - nodeWidth = node.width() + 2 * padding; - nodeHeight = node.height() + 2 * padding; - - // - // setup shift - - var bb = void 0; - if (shiftToOriginWithBb) { - bb = shiftToOriginWithBb; - - context.translate(-bb.x1, -bb.y1); - } - - // - // load bg image - - var bgImgProp = node.pstyle('background-image'); - var urls = bgImgProp.value; - var urlDefined = new Array(urls.length); - var image = new Array(urls.length); - var numImages = 0; - for (var i = 0; i < urls.length; i++) { - var url = urls[i]; - var defd = urlDefined[i] = url != null && url !== 'none'; - - if (defd) { - var bgImgCrossOrigin = node.cy().style().getIndexedStyle(node, 'background-image-crossorigin', 'value', i); - - numImages++; - - // get image, and if not loaded then ask to redraw when later loaded - image[i] = r.getCachedImage(url, bgImgCrossOrigin, function () { - node.emitAndNotify('background'); - }); - } - } - - // - // setup styles - - var darkness = node.pstyle('background-blacken').value; - var borderWidth = node.pstyle('border-width').pfValue; - var bgColor = node.pstyle('background-color').value; - var bgOpacity = node.pstyle('background-opacity').value * parentOpacity; - var borderColor = node.pstyle('border-color').value; - var borderStyle = node.pstyle('border-style').value; - var borderOpacity = node.pstyle('border-opacity').value * parentOpacity; - - context.lineJoin = 'miter'; // so borders are square with the node shape - - var setupShapeColor = function setupShapeColor() { - var bgOpy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : bgOpacity; - - r.fillStyle(context, bgColor[0], bgColor[1], bgColor[2], bgOpy); - }; - - var setupBorderColor = function setupBorderColor() { - var bdrOpy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : borderOpacity; - - r.strokeStyle(context, borderColor[0], borderColor[1], borderColor[2], bdrOpy); - }; - - // - // setup shape - - var styleShape = node.pstyle('shape').strValue; - var shapePts = node.pstyle('shape-polygon-points').pfValue; - - if (usePaths) { - var pathCacheKey = styleShape + '$' + nodeWidth + '$' + nodeHeight + (styleShape === 'polygon' ? '$' + shapePts.join('$') : ''); - - context.translate(pos.x, pos.y); - - if (rs.pathCacheKey === pathCacheKey) { - path = rs.pathCache; - pathCacheHit = true; - } else { - path = new Path2D(); - rs.pathCacheKey = pathCacheKey; - rs.pathCache = path; - } - } - - var drawShape = function drawShape() { - if (!pathCacheHit) { - - var npos = pos; - - if (usePaths) { - npos = { - x: 0, - y: 0 - }; - } - - r.nodeShapes[r.getNodeShape(node)].draw(path || context, npos.x, npos.y, nodeWidth, nodeHeight); - } - - if (usePaths) { - context.fill(path); - } else { - context.fill(); - } - }; - - var drawImages = function drawImages() { - var nodeOpacity = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : parentOpacity; - - var prevBging = _p.backgrounding; - var totalCompleted = 0; - - for (var _i = 0; _i < image.length; _i++) { - if (urlDefined[_i] && image[_i].complete && !image[_i].error) { - totalCompleted++; - r.drawInscribedImage(context, image[_i], node, _i, nodeOpacity); - } - } - - _p.backgrounding = !(totalCompleted === numImages); - if (prevBging !== _p.backgrounding) { - // update style b/c :backgrounding state changed - node.updateStyle(false); - } - }; - - var drawPie = function drawPie() { - var redrawShape = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false; - var pieOpacity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : parentOpacity; - - if (r.hasPie(node)) { - r.drawPie(context, node, pieOpacity); - - // redraw/restore path if steps after pie need it - if (redrawShape) { - - if (!usePaths) { - r.nodeShapes[r.getNodeShape(node)].draw(context, pos.x, pos.y, nodeWidth, nodeHeight); - } - } - } - }; - - var darken = function darken() { - var darkenOpacity = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : parentOpacity; - - var opacity = (darkness > 0 ? darkness : -darkness) * darkenOpacity; - var c = darkness > 0 ? 0 : 255; - - if (darkness !== 0) { - r.fillStyle(context, c, c, c, opacity); - - if (usePaths) { - context.fill(path); - } else { - context.fill(); - } - } - }; - - var drawBorder = function drawBorder() { - if (borderWidth > 0) { - - context.lineWidth = borderWidth; - context.lineCap = 'butt'; - - if (context.setLineDash) { - // for very outofdate browsers - switch (borderStyle) { - case 'dotted': - context.setLineDash([1, 1]); - break; - - case 'dashed': - context.setLineDash([4, 2]); - break; - - case 'solid': - case 'double': - context.setLineDash([]); - break; - } - } - - if (usePaths) { - context.stroke(path); - } else { - context.stroke(); - } - - if (borderStyle === 'double') { - context.lineWidth = borderWidth / 3; - - var gco = context.globalCompositeOperation; - context.globalCompositeOperation = 'destination-out'; - - if (usePaths) { - context.stroke(path); - } else { - context.stroke(); - } - - context.globalCompositeOperation = gco; - } - - // reset in case we changed the border style - if (context.setLineDash) { - // for very outofdate browsers - context.setLineDash([]); - } - } - }; - - var drawOverlay = function drawOverlay() { - var overlayPadding = node.pstyle('overlay-padding').pfValue; - var overlayOpacity = node.pstyle('overlay-opacity').value; - var overlayColor = node.pstyle('overlay-color').value; - - if (overlayOpacity > 0) { - r.fillStyle(context, overlayColor[0], overlayColor[1], overlayColor[2], overlayOpacity); - - r.nodeShapes['roundrectangle'].draw(context, pos.x, pos.y, nodeWidth + overlayPadding * 2, nodeHeight + overlayPadding * 2); - - context.fill(); - } - }; - - var drawText = function drawText() { - r.drawElementText(context, node, drawLabel); - }; - - var ghost = node.pstyle('ghost').value === 'yes'; - - if (ghost) { - var gx = node.pstyle('ghost-offset-x').pfValue; - var gy = node.pstyle('ghost-offset-y').pfValue; - var ghostOpacity = node.pstyle('ghost-opacity').value; - var effGhostOpacity = ghostOpacity * parentOpacity; - - context.translate(gx, gy); - - setupShapeColor(ghostOpacity * bgOpacity); - drawShape(); - drawImages(effGhostOpacity); - drawPie(darkness !== 0 || borderWidth !== 0); - darken(effGhostOpacity); - setupBorderColor(ghostOpacity * borderOpacity); - drawBorder(); - - context.translate(-gx, -gy); - } - - setupShapeColor(); - drawShape(); - drawImages(); - drawPie(darkness !== 0 || borderWidth !== 0); - darken(); - setupBorderColor(); - drawBorder(); - - if (usePaths) { - context.translate(-pos.x, -pos.y); - } - - drawText(); - drawOverlay(); - - // - // clean up shift - - if (shiftToOriginWithBb) { - context.translate(bb.x1, bb.y1); - } -}; - -// does the node have at least one pie piece? -CRp.hasPie = function (node) { - node = node[0]; // ensure ele ref - - return node._private.hasPie; -}; - -CRp.drawPie = function (context, node, nodeOpacity, pos) { - node = node[0]; // ensure ele ref - pos = pos || node.position(); - - var cyStyle = node.cy().style(); - var pieSize = node.pstyle('pie-size'); - var x = pos.x; - var y = pos.y; - var nodeW = node.width(); - var nodeH = node.height(); - var radius = Math.min(nodeW, nodeH) / 2; // must fit in node - var lastPercent = 0; // what % to continue drawing pie slices from on [0, 1] - var usePaths = this.usePaths(); - - if (usePaths) { - x = 0; - y = 0; - } - - if (pieSize.units === '%') { - radius = radius * pieSize.pfValue; - } else if (pieSize.pfValue !== undefined) { - radius = pieSize.pfValue / 2; - } - - for (var i = 1; i <= cyStyle.pieBackgroundN; i++) { - // 1..N - var size = node.pstyle('pie-' + i + '-background-size').value; - var color = node.pstyle('pie-' + i + '-background-color').value; - var opacity = node.pstyle('pie-' + i + '-background-opacity').value * nodeOpacity; - var percent = size / 100; // map integer range [0, 100] to [0, 1] - - // percent can't push beyond 1 - if (percent + lastPercent > 1) { - percent = 1 - lastPercent; - } - - var angleStart = 1.5 * Math.PI + 2 * Math.PI * lastPercent; // start at 12 o'clock and go clockwise - var angleDelta = 2 * Math.PI * percent; - var angleEnd = angleStart + angleDelta; - - // ignore if - // - zero size - // - we're already beyond the full circle - // - adding the current slice would go beyond the full circle - if (size === 0 || lastPercent >= 1 || lastPercent + percent > 1) { - continue; - } - - context.beginPath(); - context.moveTo(x, y); - context.arc(x, y, radius, angleStart, angleEnd); - context.closePath(); - - this.fillStyle(context, color[0], color[1], color[2], opacity); - - context.fill(); - - lastPercent += percent; - } -}; - -module.exports = CRp; - -/***/ }), -/* 133 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var CRp = {}; - -var util = __webpack_require__(1); - -var motionBlurDelay = 100; - -// var isFirefox = typeof InstallTrigger !== 'undefined'; - -CRp.getPixelRatio = function () { - var context = this.data.contexts[0]; - - if (this.forcedPixelRatio != null) { - return this.forcedPixelRatio; - } - - var backingStore = context.backingStorePixelRatio || context.webkitBackingStorePixelRatio || context.mozBackingStorePixelRatio || context.msBackingStorePixelRatio || context.oBackingStorePixelRatio || context.backingStorePixelRatio || 1; - - return (window.devicePixelRatio || 1) / backingStore; // eslint-disable-line no-undef -}; - -CRp.paintCache = function (context) { - var caches = this.paintCaches = this.paintCaches || []; - var needToCreateCache = true; - var cache; - - for (var i = 0; i < caches.length; i++) { - cache = caches[i]; - - if (cache.context === context) { - needToCreateCache = false; - break; - } - } - - if (needToCreateCache) { - cache = { - context: context - }; - caches.push(cache); - } - - return cache; -}; - -CRp.fillStyle = function (context, r, g, b, a) { - context.fillStyle = 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')'; - - // turn off for now, seems context does its own caching - - // var cache = this.paintCache(context); - - // var fillStyle = 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')'; - - // if( cache.fillStyle !== fillStyle ){ - // context.fillStyle = cache.fillStyle = fillStyle; - // } -}; - -CRp.strokeStyle = function (context, r, g, b, a) { - context.strokeStyle = 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')'; - - // turn off for now, seems context does its own caching - - // var cache = this.paintCache(context); - - // var strokeStyle = 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')'; - - // if( cache.strokeStyle !== strokeStyle ){ - // context.strokeStyle = cache.strokeStyle = strokeStyle; - // } -}; - -// Resize canvas -CRp.matchCanvasSize = function (container) { - var r = this; - var data = r.data; - var bb = r.findContainerClientCoords(); - var width = bb[2]; - var height = bb[3]; - var pixelRatio = r.getPixelRatio(); - var mbPxRatio = r.motionBlurPxRatio; - - if (container === r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_NODE] || container === r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_DRAG]) { - pixelRatio = mbPxRatio; - } - - var canvasWidth = width * pixelRatio; - var canvasHeight = height * pixelRatio; - var canvas; - - if (canvasWidth === r.canvasWidth && canvasHeight === r.canvasHeight) { - return; // save cycles if same - } - - r.fontCaches = null; // resizing resets the style - - var canvasContainer = data.canvasContainer; - canvasContainer.style.width = width + 'px'; - canvasContainer.style.height = height + 'px'; - - for (var i = 0; i < r.CANVAS_LAYERS; i++) { - canvas = data.canvases[i]; - - canvas.width = canvasWidth; - canvas.height = canvasHeight; - - canvas.style.width = width + 'px'; - canvas.style.height = height + 'px'; - } - - for (var i = 0; i < r.BUFFER_COUNT; i++) { - canvas = data.bufferCanvases[i]; - - canvas.width = canvasWidth; - canvas.height = canvasHeight; - - canvas.style.width = width + 'px'; - canvas.style.height = height + 'px'; - } - - r.textureMult = 1; - if (pixelRatio <= 1) { - canvas = data.bufferCanvases[r.TEXTURE_BUFFER]; - - r.textureMult = 2; - canvas.width = canvasWidth * r.textureMult; - canvas.height = canvasHeight * r.textureMult; - } - - r.canvasWidth = canvasWidth; - r.canvasHeight = canvasHeight; -}; - -CRp.renderTo = function (cxt, zoom, pan, pxRatio) { - this.render({ - forcedContext: cxt, - forcedZoom: zoom, - forcedPan: pan, - drawAllLayers: true, - forcedPxRatio: pxRatio - }); -}; - -CRp.render = function (options) { - options = options || util.staticEmptyObject(); - - var forcedContext = options.forcedContext; - var drawAllLayers = options.drawAllLayers; - var drawOnlyNodeLayer = options.drawOnlyNodeLayer; - var forcedZoom = options.forcedZoom; - var forcedPan = options.forcedPan; - var r = this; - var pixelRatio = options.forcedPxRatio === undefined ? this.getPixelRatio() : options.forcedPxRatio; - var cy = r.cy;var data = r.data; - var needDraw = data.canvasNeedsRedraw; - var textureDraw = r.textureOnViewport && !forcedContext && (r.pinching || r.hoverData.dragging || r.swipePanning || r.data.wheelZooming); - var motionBlur = options.motionBlur !== undefined ? options.motionBlur : r.motionBlur; - var mbPxRatio = r.motionBlurPxRatio; - var hasCompoundNodes = cy.hasCompoundNodes(); - var inNodeDragGesture = r.hoverData.draggingEles; - var inBoxSelection = r.hoverData.selecting || r.touchData.selecting ? true : false; - motionBlur = motionBlur && !forcedContext && r.motionBlurEnabled && !inBoxSelection; - var motionBlurFadeEffect = motionBlur; - - if (!forcedContext) { - if (r.prevPxRatio !== pixelRatio) { - r.invalidateContainerClientCoordsCache(); - r.matchCanvasSize(r.container); - - r.redrawHint('eles', true); - r.redrawHint('drag', true); - } - - r.prevPxRatio = pixelRatio; - } - - if (!forcedContext && r.motionBlurTimeout) { - clearTimeout(r.motionBlurTimeout); - } - - if (motionBlur) { - if (r.mbFrames == null) { - r.mbFrames = 0; - } - - r.mbFrames++; - - if (r.mbFrames < 3) { - // need several frames before even high quality motionblur - motionBlurFadeEffect = false; - } - - // go to lower quality blurry frames when several m/b frames have been rendered (avoids flashing) - if (r.mbFrames > r.minMbLowQualFrames) { - //r.fullQualityMb = false; - r.motionBlurPxRatio = r.mbPxRBlurry; - } - } - - if (r.clearingMotionBlur) { - r.motionBlurPxRatio = 1; - } - - // b/c drawToContext() may be async w.r.t. redraw(), keep track of last texture frame - // because a rogue async texture frame would clear needDraw - if (r.textureDrawLastFrame && !textureDraw) { - needDraw[r.NODE] = true; - needDraw[r.SELECT_BOX] = true; - } - - var coreStyle = cy.style()._private.coreStyle; - - var zoom = cy.zoom(); - var effectiveZoom = forcedZoom !== undefined ? forcedZoom : zoom; - var pan = cy.pan(); - var effectivePan = { - x: pan.x, - y: pan.y - }; - - var vp = { - zoom: zoom, - pan: { - x: pan.x, - y: pan.y - } - }; - var prevVp = r.prevViewport; - var viewportIsDiff = prevVp === undefined || vp.zoom !== prevVp.zoom || vp.pan.x !== prevVp.pan.x || vp.pan.y !== prevVp.pan.y; - - // we want the low quality motionblur only when the viewport is being manipulated etc (where it's not noticed) - if (!viewportIsDiff && !(inNodeDragGesture && !hasCompoundNodes)) { - r.motionBlurPxRatio = 1; - } - - if (forcedPan) { - effectivePan = forcedPan; - } - - // apply pixel ratio - - effectiveZoom *= pixelRatio; - effectivePan.x *= pixelRatio; - effectivePan.y *= pixelRatio; - - var eles = r.getCachedZSortedEles(); - - function mbclear(context, x, y, w, h) { - var gco = context.globalCompositeOperation; - - context.globalCompositeOperation = 'destination-out'; - r.fillStyle(context, 255, 255, 255, r.motionBlurTransparency); - context.fillRect(x, y, w, h); - - context.globalCompositeOperation = gco; - } - - function setContextTransform(context, clear) { - var ePan, eZoom, w, h; - - if (!r.clearingMotionBlur && (context === data.bufferContexts[r.MOTIONBLUR_BUFFER_NODE] || context === data.bufferContexts[r.MOTIONBLUR_BUFFER_DRAG])) { - ePan = { - x: pan.x * mbPxRatio, - y: pan.y * mbPxRatio - }; - - eZoom = zoom * mbPxRatio; - - w = r.canvasWidth * mbPxRatio; - h = r.canvasHeight * mbPxRatio; - } else { - ePan = effectivePan; - eZoom = effectiveZoom; - - w = r.canvasWidth; - h = r.canvasHeight; - } - - context.setTransform(1, 0, 0, 1, 0, 0); - - if (clear === 'motionBlur') { - mbclear(context, 0, 0, w, h); - } else if (!forcedContext && (clear === undefined || clear)) { - context.clearRect(0, 0, w, h); - } - - if (!drawAllLayers) { - context.translate(ePan.x, ePan.y); - context.scale(eZoom, eZoom); - } - if (forcedPan) { - context.translate(forcedPan.x, forcedPan.y); - } - if (forcedZoom) { - context.scale(forcedZoom, forcedZoom); - } - } - - if (!textureDraw) { - r.textureDrawLastFrame = false; - } - - if (textureDraw) { - r.textureDrawLastFrame = true; - - var bb; - - if (!r.textureCache) { - r.textureCache = {}; - - bb = r.textureCache.bb = cy.mutableElements().boundingBox(); - - r.textureCache.texture = r.data.bufferCanvases[r.TEXTURE_BUFFER]; - - var cxt = r.data.bufferContexts[r.TEXTURE_BUFFER]; - - cxt.setTransform(1, 0, 0, 1, 0, 0); - cxt.clearRect(0, 0, r.canvasWidth * r.textureMult, r.canvasHeight * r.textureMult); - - r.render({ - forcedContext: cxt, - drawOnlyNodeLayer: true, - forcedPxRatio: pixelRatio * r.textureMult - }); - - var vp = r.textureCache.viewport = { - zoom: cy.zoom(), - pan: cy.pan(), - width: r.canvasWidth, - height: r.canvasHeight - }; - - vp.mpan = { - x: (0 - vp.pan.x) / vp.zoom, - y: (0 - vp.pan.y) / vp.zoom - }; - } - - needDraw[r.DRAG] = false; - needDraw[r.NODE] = false; - - var context = data.contexts[r.NODE]; - - var texture = r.textureCache.texture; - var vp = r.textureCache.viewport; - bb = r.textureCache.bb; - - context.setTransform(1, 0, 0, 1, 0, 0); - - if (motionBlur) { - mbclear(context, 0, 0, vp.width, vp.height); - } else { - context.clearRect(0, 0, vp.width, vp.height); - } - - var outsideBgColor = coreStyle['outside-texture-bg-color'].value; - var outsideBgOpacity = coreStyle['outside-texture-bg-opacity'].value; - r.fillStyle(context, outsideBgColor[0], outsideBgColor[1], outsideBgColor[2], outsideBgOpacity); - context.fillRect(0, 0, vp.width, vp.height); - - var zoom = cy.zoom(); - - setContextTransform(context, false); - - context.clearRect(vp.mpan.x, vp.mpan.y, vp.width / vp.zoom / pixelRatio, vp.height / vp.zoom / pixelRatio); - context.drawImage(texture, vp.mpan.x, vp.mpan.y, vp.width / vp.zoom / pixelRatio, vp.height / vp.zoom / pixelRatio); - } else if (r.textureOnViewport && !forcedContext) { - // clear the cache since we don't need it - r.textureCache = null; - } - - var extent = cy.extent(); - var vpManip = r.pinching || r.hoverData.dragging || r.swipePanning || r.data.wheelZooming || r.hoverData.draggingEles; - var hideEdges = r.hideEdgesOnViewport && vpManip; - - var needMbClear = []; - - needMbClear[r.NODE] = !needDraw[r.NODE] && motionBlur && !r.clearedForMotionBlur[r.NODE] || r.clearingMotionBlur; - if (needMbClear[r.NODE]) { - r.clearedForMotionBlur[r.NODE] = true; - } - - needMbClear[r.DRAG] = !needDraw[r.DRAG] && motionBlur && !r.clearedForMotionBlur[r.DRAG] || r.clearingMotionBlur; - if (needMbClear[r.DRAG]) { - r.clearedForMotionBlur[r.DRAG] = true; - } - - if (needDraw[r.NODE] || drawAllLayers || drawOnlyNodeLayer || needMbClear[r.NODE]) { - var useBuffer = motionBlur && !needMbClear[r.NODE] && mbPxRatio !== 1; - var context = forcedContext || (useBuffer ? r.data.bufferContexts[r.MOTIONBLUR_BUFFER_NODE] : data.contexts[r.NODE]); - var clear = motionBlur && !useBuffer ? 'motionBlur' : undefined; - - setContextTransform(context, clear); - - if (hideEdges) { - r.drawCachedNodes(context, eles.nondrag, pixelRatio, extent); - } else { - r.drawLayeredElements(context, eles.nondrag, pixelRatio, extent); - } - - if (r.debug) { - r.drawDebugPoints(context, eles.nondrag); - } - - if (!drawAllLayers && !motionBlur) { - needDraw[r.NODE] = false; - } - } - - if (!drawOnlyNodeLayer && (needDraw[r.DRAG] || drawAllLayers || needMbClear[r.DRAG])) { - var useBuffer = motionBlur && !needMbClear[r.DRAG] && mbPxRatio !== 1; - var context = forcedContext || (useBuffer ? r.data.bufferContexts[r.MOTIONBLUR_BUFFER_DRAG] : data.contexts[r.DRAG]); - - setContextTransform(context, motionBlur && !useBuffer ? 'motionBlur' : undefined); - - if (hideEdges) { - r.drawCachedNodes(context, eles.drag, pixelRatio, extent); - } else { - r.drawCachedElements(context, eles.drag, pixelRatio, extent); - } - - if (r.debug) { - r.drawDebugPoints(context, eles.drag); - } - - if (!drawAllLayers && !motionBlur) { - needDraw[r.DRAG] = false; - } - } - - if (r.showFps || !drawOnlyNodeLayer && needDraw[r.SELECT_BOX] && !drawAllLayers) { - var context = forcedContext || data.contexts[r.SELECT_BOX]; - - setContextTransform(context); - - if (r.selection[4] == 1 && (r.hoverData.selecting || r.touchData.selecting)) { - var zoom = r.cy.zoom(); - var borderWidth = coreStyle['selection-box-border-width'].value / zoom; - - context.lineWidth = borderWidth; - context.fillStyle = 'rgba(' + coreStyle['selection-box-color'].value[0] + ',' + coreStyle['selection-box-color'].value[1] + ',' + coreStyle['selection-box-color'].value[2] + ',' + coreStyle['selection-box-opacity'].value + ')'; - - context.fillRect(r.selection[0], r.selection[1], r.selection[2] - r.selection[0], r.selection[3] - r.selection[1]); - - if (borderWidth > 0) { - context.strokeStyle = 'rgba(' + coreStyle['selection-box-border-color'].value[0] + ',' + coreStyle['selection-box-border-color'].value[1] + ',' + coreStyle['selection-box-border-color'].value[2] + ',' + coreStyle['selection-box-opacity'].value + ')'; - - context.strokeRect(r.selection[0], r.selection[1], r.selection[2] - r.selection[0], r.selection[3] - r.selection[1]); - } - } - - if (data.bgActivePosistion && !r.hoverData.selecting) { - var zoom = r.cy.zoom(); - var pos = data.bgActivePosistion; - - context.fillStyle = 'rgba(' + coreStyle['active-bg-color'].value[0] + ',' + coreStyle['active-bg-color'].value[1] + ',' + coreStyle['active-bg-color'].value[2] + ',' + coreStyle['active-bg-opacity'].value + ')'; - - context.beginPath(); - context.arc(pos.x, pos.y, coreStyle['active-bg-size'].pfValue / zoom, 0, 2 * Math.PI); - context.fill(); - } - - var timeToRender = r.lastRedrawTime; - if (r.showFps && timeToRender) { - timeToRender = Math.round(timeToRender); - var fps = Math.round(1000 / timeToRender); - - context.setTransform(1, 0, 0, 1, 0, 0); - - context.fillStyle = 'rgba(255, 0, 0, 0.75)'; - context.strokeStyle = 'rgba(255, 0, 0, 0.75)'; - context.lineWidth = 1; - context.fillText('1 frame = ' + timeToRender + ' ms = ' + fps + ' fps', 0, 20); - - var maxFps = 60; - context.strokeRect(0, 30, 250, 20); - context.fillRect(0, 30, 250 * Math.min(fps / maxFps, 1), 20); - } - - if (!drawAllLayers) { - needDraw[r.SELECT_BOX] = false; - } - } - - // motionblur: blit rendered blurry frames - if (motionBlur && mbPxRatio !== 1) { - var cxtNode = data.contexts[r.NODE]; - var txtNode = r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_NODE]; - - var cxtDrag = data.contexts[r.DRAG]; - var txtDrag = r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_DRAG]; - - var drawMotionBlur = function drawMotionBlur(cxt, txt, needClear) { - cxt.setTransform(1, 0, 0, 1, 0, 0); - - if (needClear || !motionBlurFadeEffect) { - cxt.clearRect(0, 0, r.canvasWidth, r.canvasHeight); - } else { - mbclear(cxt, 0, 0, r.canvasWidth, r.canvasHeight); - } - - var pxr = mbPxRatio; - - cxt.drawImage(txt, // img - 0, 0, // sx, sy - r.canvasWidth * pxr, r.canvasHeight * pxr, // sw, sh - 0, 0, // x, y - r.canvasWidth, r.canvasHeight // w, h - ); - }; - - if (needDraw[r.NODE] || needMbClear[r.NODE]) { - drawMotionBlur(cxtNode, txtNode, needMbClear[r.NODE]); - needDraw[r.NODE] = false; - } - - if (needDraw[r.DRAG] || needMbClear[r.DRAG]) { - drawMotionBlur(cxtDrag, txtDrag, needMbClear[r.DRAG]); - needDraw[r.DRAG] = false; - } - } - - r.prevViewport = vp; - - if (r.clearingMotionBlur) { - r.clearingMotionBlur = false; - r.motionBlurCleared = true; - r.motionBlur = true; - } - - if (motionBlur) { - r.motionBlurTimeout = setTimeout(function () { - r.motionBlurTimeout = null; - - r.clearedForMotionBlur[r.NODE] = false; - r.clearedForMotionBlur[r.DRAG] = false; - r.motionBlur = false; - r.clearingMotionBlur = !textureDraw; - r.mbFrames = 0; - - needDraw[r.NODE] = true; - needDraw[r.DRAG] = true; - - r.redraw(); - }, motionBlurDelay); - } - - if (!forcedContext) { - cy.emit('render'); - } -}; - -module.exports = CRp; - -/***/ }), -/* 134 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var math = __webpack_require__(2); - -var CRp = {}; - -// @O Polygon drawing -CRp.drawPolygonPath = function (context, x, y, width, height, points) { - - var halfW = width / 2; - var halfH = height / 2; - - if (context.beginPath) { - context.beginPath(); - } - - context.moveTo(x + halfW * points[0], y + halfH * points[1]); - - for (var i = 1; i < points.length / 2; i++) { - context.lineTo(x + halfW * points[i * 2], y + halfH * points[i * 2 + 1]); - } - - context.closePath(); -}; - -// Round rectangle drawing -CRp.drawRoundRectanglePath = function (context, x, y, width, height) { - - var halfWidth = width / 2; - var halfHeight = height / 2; - var cornerRadius = math.getRoundRectangleRadius(width, height); - - if (context.beginPath) { - context.beginPath(); - } - - // Start at top middle - context.moveTo(x, y - halfHeight); - // Arc from middle top to right side - context.arcTo(x + halfWidth, y - halfHeight, x + halfWidth, y, cornerRadius); - // Arc from right side to bottom - context.arcTo(x + halfWidth, y + halfHeight, x, y + halfHeight, cornerRadius); - // Arc from bottom to left side - context.arcTo(x - halfWidth, y + halfHeight, x - halfWidth, y, cornerRadius); - // Arc from left side to topBorder - context.arcTo(x - halfWidth, y - halfHeight, x, y - halfHeight, cornerRadius); - // Join line - context.lineTo(x, y - halfHeight); - - context.closePath(); -}; - -CRp.drawBottomRoundRectanglePath = function (context, x, y, width, height) { - - var halfWidth = width / 2; - var halfHeight = height / 2; - var cornerRadius = math.getRoundRectangleRadius(width, height); - - if (context.beginPath) { - context.beginPath(); - } - - // Start at top middle - context.moveTo(x, y - halfHeight); - context.lineTo(x + halfWidth, y - halfHeight); - context.lineTo(x + halfWidth, y); - - context.arcTo(x + halfWidth, y + halfHeight, x, y + halfHeight, cornerRadius); - context.arcTo(x - halfWidth, y + halfHeight, x - halfWidth, y, cornerRadius); - - context.lineTo(x - halfWidth, y - halfHeight); - context.lineTo(x, y - halfHeight); - - context.closePath(); -}; - -CRp.drawCutRectanglePath = function (context, x, y, width, height) { - - var halfWidth = width / 2; - var halfHeight = height / 2; - var cornerLength = math.getCutRectangleCornerLength(); - - if (context.beginPath) { - context.beginPath(); - } - - context.moveTo(x - halfWidth + cornerLength, y - halfHeight); - - context.lineTo(x + halfWidth - cornerLength, y - halfHeight); - context.lineTo(x + halfWidth, y - halfHeight + cornerLength); - context.lineTo(x + halfWidth, y + halfHeight - cornerLength); - context.lineTo(x + halfWidth - cornerLength, y + halfHeight); - context.lineTo(x - halfWidth + cornerLength, y + halfHeight); - context.lineTo(x - halfWidth, y + halfHeight - cornerLength); - context.lineTo(x - halfWidth, y - halfHeight + cornerLength); - - context.closePath(); -}; - -CRp.drawBarrelPath = function (context, x, y, width, height) { - - var halfWidth = width / 2; - var halfHeight = height / 2; - - var xBegin = x - halfWidth; - var xEnd = x + halfWidth; - var yBegin = y - halfHeight; - var yEnd = y + halfHeight; - - var barrelCurveConstants = math.getBarrelCurveConstants(width, height); - var wOffset = barrelCurveConstants.widthOffset; - var hOffset = barrelCurveConstants.heightOffset; - var ctrlPtXOffset = barrelCurveConstants.ctrlPtOffsetPct * wOffset; - - if (context.beginPath) { - context.beginPath(); - } - - context.moveTo(xBegin, yBegin + hOffset); - - context.lineTo(xBegin, yEnd - hOffset); - context.quadraticCurveTo(xBegin + ctrlPtXOffset, yEnd, xBegin + wOffset, yEnd); - - context.lineTo(xEnd - wOffset, yEnd); - context.quadraticCurveTo(xEnd - ctrlPtXOffset, yEnd, xEnd, yEnd - hOffset); - - context.lineTo(xEnd, yBegin + hOffset); - context.quadraticCurveTo(xEnd - ctrlPtXOffset, yBegin, xEnd - wOffset, yBegin); - - context.lineTo(xBegin + wOffset, yBegin); - context.quadraticCurveTo(xBegin + ctrlPtXOffset, yBegin, xBegin, yBegin + hOffset); - - context.closePath(); -}; - -var sin0 = Math.sin(0); -var cos0 = Math.cos(0); - -var sin = {}; -var cos = {}; - -var ellipseStepSize = Math.PI / 40; - -for (var i = 0 * Math.PI; i < 2 * Math.PI; i += ellipseStepSize) { - sin[i] = Math.sin(i); - cos[i] = Math.cos(i); -} - -CRp.drawEllipsePath = function (context, centerX, centerY, width, height) { - if (context.beginPath) { - context.beginPath(); - } - - if (context.ellipse) { - context.ellipse(centerX, centerY, width / 2, height / 2, 0, 0, 2 * Math.PI); - } else { - var xPos, yPos; - var rw = width / 2; - var rh = height / 2; - for (var i = 0 * Math.PI; i < 2 * Math.PI; i += ellipseStepSize) { - xPos = centerX - rw * sin[i] * sin0 + rw * cos[i] * cos0; - yPos = centerY + rh * cos[i] * sin0 + rh * sin[i] * cos0; - - if (i === 0) { - context.moveTo(xPos, yPos); - } else { - context.lineTo(xPos, yPos); - } - } - } - - context.closePath(); -}; - -module.exports = CRp; - -/***/ }), -/* 135 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); - -var CRp = {}; - -CRp.createBuffer = function (w, h) { - var buffer = document.createElement('canvas'); // eslint-disable-line no-undef - buffer.width = w; - buffer.height = h; - - return [buffer, buffer.getContext('2d')]; -}; - -CRp.bufferCanvasImage = function (options) { - var cy = this.cy; - var eles = cy.mutableElements(); - var bb = eles.boundingBox(); - var ctrRect = this.findContainerClientCoords(); - var width = options.full ? Math.ceil(bb.w) : ctrRect[2]; - var height = options.full ? Math.ceil(bb.h) : ctrRect[3]; - var specdMaxDims = is.number(options.maxWidth) || is.number(options.maxHeight); - var pxRatio = this.getPixelRatio(); - var scale = 1; - - if (options.scale !== undefined) { - width *= options.scale; - height *= options.scale; - - scale = options.scale; - } else if (specdMaxDims) { - var maxScaleW = Infinity; - var maxScaleH = Infinity; - - if (is.number(options.maxWidth)) { - maxScaleW = scale * options.maxWidth / width; - } - - if (is.number(options.maxHeight)) { - maxScaleH = scale * options.maxHeight / height; - } - - scale = Math.min(maxScaleW, maxScaleH); - - width *= scale; - height *= scale; - } - - if (!specdMaxDims) { - width *= pxRatio; - height *= pxRatio; - scale *= pxRatio; - } - - var buffCanvas = document.createElement('canvas'); // eslint-disable-line no-undef - - buffCanvas.width = width; - buffCanvas.height = height; - - buffCanvas.style.width = width + 'px'; - buffCanvas.style.height = height + 'px'; - - var buffCxt = buffCanvas.getContext('2d'); - - // Rasterize the layers, but only if container has nonzero size - if (width > 0 && height > 0) { - - buffCxt.clearRect(0, 0, width, height); - - buffCxt.globalCompositeOperation = 'source-over'; - - var zsortedEles = this.getCachedZSortedEles(); - - if (options.full) { - // draw the full bounds of the graph - buffCxt.translate(-bb.x1 * scale, -bb.y1 * scale); - buffCxt.scale(scale, scale); - - this.drawElements(buffCxt, zsortedEles); - - buffCxt.scale(1 / scale, 1 / scale); - buffCxt.translate(bb.x1 * scale, bb.y1 * scale); - } else { - // draw the current view - var pan = cy.pan(); - - var translation = { - x: pan.x * scale, - y: pan.y * scale - }; - - scale *= cy.zoom(); - - buffCxt.translate(translation.x, translation.y); - buffCxt.scale(scale, scale); - - this.drawElements(buffCxt, zsortedEles); - - buffCxt.scale(1 / scale, 1 / scale); - buffCxt.translate(-translation.x, -translation.y); - } - - // need to fill bg at end like this in order to fill cleared transparent pixels in jpgs - if (options.bg) { - buffCxt.globalCompositeOperation = 'destination-over'; - - buffCxt.fillStyle = options.bg; - buffCxt.rect(0, 0, width, height); - buffCxt.fill(); - } - } - - return buffCanvas; -}; - -function b64ToBlob(b64, mimeType) { - var bytes = atob(b64); - var buff = new ArrayBuffer(bytes.length); - var buffUint8 = new Uint8Array(buff); - - for (var i = 0; i < bytes.length; i++) { - buffUint8[i] = bytes.charCodeAt(i); - } - - return new Blob([buff], { type: mimeType }); -} - -function b64UriToB64(b64uri) { - var i = b64uri.indexOf(','); - - return b64uri.substr(i + 1); -}; - -function output(options, canvas, mimeType) { - var b64Uri = canvas.toDataURL(mimeType, options.quality); - - switch (options.output) { - case 'blob': - return b64ToBlob(b64UriToB64(b64Uri), mimeType); - - case 'base64': - return b64UriToB64(b64Uri); - - case 'base64uri': - default: - return b64Uri; - } -} - -CRp.png = function (options) { - return output(options, this.bufferCanvasImage(options), 'image/png'); -}; - -CRp.jpg = function (options) { - return output(options, this.bufferCanvasImage(options), 'image/jpeg'); -}; - -module.exports = CRp; - -/***/ }), -/* 136 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var CRp = {}; - -CRp.nodeShapeImpl = function (name, context, centerX, centerY, width, height, points) { - switch (name) { - case 'ellipse': - return this.drawEllipsePath(context, centerX, centerY, width, height); - case 'polygon': - return this.drawPolygonPath(context, centerX, centerY, width, height, points); - case 'roundrectangle': - return this.drawRoundRectanglePath(context, centerX, centerY, width, height); - case 'cutrectangle': - return this.drawCutRectanglePath(context, centerX, centerY, width, height); - case 'bottomroundrectangle': - return this.drawBottomRoundRectanglePath(context, centerX, centerY, width, height); - case 'barrel': - return this.drawBarrelPath(context, centerX, centerY, width, height); - } -}; - -module.exports = CRp; - -/***/ }), -/* 137 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var is = __webpack_require__(0); -var util = __webpack_require__(1); -var Style = __webpack_require__(18); - -// a dummy stylesheet object that doesn't need a reference to the core -// (useful for init) -var Stylesheet = function Stylesheet() { - if (!(this instanceof Stylesheet)) { - return new Stylesheet(); - } - - this.length = 0; -}; - -var sheetfn = Stylesheet.prototype; - -sheetfn.instanceString = function () { - return 'stylesheet'; -}; - -// just store the selector to be parsed later -sheetfn.selector = function (selector) { - var i = this.length++; - - this[i] = { - selector: selector, - properties: [] - }; - - return this; // chaining -}; - -// just store the property to be parsed later -sheetfn.css = function (name, value) { - var i = this.length - 1; - - if (is.string(name)) { - this[i].properties.push({ - name: name, - value: value - }); - } else if (is.plainObject(name)) { - var map = name; - - for (var j = 0; j < Style.properties.length; j++) { - var prop = Style.properties[j]; - var mapVal = map[prop.name]; - - if (mapVal === undefined) { - // also try camel case name - mapVal = map[util.dash2camel(prop.name)]; - } - - if (mapVal !== undefined) { - var _name = prop.name; - var _value = mapVal; - - this[i].properties.push({ - name: _name, - value: _value - }); - } - } - } - - return this; // chaining -}; - -sheetfn.style = sheetfn.css; - -// generate a real style object from the dummy stylesheet -sheetfn.generateStyle = function (cy) { - var style = new Style(cy); - - return this.appendToStyle(style); -}; - -// append a dummy stylesheet object on a real style object -sheetfn.appendToStyle = function (style) { - for (var i = 0; i < this.length; i++) { - var context = this[i]; - var selector = context.selector; - var props = context.properties; - - style.selector(selector); // apply selector - - for (var j = 0; j < props.length; j++) { - var prop = props[j]; - - style.css(prop.name, prop.value); // apply property - } - } - - return style; -}; - -module.exports = Stylesheet; - -/***/ }), -/* 138 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = "3.2.20"; - -/***/ }) -/******/ ]); -}); \ No newline at end of file diff --git a/styles/bootstrap/cytoscape/cytoscape.min.js b/styles/bootstrap/cytoscape/cytoscape.min.js index 78fecacd7..9d83def03 100644 --- a/styles/bootstrap/cytoscape/cytoscape.min.js +++ b/styles/bootstrap/cytoscape/cytoscape.min.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2019, The Cytoscape Consortium. + * Copyright (c) 2016-2020, The Cytoscape Consortium. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the “Software”), to deal in @@ -20,4 +20,4 @@ * SOFTWARE. */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.cytoscape=t()}(this,function(){"use strict";function E(e){return(E="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function r(e,t){for(var n=0;n>>0},oe=function(e){return(33*(1>>0},se=function(e,t){var n={value:0,done:!1},r=0,i=e.length;return ie({next:function(){return r>1])<0;)e[n]=a,n=o;return e[n]=i},h=function(e,t,n){var r,i,a,o,s;for(null==n&&(n=d),i=e.length,a=e[s=t],r=2*t+1;rD&&(p[S]=D,y[S]=C,m[S]=x),!r){var T=C*u+k;!r&&p[T]>D&&(p[T]=D,y[T]=k,m[T]=x)}}}for(var P=0;P=e.x1&&e.y2>=e.y1)return{x1:e.x1,y1:e.y1,x2:e.x2,y2:e.y2,w:e.x2-e.x1,h:e.y2-e.y1};if(null!=e.w&&null!=e.h&&0<=e.w&&0<=e.h)return{x1:e.x1,y1:e.y1,x2:e.x1+e.w,y2:e.y1+e.h,w:e.w,h:e.h}}},ot=function(e){var t=1t.x2)&&(!(t.x1>e.x2)&&(!(e.x2t.y2)&&!(t.y1>e.y2)))))))},ct=function(e,t,n){return e.x1<=t&&t<=e.x2&&e.y1<=n&&n<=e.y2},ht=function(e,t){return ct(e,t.x1,t.y1)&&ct(e,t.x2,t.y2)},dt=function(e,t,n,r,i,a,o){var s,l=Tt(i,a),u=i/2,c=a/2,h=r-c-o;if(0<(s=wt(e,t,n,r,n-u+l-o,h,n+u-l+o,h,!1)).length)return s;var d=n+u+o;if(0<(s=wt(e,t,n,r,d,r-c+l-o,d,r+c-l+o,!1)).length)return s;var p=r+c+o;if(0<(s=wt(e,t,n,r,n-u+l-o,p,n+u-l+o,p,!1)).length)return s;var f,g=n-u-o;if(0<(s=wt(e,t,n,r,g,r-c+l-o,g,r+c-l+o,!1)).length)return s;var v=n-u+l,y=r-c+l;if(0<(f=bt(e,t,n,r,v,y,l+o)).length&&f[0]<=v&&f[1]<=y)return[f[0],f[1]];var m=n+u-l,b=r-c+l;if(0<(f=bt(e,t,n,r,m,b,l+o)).length&&f[0]>=m&&f[1]<=b)return[f[0],f[1]];var x=n+u-l,w=r+c-l;if(0<(f=bt(e,t,n,r,x,w,l+o)).length&&f[0]>=x&&f[1]>=w)return[f[0],f[1]];var E=n-u+l,k=r+c-l;return 0<(f=bt(e,t,n,r,E,k,l+o)).length&&f[0]<=E&&f[1]>=k?[f[0],f[1]]:[]},pt=function(e,t,n,r,i,a,o,s){var l,u,c,h,d,p,f,g,v,y,m,b,x,w=[];u=9*n*i-3*n*n-3*n*o-6*i*i+3*i*o+9*r*a-3*r*r-3*r*s-6*a*a+3*a*s,c=3*n*n-6*n*i+n*o-n*e+2*i*i+2*i*e-o*e+3*r*r-6*r*a+r*s-r*t+2*a*a+2*a*t-s*t,h=1*n*i-n*n+n*e-i*e+r*a-r*r+r*t-a*t,g=-27*(h/=l=1*n*n-4*n*i+2*n*o+4*i*i-4*i*o+o*o+r*r-4*r*a+2*r*s+4*a*a-4*a*s+s*s)+(u/=l)*(9*(c/=l)-u*u*2),p=(f=(3*c-u*u)/9)*f*f+(g/=54)*g,b=u/3,((d=w)[1]=0)a[u]+f&&(a[h]=a[u]+f,o.nodes.indexOf(h)<0?o.push(h):o.updateItem(h),i[h]=0,r[h]=[]),a[h]==a[u]+f&&(i[h]=i[h]+i[u],r[h].push(u))}else for(var g=0;gi&&(i=t[l][u],a=u);o[a].push(e[l])}for(var c=0;c=i.threshold||"dendrogram"===i.mode&&1===e.length)return!1;var p,f=t[o],g=t[r[o]];p="dendrogram"===i.mode?{left:f,right:g,key:f.key}:{value:f.value.concat(g.value),key:f.key},e[f.index]=p,e.splice(g.index,1),t[f.key]=p;for(var v=0;vn[g.key][y.key]&&(a=n[g.key][y.key])):"max"===i.linkage?(a=n[f.key][y.key],n[f.key][y.key]o&&(o=t[i*e+(a=l)])}0=u.minIterations-1||E==u.maxIterations-1)){for(var F=0,V=0;V\\?\\@\\[\\]\\^\\`\\{\\|\\}\\~]",comparatorOp:"=|\\!=|>|>=|<|<=|\\$=|\\^=|\\*=",boolOp:"\\?|\\!|\\^",string:'"(?:\\\\"|[^"])*"|'+"'(?:\\\\'|[^'])*'",number:W,meta:"degree|indegree|outdegree",separator:"\\s*,\\s*",descendant:"\\s+",child:"\\s+>\\s+",subject:"\\$",group:"node|edge|\\*",directedEdge:"\\s+->\\s+",undirectedEdge:"\\s+<->\\s+"};jn.variable="(?:[\\w-]|(?:\\\\"+jn.metaChar+"))+",jn.value=jn.string+"|"+jn.number,jn.className=jn.variable,jn.id=jn.variable,function(){var e,t,n;for(e=jn.comparatorOp.split("|"),n=0;n")+v(e.child,t);case ur:case sr:return v(e.ancestor,t)+" "+v(e.descendant,t);case cr:var c=v(e.left,t),h=v(e.subject,t),d=v(e.right,t);return c+(0":h=!0,r=n=":h=!0,r=n<=e;break;case"<":h=!0,r=ee.x2?r:e.x2,e.y1=ne.y2?i:e.y2)},Gr=function(e,t){return Kr(e,t.x1,t.y1,t.x2,t.y2)},Zr=function(e,t,n){return De(e,t,n)},Ur=function(e,t,n){if(!t.cy().headless()){var r,i,a=t._private,o=a.rstyle,s=o.arrowWidth/2;if("none"!==t.pstyle(n+"-arrow-shape").value){i="source"===n?(r=o.srcX,o.srcY):"target"===n?(r=o.tgtX,o.tgtY):(r=o.midX,o.midY);var l=a.arrowBounds=a.arrowBounds||{},u=l[n]=l[n]||{};u.x1=r-s,u.y1=i-s,u.x2=r+s,u.y2=i+s,u.w=u.x2-u.x1,u.h=u.y2-u.y1,ot(u,1),Kr(e,u.x1,u.y1,u.x2,u.y2)}}},$r=function(e,t,n){if(!t.cy().headless()){var r;r=n?n+"-":"";var i=t._private,a=i.rstyle;if(t.pstyle(r+"label").strValue){var o,s,l,u,c=t.pstyle("text-halign"),h=t.pstyle("text-valign"),d=Zr(a,"labelWidth",n),p=Zr(a,"labelHeight",n),f=Zr(a,"labelX",n),g=Zr(a,"labelY",n),v=t.pstyle(r+"text-margin-x").pfValue,y=t.pstyle(r+"text-margin-y").pfValue,m=t.isEdge(),b=t.pstyle(r+"text-rotation"),x=t.pstyle("text-outline-width").pfValue,w=t.pstyle("text-border-width").pfValue/2,E=t.pstyle("text-background-padding").pfValue,k=p+2*E,C=d+2*E,S=C/2,D=k/2;if(m)o=f-S,s=f+S,l=g-D,u=g+D;else{switch(c.value){case"left":o=f-C,s=f;break;case"center":o=f-S,s=f+S;break;case"right":s=(o=f)+C}switch(h.value){case"top":l=g-k,u=g;break;case"center":l=g-D,u=g+D;break;case"bottom":u=(l=g)+k}}o+=v-Math.max(x,w),s+=v+Math.max(x,w),l+=y-Math.max(x,w),u+=y+Math.max(x,w);var T=n||"main",P=i.labelBounds,M=P[T]=P[T]||{};M.x1=o,M.y1=l,M.x2=s,M.y2=u,M.w=s-o,M.h=u-l,ot(M,1);var _=m&&"autorotate"===b.strValue,B=null!=b.pfValue&&0!==b.pfValue;if(_||B){var N=_?Zr(i.rstyle,"labelAngle",n):b.pfValue,I=Math.cos(N),A=Math.sin(N),L=(o+s)/2,z=(l+u)/2;if(!m){switch(c.value){case"left":L=s;break;case"right":L=o}switch(h.value){case"top":z=u;break;case"bottom":z=l}}var O=function(e,t){return{x:(e-=L)*I-(t-=z)*A+L,y:e*A+t*I+z}},R=O(o,l),F=O(o,u),V=O(s,l),q=O(s,u);o=Math.min(R.x,F.x,V.x,q.x),s=Math.max(R.x,F.x,V.x,q.x),l=Math.min(R.y,F.y,V.y,q.y),u=Math.max(R.y,F.y,V.y,q.y)}Kr(e,o,l,s,u),Kr(i.labelBounds.all,o,l,s,u)}return e}},Qr=function(e){var t=0,n=function(e){return(e?1:0)<u&&++at.length?i.substr(t.length):""}function o(){n=n.length>r.length?n.substr(r.length):""}for(i=i.replace(/[/][*](\s|.)+?[*][/]/g,"");;){if(i.match(/^\s*$/))break;var s=i.match(/^\s*((?:.|\s)+?)\s*\{((?:.|\s)+?)\}/);if(!s){be("Halting stylesheet parsing: String stylesheet contains more to parse but no selector and block found in: "+i);break}t=s[0];var l=s[1];if("core"!==l)if(new Cr(l).invalid){be("Skipping parsing of block: Invalid selector found in string stylesheet: "+l),a();continue}var u=s[2],c=!1;n=u;for(var h=[];;){if(n.match(/^\s*$/))break;var d=n.match(/^\s*(.+?)\s*:\s*(.+?)\s*;/);if(!d){be("Skipping parsing of block: Invalid formatting of style property and value definitions found in:"+u),c=!0;break}r=d[0];var p=d[1],f=d[2];if(this.properties[p])this.parse(p,f)?h.push({name:p,val:f}):be("Skipping property: Invalid property definition in: "+r),o();else be("Skipping property: Invalid property name in: "+r),o()}if(c){a();break}this.selector(l);for(var g=0;gc.max||c.strictMax&&n===c.max))return null;var N={name:t,value:n,strValue:""+n+(P||""),units:P,bypass:r};return c.unitless||"px"!==P&&"em"!==P?N.pfValue=n:N.pfValue="px"!==P&&P?this.getEmSizeInPixels()*n:n,"ms"!==P&&"s"!==P||(N.pfValue="ms"===P?n:1e3*n),"deg"!==P&&"rad"!==P||(N.pfValue="rad"===P?n:(S=n,Math.PI*S/180)),"%"===P&&(N.pfValue=n/100),N}if(c.propList){var I=[],A=""+n;if("none"===A);else{for(var L=A.split(/\s*,\s*|\s+/),z=0;zthis._private.maxZoom?this._private.maxZoom:o)=n.minZoom&&(n.maxZoom=t),this},minZoom:function(e){return void 0===e?this._private.minZoom:this.zoomRange({min:e})},maxZoom:function(e){return void 0===e?this._private.maxZoom:this.zoomRange({max:e})},getZoomedViewport:function(e){var t,n,r=this._private,i=r.pan,a=r.zoom,o=!1;if(r.zoomingEnabled||(o=!0),$t(e)?n=e:B(e)&&(n=e.level,null!=e.position?t=Ze(e.position,a,i):null!=e.renderedPosition&&(t=e.renderedPosition),null==t||r.panningEnabled||(o=!0)),n=(n=n>r.maxZoom?r.maxZoom:n)t.maxZoom||!t.zoomingEnabled?a=!0:(t.zoom=s,i.push("zoom"))}if(r&&(!a||!e.cancelOnFailedZoom)&&t.panningEnabled){var l=e.pan;$t(l.x)&&(t.pan.x=l.x,o=!1),$t(l.y)&&(t.pan.y=l.y,o=!1),o||i.push("pan")}return 0i.maxX)&&(i.maxX=t.maxX+i.padRight,a=!0),(null==i.minX||t.minX-i.padLefti.maxY)&&(i.maxY=t.maxY+i.padBottom,a=!0),(null==i.minY||t.minY-i.padTop(g=ee,v=te,y=K[G],m=K[G+1],b=K[G+2],x=K[G+3],void 0,C=(w=[g-y,v-m])[0]*w[0]+w[1]*w[1],D=(S=w[0]*(E=[b-y,x-m])[0]+w[1]*E[1])*S/(k=E[0]*E[0]+E[1]*E[1]),t=S<0?C:k(t=pt(ee,te,K[G],K[G+1],K[G+2],K[G+3],K[G+4],K[G+5])))return se(e,t),!0;W=W||R.source,H=H||R.target;var Z=ne.getArrowWidth(V,q),U=[{name:"source",x:F.arrowStartX,y:F.arrowStartY,angle:F.srcArrowAngle},{name:"target",x:F.arrowEndX,y:F.arrowEndY,angle:F.tgtArrowAngle},{name:"mid-source",x:F.midX,y:F.midY,angle:F.midsrcArrowAngle},{name:"mid-target",x:F.midX,y:F.midY,angle:F.midtgtArrowAngle}];for(G=0;Gr.id()){var B=n;n=r,r=B}i=n.position(),a=r.position(),o=n.outerWidth(),s=n.outerHeight(),l=r.outerWidth(),u=r.outerHeight(),c=this.nodeShapes[this.getNodeShape(n)],h=this.nodeShapes[this.getNodeShape(r)],p=!1;var N={north:0,west:0,south:0,east:0,northwest:0,southwest:0,northeast:0,southeast:0},I=i.x,A=i.y,L=o,z=s,O=a.x,R=a.y,F=l,V=u,q=M.length;for(b=0;b=q.desktopTapThreshold2}var b=B(e);c&&(q.hoverData.tapholdCancelled=!0);t=!0,Y(u,["mousemove","vmousemove","tapdrag"],e,{x:a[0],y:a[1]});var x,w=function(){q.data.bgActivePosistion=void 0,q.hoverData.selecting||n.emit({originalEvent:e,type:"boxstart",position:{x:a[0],y:a[1]}}),l[4]=1,q.hoverData.selecting=!0,q.redrawHint("select",!0),q.redraw()};if(3===q.hoverData.which){if(c){var E={originalEvent:e,type:"cxtdrag",position:{x:a[0],y:a[1]}};d?d.emit(E):n.emit(E),q.hoverData.cxtDragged=!0,q.hoverData.cxtOver&&u===q.hoverData.cxtOver||(q.hoverData.cxtOver&&q.hoverData.cxtOver.emit({originalEvent:e,type:"cxtdragout",position:{x:a[0],y:a[1]}}),(q.hoverData.cxtOver=u)&&u.emit({originalEvent:e,type:"cxtdragover",position:{x:a[0],y:a[1]}}))}}else if(q.hoverData.dragging){if(t=!0,n.panningEnabled()&&n.userPanningEnabled()){var k;if(q.hoverData.justStartedPan){var C=q.hoverData.mdownPos;k={x:(a[0]-C[0])*r,y:(a[1]-C[1])*r},q.hoverData.justStartedPan=!1}else k={x:p[0]*r,y:p[1]*r};n.panBy(k),q.hoverData.dragged=!0}a=q.projectIntoViewport(e.clientX,e.clientY)}else if(1!=l[4]||null!=d&&!d.isEdge()){if(d&&d.isEdge()&&d.active()&&d.unactivate(),d&&d.grabbed()||u==h||(h&&Y(h,["mouseout","tapdragout"],e,{x:a[0],y:a[1]}),u&&Y(u,["mouseover","tapdragover"],e,{x:a[0],y:a[1]}),q.hoverData.last=u),d)if(c){if(n.boxSelectionEnabled()&&b)d&&d.grabbed()&&(W(f),d.emit("freeon"),f.emit("free"),q.dragData.didDrag&&(d.emit("dragfreeon"),f.emit("dragfree"))),w();else if(d&&d.grabbed()&&q.nodeIsDraggable(d)){var S=!q.dragData.didDrag;S&&q.redrawHint("eles",!0),q.dragData.didDrag=!0;var D=n.collection();q.hoverData.draggingEles||j(f,{inDragLayer:!0});var T={x:0,y:0};if($t(p[0])&&$t(p[1])&&(T.x+=p[0],T.y+=p[1],S)){var P=q.hoverData.dragDelta;P&&$t(P[0])&&$t(P[1])&&(T.x+=P[0],T.y+=P[1])}for(var M=0;M=q.touchTapThreshold2}if(t&&q.touchData.cxt){e.preventDefault();var g=e.touches[0].clientX-ee,v=e.touches[0].clientY-te,y=e.touches[1].clientX-ee,m=e.touches[1].clientY-te,b=ie(g,v,y,m);if(2.25<=b/Q||22500<=b){q.touchData.cxt=!1,q.data.bgActivePosistion=void 0,q.redrawHint("select",!0);var x={originalEvent:e,type:"cxttapend",position:{x:i[0],y:i[1]}};q.touchData.start?(q.touchData.start.unactivate().emit(x),q.touchData.start=null):r.emit(x)}}if(t&&q.touchData.cxt){x={originalEvent:e,type:"cxtdrag",position:{x:i[0],y:i[1]}};q.data.bgActivePosistion=void 0,q.redrawHint("select",!0),q.touchData.start?q.touchData.start.emit(x):r.emit(x),q.touchData.start&&(q.touchData.start._private.grabbed=!1),q.touchData.cxtDragged=!0;var w=q.findNearestElement(i[0],i[1],!0,!0);q.touchData.cxtOver&&w===q.touchData.cxtOver||(q.touchData.cxtOver&&q.touchData.cxtOver.emit({originalEvent:e,type:"cxtdragout",position:{x:i[0],y:i[1]}}),(q.touchData.cxtOver=w)&&w.emit({originalEvent:e,type:"cxtdragover",position:{x:i[0],y:i[1]}}))}else if(t&&e.touches[2]&&r.boxSelectionEnabled())e.preventDefault(),q.data.bgActivePosistion=void 0,this.lastThreeTouch=+new Date,q.touchData.selecting||r.emit({originalEvent:e,type:"boxstart",position:{x:i[0],y:i[1]}}),q.touchData.selecting=!0,q.redrawHint("select",!0),n&&0!==n.length&&void 0!==n[0]?(n[2]=(i[0]+i[2]+i[4])/3,n[3]=(i[1]+i[3]+i[5])/3):(n[0]=(i[0]+i[2]+i[4])/3,n[1]=(i[1]+i[3]+i[5])/3,n[2]=(i[0]+i[2]+i[4])/3+1,n[3]=(i[1]+i[3]+i[5])/3+1),n[4]=1,q.touchData.selecting=!0,q.redraw();else if(t&&e.touches[1]&&r.zoomingEnabled()&&r.panningEnabled()&&r.userZoomingEnabled()&&r.userPanningEnabled()){if(e.preventDefault(),q.data.bgActivePosistion=void 0,q.redrawHint("select",!0),L=q.dragData.touchDragEles){q.redrawHint("drag",!0);for(var E=0;E=y.deqFastCost*h)break}else if(e){if(u>=y.deqCost*i||u>=y.deqAvgCost*r)break}else if(c>=y.deqNoDrawCost*Lo)break;var d=y.deq(f,s,o);if(!(0=.2*e.width&&this.retireTexture(e)},qo.checkTextureFullness=function(e){var t=this.getTextureQueue(e.height);.8=t)return a.retired=!1,a.usedWidth=0,a.invalidatedWidth=0,a.fullnessChecks=0,Qt(a.eleCaches),a.context.setTransform(1,0,0,1,0,0),a.context.clearRect(0,0,a.width,a.height),Se(r,a),n.push(a),a}},qo.queueElement=function(e,t){var n=this.getElementQueue(),r=this.getElementKeyToQueue(),i=this.getKey(e),a=r[i];if(a)a.level=Math.max(a.level,t),a.eles.merge(e),a.reqs++,n.updateItem(a);else{var o={eles:e.spawn().merge(e),level:t,reqs:1,key:i};n.push(o),r[i]=o}},qo.dequeue=function(e){for(var t=this.getElementQueue(),n=this.getElementKeyToQueue(),r=[],i=this.lookup,a=0;a<1&&0=p||!ht(d.bb,v.boundingBox()))&&!(d=r({insert:!0,after:d})))return null;l||f?o.queueLayer(d,v):o.drawEleInLayer(d,v,a,e),d.eles.push(v),m[a]=d}}return l||(f?null:h)},Xo.getEleLevelForLayerLevel=function(e,t){return e},Xo.drawEleInLayer=function(e,t,n,r){var i=this.renderer,a=e.context,o=t.boundingBox();0!==o.w&&0!==o.h&&t.visible()&&(n=this.getEleLevelForLayerLevel(n,r),i.setImgSmoothing(a,!1),i.drawCachedElement(a,t,null,null,n,!0),i.setImgSmoothing(a,!0))},Xo.levelIsComplete=function(e,t){var n=this.layersByLevel[e];if(!n||0===n.length)return!1;for(var r=0,i=0;ic.minMbLowQualFrames&&(c.motionBlurPxRatio=c.mbPxRBlurry)),c.clearingMotionBlur&&(c.motionBlurPxRatio=1),c.textureDrawLastFrame&&!a&&(i[c.NODE]=!0,i[c.SELECT_BOX]=!0);var m=r.style(),b=r.zoom(),x=void 0!==l?l:b,w=r.pan(),E={x:w.x,y:w.y},k={zoom:b,pan:{x:w.x,y:w.y}},C=c.prevViewport;void 0===C||k.zoom!==C.zoom||k.pan.x!==C.pan.x||k.pan.y!==C.pan.y||g&&!f||(c.motionBlurPxRatio=1),u&&(E=u),x*=n,E.x*=n,E.y*=n;var S=c.getCachedZSortedEles();function D(e,t,n,r,i){var a=e.globalCompositeOperation;e.globalCompositeOperation="destination-out",c.colorFillStyle(e,255,255,255,c.motionBlurTransparency),e.fillRect(t,n,r,i),e.globalCompositeOperation=a}function T(e,t){var n,r,i,a;a=c.clearingMotionBlur||e!==h.bufferContexts[c.MOTIONBLUR_BUFFER_NODE]&&e!==h.bufferContexts[c.MOTIONBLUR_BUFFER_DRAG]?(n=E,r=x,i=c.canvasWidth,c.canvasHeight):(n={x:w.x*p,y:w.y*p},r=b*p,i=c.canvasWidth*p,c.canvasHeight*p),e.setTransform(1,0,0,1,0,0),"motionBlur"===t?D(e,0,0,i,a):o||void 0!==t&&!t||e.clearRect(0,0,i,a),s||(e.translate(n.x,n.y),e.scale(r,r)),u&&e.translate(u.x,u.y),l&&e.scale(l,l)}if(a||(c.textureDrawLastFrame=!1),a){if(c.textureDrawLastFrame=!0,!c.textureCache){c.textureCache={},c.textureCache.bb=r.mutableElements().boundingBox(),c.textureCache.texture=c.data.bufferCanvases[c.TEXTURE_BUFFER];var P=c.data.bufferContexts[c.TEXTURE_BUFFER];P.setTransform(1,0,0,1,0,0),P.clearRect(0,0,c.canvasWidth*c.textureMult,c.canvasHeight*c.textureMult),c.render({forcedContext:P,drawOnlyNodeLayer:!0,forcedPxRatio:n*c.textureMult}),(k=c.textureCache.viewport={zoom:r.zoom(),pan:r.pan(),width:c.canvasWidth,height:c.canvasHeight}).mpan={x:(0-k.pan.x)/k.zoom,y:(0-k.pan.y)/k.zoom}}i[c.DRAG]=!1,i[c.NODE]=!1;var M=h.contexts[c.NODE],_=c.textureCache.texture;k=c.textureCache.viewport;M.setTransform(1,0,0,1,0,0),d?D(M,0,0,k.width,k.height):M.clearRect(0,0,k.width,k.height);var B=m.core("outside-texture-bg-color").value,N=m.core("outside-texture-bg-opacity").value;c.colorFillStyle(M,B[0],B[1],B[2],N),M.fillRect(0,0,k.width,k.height);b=r.zoom();T(M,!1),M.clearRect(k.mpan.x,k.mpan.y,k.width/k.zoom/n,k.height/k.zoom/n),M.drawImage(_,k.mpan.x,k.mpan.y,k.width/k.zoom/n,k.height/k.zoom/n)}else c.textureOnViewport&&!o&&(c.textureCache=null);var I=r.extent(),A=c.pinching||c.hoverData.dragging||c.swipePanning||c.data.wheelZooming||c.hoverData.draggingEles,L=c.hideEdgesOnViewport&&A,z=[];if(z[c.NODE]=!i[c.NODE]&&d&&!c.clearedForMotionBlur[c.NODE]||c.clearingMotionBlur,z[c.NODE]&&(c.clearedForMotionBlur[c.NODE]=!0),z[c.DRAG]=!i[c.DRAG]&&d&&!c.clearedForMotionBlur[c.DRAG]||c.clearingMotionBlur,z[c.DRAG]&&(c.clearedForMotionBlur[c.DRAG]=!0),i[c.NODE]||s||t||z[c.NODE]){var O=d&&!z[c.NODE]&&1!==p;T(M=o||(O?c.data.bufferContexts[c.MOTIONBLUR_BUFFER_NODE]:h.contexts[c.NODE]),d&&!O?"motionBlur":void 0),L?c.drawCachedNodes(M,S.nondrag,n,I):c.drawLayeredElements(M,S.nondrag,n,I),c.debug&&c.drawDebugPoints(M,S.nondrag),s||d||(i[c.NODE]=!1)}if(!t&&(i[c.DRAG]||s||z[c.DRAG])){O=d&&!z[c.DRAG]&&1!==p;T(M=o||(O?c.data.bufferContexts[c.MOTIONBLUR_BUFFER_DRAG]:h.contexts[c.DRAG]),d&&!O?"motionBlur":void 0),L?c.drawCachedNodes(M,S.drag,n,I):c.drawCachedElements(M,S.drag,n,I),c.debug&&c.drawDebugPoints(M,S.drag),s||d||(i[c.DRAG]=!1)}if(c.showFps||!t&&i[c.SELECT_BOX]&&!s){if(T(M=o||h.contexts[c.SELECT_BOX]),1==c.selection[4]&&(c.hoverData.selecting||c.touchData.selecting)){b=c.cy.zoom();var R=m.core("selection-box-border-width").value/b;M.lineWidth=R,M.fillStyle="rgba("+m.core("selection-box-color").value[0]+","+m.core("selection-box-color").value[1]+","+m.core("selection-box-color").value[2]+","+m.core("selection-box-opacity").value+")",M.fillRect(c.selection[0],c.selection[1],c.selection[2]-c.selection[0],c.selection[3]-c.selection[1]),0t?1:0},I=null!=Object.assign?Object.assign.bind(Object):function(e){for(var t=arguments,n=1;n255)return;t.push(Math.floor(a))}var o=r[1]||r[2]||r[3],s=r[1]&&r[2]&&r[3];if(o&&!s)return;var l=n[4];if(void 0!==l){if((l=parseFloat(l))<0||l>1)return;t.push(l)}}return t}(e)||function(e){var t,n,r,i,a,o,s,l;function u(e,t,n){return n<0&&(n+=1),n>1&&(n-=1),n<1/6?e+6*(t-e)*n:n<.5?t:n<2/3?e+(t-e)*(2/3-n)*6:e}var c=new RegExp("^hsl[a]?\\(((?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?)))\\s*,\\s*((?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?))[%])\\s*,\\s*((?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?))[%])(?:\\s*,\\s*((?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?))))?\\)$").exec(e);if(c){if((n=parseInt(c[1]))<0?n=(360- -1*n%360)%360:n>360&&(n%=360),n/=360,(r=parseFloat(c[2]))<0||r>100)return;if(r/=100,(i=parseFloat(c[3]))<0||i>100)return;if(i/=100,void 0!==(a=c[4])&&((a=parseFloat(a))<0||a>1))return;if(0===r)o=s=l=Math.round(255*i);else{var d=i<.5?i*(1+r):i+r-i*r,h=2*i-d;o=Math.round(255*u(h,d,n+1/3)),s=Math.round(255*u(h,d,n)),l=Math.round(255*u(h,d,n-1/3))}t=[o,s,l,a]}return t}(e)},A={transparent:[0,0,0,0],aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],grey:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},O=function(e){for(var t=e.map,n=e.keys,r=n.length,i=0;i=t||n<0||d&&e-u>=a}function g(){var e=ee();if(f(e))return v(e);s=setTimeout(g,function(e){var n=t-(e-l);return d?J(n,a-(e-u)):n}(e))}function v(e){return s=void 0,h&&r?p(e):(r=i=void 0,o)}function y(){var e=ee(),n=f(e);if(r=arguments,i=this,l=e,n){if(void 0===s)return function(e){return u=e,s=setTimeout(g,t),c?p(e):o}(l);if(d)return s=setTimeout(g,t),p(l)}return void 0===s&&(s=setTimeout(g,t)),o}return t=ne(t)||0,te(n)&&(c=!!n.leading,a=(d="maxWait"in n)?Q(ne(n.maxWait)||0,t):a,h="trailing"in n?!!n.trailing:h),y.cancel=function(){void 0!==s&&clearTimeout(s),u=0,r=l=i=s=void 0},y.flush=function(){return void 0===s?o:v(ee())},y},ie=o?o.performance:null,ae=ie&&ie.now?function(){return ie.now()}:function(){return Date.now()},oe=function(){if(o){if(o.requestAnimationFrame)return function(e){o.requestAnimationFrame(e)};if(o.mozRequestAnimationFrame)return function(e){o.mozRequestAnimationFrame(e)};if(o.webkitRequestAnimationFrame)return function(e){o.webkitRequestAnimationFrame(e)};if(o.msRequestAnimationFrame)return function(e){o.msRequestAnimationFrame(e)}}return function(e){e&&setTimeout(function(){e(ae())},1e3/60)}}(),se=function(e){return oe(e)},le=ae,ue=function(e){for(var t,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:5381,r=n;!(t=e.next()).done;)r=(r<<5)+r+t.value|0;return r},ce=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:5381;return(t<<5)+t+e|0},de=function(e,t){var n={value:0,done:!1},r=0,i=e.length;return ue({next:function(){return r=0&&(e[r]!==t||(e.splice(r,1),n));r--);},Ne=function(e){e.splice(0,e.length)},ze=function(e,t,n){return n&&(t=B(n,t)),e[t]},Ie=function(e,t,n,r){n&&(t=B(n,t)),e[t]=r},Le="undefined"!=typeof Map?Map:function(){function e(){t(this,e),this._obj={}}return r(e,[{key:"set",value:function(e,t){return this._obj[e]=t,this}},{key:"delete",value:function(e){return this._obj[e]=void 0,this}},{key:"clear",value:function(){this._obj={}}},{key:"has",value:function(e){return void 0!==this._obj[e]}},{key:"get",value:function(e){return this._obj[e]}}]),e}(),Ae=function(){function e(n){if(t(this,e),this._obj=Object.create(null),this.size=0,null!=n){var r;r=null!=n.instanceString&&n.instanceString()===this.instanceString()?n.toArray():n;for(var i=0;it?1:0},u=function(e,t,i,a,o){var s;if(null==i&&(i=0),null==o&&(o=n),i<0)throw new Error("lo must be non-negative");for(null==a&&(a=e.length);in;0<=n?t++:t--)u.push(t);return u}.apply(this).reverse()).length;ag;0<=g?++h:--h)v.push(a(e,r));return v},f=function(e,t,r,i){var a,o,s;for(null==i&&(i=n),a=e[r];r>t&&i(a,o=e[s=r-1>>1])<0;)e[r]=o,r=s;return e[r]=a},g=function(e,t,r){var i,a,o,s,l;for(null==r&&(r=n),a=e.length,l=t,o=e[t],i=2*t+1;i0;){var k=b.pop(),C=y(k),S=k.id();if(d[S]=C,C!==1/0)for(var P=k.neighborhood().intersect(f),D=0;D0)for(n.unshift(t);c[i];){var a=c[i];n.unshift(a.edge),n.unshift(a.node),i=(r=a.node).id()}return o.spawn(n)}}}},Xe={kruskal:function(e){e=e||function(e){return 1};for(var t=this.byGroup(),n=t.nodes,r=t.edges,i=n.length,a=new Array(i),o=n,s=function(e){for(var t=0;t0;){if(l=g.pop(),u=l.id(),v.delete(u),w++,u===d){for(var E=[],k=i,C=d,S=m[C];E.unshift(k),null!=S&&E.unshift(S),null!=(k=y[C]);)S=m[C=k.id()];return{found:!0,distance:h[u],path:this.spawn(E),steps:w}}f[u]=!0;for(var P=l._private.edges,D=0;DD&&(f[P]=D,m[P]=S,b[P]=w),!i){var T=S*u+C;!i&&f[T]>D&&(f[T]=D,m[T]=C,b[T]=w)}}}for(var M=0;M1&&void 0!==arguments[1]?arguments[1]:a,r=m(e),i=[],o=r;;){if(null==o)return t.spawn();var l=y(o),u=l.edge,c=l.pred;if(i.unshift(o[0]),o.same(n)&&i.length>0)break;null!=u&&i.unshift(u),o=c}return s.spawn(i)},hasNegativeWeightCycle:g,negativeWeightCycles:[]}}},$e=Math.sqrt(2),Qe=function(e,t,n){0===n.length&&ke("Karger-Stein must be run on a connected (sub)graph");for(var r=n[e],i=r[1],a=r[2],o=t[i],s=t[a],l=n,u=l.length-1;u>=0;u--){var c=l[u],d=c[1],h=c[2];(t[d]===o&&t[h]===s||t[d]===s&&t[h]===o)&&l.splice(u,1)}for(var p=0;pr;){var i=Math.floor(Math.random()*t.length);t=Qe(i,e,t),n--}return t},et={kargerStein:function(){var e=this,t=this.byGroup(),n=t.nodes,r=t.edges;r.unmergeBy(function(e){return e.isLoop()});var i=n.length,a=r.length,o=Math.ceil(Math.pow(Math.log(i)/Math.LN2,2)),s=Math.floor(i/$e);if(!(i<2)){for(var l=[],u=0;u0?1:e<0?-1:0},lt=function(e,t){return Math.sqrt(ut(e,t))},ut=function(e,t){var n=t.x-e.x,r=t.y-e.y;return n*n+r*r},ct=function(e){for(var t=e.length,n=0,r=0;r=e.x1&&e.y2>=e.y1)return{x1:e.x1,y1:e.y1,x2:e.x2,y2:e.y2,w:e.x2-e.x1,h:e.y2-e.y1};if(null!=e.w&&null!=e.h&&e.w>=0&&e.h>=0)return{x1:e.x1,y1:e.y1,x2:e.x1+e.w,y2:e.y1+e.h,w:e.w,h:e.h}}},gt=function(e,t,n){e.x1=Math.min(e.x1,t),e.x2=Math.max(e.x2,t),e.w=e.x2-e.x1,e.y1=Math.min(e.y1,n),e.y2=Math.max(e.y2,n),e.h=e.y2-e.y1},vt=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return e.x1-=t,e.x2+=t,e.y1-=t,e.y2+=t,e.w=e.x2-e.x1,e.h=e.y2-e.y1,e},yt=function(e){var t,n,r,i,o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[0];if(1===o.length)t=n=r=i=o[0];else if(2===o.length)t=r=o[0],i=n=o[1];else if(4===o.length){var s=a(o,4);t=s[0],n=s[1],r=s[2],i=s[3]}return e.x1-=i,e.x2+=n,e.y1-=t,e.y2+=r,e.w=e.x2-e.x1,e.h=e.y2-e.y1,e},mt=function(e,t){e.x1=t.x1,e.y1=t.y1,e.x2=t.x2,e.y2=t.y2,e.w=e.x2-e.x1,e.h=e.y2-e.y1},bt=function(e,t){e.x1+=t.x,e.x2+=t.x,e.y1+=t.y,e.y2+=t.y},xt=function(e,t){return!(e.x1>t.x2)&&(!(t.x1>e.x2)&&(!(e.x2t.y2)&&!(t.y1>e.y2)))))))},wt=function(e,t,n){return e.x1<=t&&t<=e.x2&&e.y1<=n&&n<=e.y2},Et=function(e,t){return wt(e,t.x1,t.y1)&&wt(e,t.x2,t.y2)},kt=function(e,t,n,r,i,a,o){var s,l=qt(i,a),u=i/2,c=a/2,d=r-c-o;if((s=Lt(e,t,n,r,n-u+l-o,d,n+u-l+o,d,!1)).length>0)return s;var h=n+u+o;if((s=Lt(e,t,n,r,h,r-c+l-o,h,r+c-l+o,!1)).length>0)return s;var p=r+c+o;if((s=Lt(e,t,n,r,n-u+l-o,p,n+u-l+o,p,!1)).length>0)return s;var f,g=n-u-o;if((s=Lt(e,t,n,r,g,r-c+l-o,g,r+c-l+o,!1)).length>0)return s;var v=n-u+l,y=r-c+l;if((f=zt(e,t,n,r,v,y,l+o)).length>0&&f[0]<=v&&f[1]<=y)return[f[0],f[1]];var m=n+u-l,b=r-c+l;if((f=zt(e,t,n,r,m,b,l+o)).length>0&&f[0]>=m&&f[1]<=b)return[f[0],f[1]];var x=n+u-l,w=r+c-l;if((f=zt(e,t,n,r,x,w,l+o)).length>0&&f[0]>=x&&f[1]>=w)return[f[0],f[1]];var E=n-u+l,k=r+c-l;return(f=zt(e,t,n,r,E,k,l+o)).length>0&&f[0]<=E&&f[1]>=k?[f[0],f[1]]:[]},Ct=function(e,t,n,r,i,a,o){var s=o,l=Math.min(n,i),u=Math.max(n,i),c=Math.min(r,a),d=Math.max(r,a);return l-s<=e&&e<=u+s&&c-s<=t&&t<=d+s},St=function(e,t,n,r,i,a,o,s,l){var u=Math.min(n,o,i)-l,c=Math.max(n,o,i)+l,d=Math.min(r,s,a)-l,h=Math.max(r,s,a)+l;return!(ec||th)},Pt=function(e,t,n,r,i,a,o,s){var l=[];!function(e,t,n,r,i){var a,o,s,l,u,c,d,h;0===e&&(e=1e-5),s=-27*(r/=e)+(t/=e)*(9*(n/=e)-t*t*2),a=(o=(3*n-t*t)/9)*o*o+(s/=54)*s,i[1]=0,d=t/3,a>0?(u=(u=s+Math.sqrt(a))<0?-Math.pow(-u,1/3):Math.pow(u,1/3),c=(c=s-Math.sqrt(a))<0?-Math.pow(-c,1/3):Math.pow(c,1/3),i[0]=-d+u+c,d+=(u+c)/2,i[4]=i[2]=-d,d=Math.sqrt(3)*(-c+u)/2,i[3]=d,i[5]=-d):(i[5]=i[3]=0,0===a?(h=s<0?-Math.pow(-s,1/3):Math.pow(s,1/3),i[0]=2*h-d,i[4]=i[2]=-(h+d)):(l=(o=-o)*o*o,l=Math.acos(s/Math.sqrt(l)),h=2*Math.sqrt(o),i[0]=-d+h*Math.cos(l/3),i[2]=-d+h*Math.cos((l+2*Math.PI)/3),i[4]=-d+h*Math.cos((l+4*Math.PI)/3)))}(1*n*n-4*n*i+2*n*o+4*i*i-4*i*o+o*o+r*r-4*r*a+2*r*s+4*a*a-4*a*s+s*s,9*n*i-3*n*n-3*n*o-6*i*i+3*i*o+9*r*a-3*r*r-3*r*s-6*a*a+3*a*s,3*n*n-6*n*i+n*o-n*e+2*i*i+2*i*e-o*e+3*r*r-6*r*a+r*s-r*t+2*a*a+2*a*t-s*t,1*n*i-n*n+n*e-i*e+r*a-r*r+r*t-a*t,l);for(var u=[],c=0;c<6;c+=2)Math.abs(l[c+1])<1e-7&&l[c]>=0&&l[c]<=1&&u.push(l[c]);u.push(1),u.push(0);for(var d,h,p,f=-1,g=0;g=0?pl?(e-i)*(e-i)+(t-a)*(t-a):u-d},Tt=function(e,t,n){for(var r,i,a,o,s=0,l=0;l=e&&e>=a||r<=e&&e<=a))continue;(e-r)/(a-r)*(o-i)+i>t&&s++}return s%2!=0},Mt=function(e,t,n,r,i,a,o,s,l){var u,c=new Array(n.length);null!=s[0]?(u=Math.atan(s[1]/s[0]),s[0]<0?u+=Math.PI/2:u=-u-Math.PI/2):u=s;for(var d,h=Math.cos(-u),p=Math.sin(-u),f=0;f0){var g=_t(c,-l);d=Bt(g)}else d=c;return Tt(e,t,d)},Bt=function(e){for(var t,n,r,i,a,o,s,l,u=new Array(e.length/2),c=0;c=0&&f<=1&&v.push(f),g>=0&&g<=1&&v.push(g),0===v.length)return[];var y=v[0]*s[0]+e,m=v[0]*s[1]+t;return v.length>1?v[0]==v[1]?[y,m]:[y,m,v[1]*s[0]+e,v[1]*s[1]+t]:[y,m]},It=function(e,t,n){return t<=e&&e<=n||n<=e&&e<=t?e:e<=t&&t<=n||n<=t&&t<=e?t:n},Lt=function(e,t,n,r,i,a,o,s,l){var u=e-i,c=n-e,d=o-i,h=t-a,p=r-t,f=s-a,g=d*h-f*u,v=c*h-p*u,y=f*c-d*p;if(0!==y){var m=g/y,b=v/y;return-.001<=m&&m<=1.001&&-.001<=b&&b<=1.001?[e+m*c,t+m*p]:l?[e+m*c,t+m*p]:[]}return 0===g||0===v?It(e,n,o)===o?[o,s]:It(e,n,i)===i?[i,a]:It(i,o,n)===n?[n,r]:[]:[]},At=function(e,t,n,r,i,a,o,s){var l,u,c,d,h,p,f=[],g=new Array(n.length),v=!0;if(null==a&&(v=!1),v){for(var y=0;y0){var m=_t(g,-s);u=Bt(m)}else u=g}else u=n;for(var b=0;bu&&(u=t)},d=function(e){return l[e]},h=0;h0?b.edgesTo(m)[0]:m.edgesTo(b)[0];var w=r(x);m=m.id(),h[m]>h[v]+w&&(h[m]=h[v]+w,p.nodes.indexOf(m)<0?p.push(m):p.updateItem(m),u[m]=0,l[m]=[]),h[m]==h[v]+w&&(u[m]=u[m]+u[v],l[m].push(v))}else for(var E=0;E0;)for(var P=n.pop(),D=0;D0&&o.push(n[s]);0!==o.length&&i.push(r.collection(o))}return i}(c,l,t,r);return b=function(e){for(var t=0;t5&&void 0!==arguments[5]?arguments[5]:un,o=r,s=0;s=2?gn(e,t,n,0,hn,pn):gn(e,t,n,0,dn)},squaredEuclidean:function(e,t,n){return gn(e,t,n,0,hn)},manhattan:function(e,t,n){return gn(e,t,n,0,dn)},max:function(e,t,n){return gn(e,t,n,-1/0,fn)}};function yn(e,t,n,r,i,a){var o;return o=f(e)?e:vn[e]||vn.euclidean,0===t&&f(e)?o(i,a):o(t,n,r,i,a)}vn["squared-euclidean"]=vn.squaredEuclidean,vn.squaredeuclidean=vn.squaredEuclidean;var mn=Be({k:2,m:2,sensitivityThreshold:1e-4,distance:"euclidean",maxIterations:10,attributes:[],testMode:!1,testCentroids:null}),bn=function(e){return mn(e)},xn=function(e,t,n,r,i){var a="kMedoids"!==i?function(e){return n[e]}:function(e){return r[e](n)},o=n,s=t;return yn(e,r.length,a,function(e){return r[e](t)},o,s)},wn=function(e,t,n){for(var r=n.length,i=new Array(r),a=new Array(r),o=new Array(t),s=null,l=0;ln)return!1}return!0},Sn=function(e,t,n){for(var r=0;ri&&(i=t[l][u],a=u);o[a].push(e[l])}for(var c=0;c=i.threshold||"dendrogram"===i.mode&&1===e.length)return!1;var p,f=t[o],g=t[r[o]];p="dendrogram"===i.mode?{left:f,right:g,key:f.key}:{value:f.value.concat(g.value),key:f.key},e[f.index]=p,e.splice(g.index,1),t[f.key]=p;for(var v=0;vn[g.key][y.key]&&(a=n[g.key][y.key])):"max"===i.linkage?(a=n[f.key][y.key],n[f.key][y.key]1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:e.length,r=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],i=!(arguments.length>4&&void 0!==arguments[4])||arguments[4],a=!(arguments.length>5&&void 0!==arguments[5])||arguments[5];r?e=e.slice(t,n):(n0&&e.splice(0,t));for(var o=0,s=e.length-1;s>=0;s--){var l=e[s];a?isFinite(l)||(e[s]=-1/0,o++):e.splice(s,1)}i&&e.sort(function(e,t){return e-t});var u=e.length,c=Math.floor(u/2);return u%2!=0?e[c+1+o]:(e[c-1+o]+e[c+o])/2}(e):"mean"===t?function(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:e.length,r=0,i=0,a=t;a1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:e.length,r=1/0,i=t;i1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:e.length,r=-1/0,i=t;io&&(a=l,o=t[i*e+l])}a>0&&r.push(a)}for(var u=0;u=D?(T=D,D=B,M=_):B>T&&(T=B);for(var N=0;N0?1:0;C[k%u.minIterations*t+R]=V,O+=V}if(O>0&&(k>=u.minIterations-1||k==u.maxIterations-1)){for(var F=0,q=0;q0&&r.push(i);return r}(t,a,o),X=function(e,t,n){for(var r=qn(e,t,n),i=0;il&&(s=u,l=c)}n[i]=a[s]}return r=qn(e,t,n)}(t,r,Y),W={},H=0;H1)}});var l=Object.keys(t).filter(function(e){return t[e].cutVertex}).map(function(t){return e.getElementById(t)});return{cut:e.spawn(l),components:i}},Hn={};[Fe,Ye,Xe,He,Ge,Ue,et,Wt,Kt,Zt,$t,ln,_n,On,Yn,{hierholzer:function(e){if(!v(e)){var t=arguments;e={root:t[0],directed:t[1]}}var n,r,i,a=Xn(e),o=a.root,s=a.directed,l=this,u=!1;o&&(i=p(o)?this.filter(o)[0].id():o[0].id());var c={},d={};s?l.forEach(function(e){var t=e.id();if(e.isNode()){var i=e.indegree(!0),a=e.outdegree(!0),o=i-a,s=a-i;1==o?n?u=!0:n=t:1==s?r?u=!0:r=t:(s>1||o>1)&&(u=!0),c[t]=[],e.outgoers().forEach(function(e){e.isEdge()&&c[t].push(e.id())})}else d[t]=[void 0,e.target().id()]}):l.forEach(function(e){var t=e.id();e.isNode()?(e.degree(!0)%2&&(n?r?u=!0:r=t:n=t),c[t]=[],e.connectedEdges().forEach(function(e){return c[t].push(e.id())})):d[t]=[e.source().id(),e.target().id()]});var h={found:!1,trail:void 0};if(u)return h;if(r&&n)if(s){if(i&&r!=i)return h;i=r}else{if(i&&r!=i&&n!=i)return h;i||(i=r)}else i||(i=l[0].id());var f=function(e){for(var t,n,r,i=e,a=[e];c[i].length;)t=c[i].shift(),n=d[t][0],i!=(r=d[t][1])?(c[r]=c[r].filter(function(e){return e!=t}),i=r):s||i==n||(c[n]=c[n].filter(function(e){return e!=t}),i=n),a.unshift(t),a.unshift(i);return a},g=[],y=[];for(y=f(i);1!=y.length;)0==c[y[0]].length?(g.unshift(l.getElementById(y.shift())),g.unshift(l.getElementById(y.shift()))):y=f(y.shift()).concat(y);for(var m in g.unshift(l.getElementById(y.shift())),c)if(c[m].length)return h;return h.found=!0,h.trail=this.spawn(g),h}},{hopcroftTarjanBiconnected:Wn,htbc:Wn,htb:Wn,hopcroftTarjanBiconnectedComponents:Wn}].forEach(function(e){I(Hn,e)});var Kn=function e(t){if(!(this instanceof e))return new e(t);this.id="Thenable/1.0.7",this.state=0,this.fulfillValue=void 0,this.rejectReason=void 0,this.onFulfilled=[],this.onRejected=[],this.proxy={then:this.then.bind(this)},"function"==typeof t&&t.call(this,this.fulfill.bind(this),this.reject.bind(this))};Kn.prototype={fulfill:function(e){return Gn(this,1,"fulfillValue",e)},reject:function(e){return Gn(this,2,"rejectReason",e)},then:function(e,t){var n=new Kn;return this.onFulfilled.push($n(e,n,"fulfill")),this.onRejected.push($n(t,n,"reject")),Zn(this),n.proxy}};var Gn=function(e,t,n,r){return 0===e.state&&(e.state=t,e[n]=r,Zn(e)),e},Zn=function(e){1===e.state?Un(e,"onFulfilled",e.fulfillValue):2===e.state&&Un(e,"onRejected",e.rejectReason)},Un=function(e,t,n){if(0!==e[t].length){var r=e[t];e[t]=[];var i=function(){for(var e=0;e0:void 0}},clearQueue:function(){return function(){var e=void 0!==this.length?this:[this];if(!(this._private.cy||this).styleEnabled())return this;for(var t=0;t0&&this.spawn(n).updateStyle().emit("class"),this},addClass:function(e){return this.toggleClass(e,!0)},hasClass:function(e){var t=this[0];return null!=t&&t._private.classes.has(e)},toggleClass:function(e,t){g(e)||(e=e.match(/\S+/g)||[]);for(var n=void 0===t,r=[],i=0,a=this.length;i0&&this.spawn(r).updateStyle().emit("class"),this},removeClass:function(e){return this.toggleClass(e,!1)},flashClass:function(e,t){var n=this;if(null==t)t=250;else if(0===t)return n;return n.addClass(e),setTimeout(function(){n.removeClass(e)},t),n}};ir.className=ir.classNames=ir.classes;var ar={metaChar:"[\\!\\\"\\#\\$\\%\\&\\'\\(\\)\\*\\+\\,\\.\\/\\:\\;\\<\\=\\>\\?\\@\\[\\]\\^\\`\\{\\|\\}\\~]",comparatorOp:"=|\\!=|>|>=|<|<=|\\$=|\\^=|\\*=",boolOp:"\\?|\\!|\\^",string:'"(?:\\\\"|[^"])*"|'+"'(?:\\\\'|[^'])*'",number:N,meta:"degree|indegree|outdegree",separator:"\\s*,\\s*",descendant:"\\s+",child:"\\s+>\\s+",subject:"\\$",group:"node|edge|\\*",directedEdge:"\\s+->\\s+",undirectedEdge:"\\s+<->\\s+"};ar.variable="(?:[\\w-]|(?:\\\\"+ar.metaChar+"))+",ar.value=ar.string+"|"+ar.number,ar.className=ar.variable,ar.id=ar.variable,function(){var e,t,n;for(e=ar.comparatorOp.split("|"),n=0;n=0||"="!==t&&(ar.comparatorOp+="|\\!"+t)}();var or=0,sr=1,lr=2,ur=3,cr=4,dr=5,hr=6,pr=7,fr=8,gr=9,vr=10,yr=11,mr=12,br=13,xr=14,wr=15,Er=16,kr=17,Cr=18,Sr=19,Pr=20,Dr=[{selector:":selected",matches:function(e){return e.selected()}},{selector:":unselected",matches:function(e){return!e.selected()}},{selector:":selectable",matches:function(e){return e.selectable()}},{selector:":unselectable",matches:function(e){return!e.selectable()}},{selector:":locked",matches:function(e){return e.locked()}},{selector:":unlocked",matches:function(e){return!e.locked()}},{selector:":visible",matches:function(e){return e.visible()}},{selector:":hidden",matches:function(e){return!e.visible()}},{selector:":transparent",matches:function(e){return e.transparent()}},{selector:":grabbed",matches:function(e){return e.grabbed()}},{selector:":free",matches:function(e){return!e.grabbed()}},{selector:":removed",matches:function(e){return e.removed()}},{selector:":inside",matches:function(e){return!e.removed()}},{selector:":grabbable",matches:function(e){return e.grabbable()}},{selector:":ungrabbable",matches:function(e){return!e.grabbable()}},{selector:":animated",matches:function(e){return e.animated()}},{selector:":unanimated",matches:function(e){return!e.animated()}},{selector:":parent",matches:function(e){return e.isParent()}},{selector:":childless",matches:function(e){return e.isChildless()}},{selector:":child",matches:function(e){return e.isChild()}},{selector:":orphan",matches:function(e){return e.isOrphan()}},{selector:":nonorphan",matches:function(e){return e.isChild()}},{selector:":compound",matches:function(e){return e.isNode()?e.isParent():e.source().isParent()||e.target().isParent()}},{selector:":loop",matches:function(e){return e.isLoop()}},{selector:":simple",matches:function(e){return e.isSimple()}},{selector:":active",matches:function(e){return e.active()}},{selector:":inactive",matches:function(e){return!e.active()}},{selector:":backgrounding",matches:function(e){return e.backgrounding()}},{selector:":nonbackgrounding",matches:function(e){return!e.backgrounding()}}].sort(function(e,t){return function(e,t){return-1*z(e,t)}(e.selector,t.selector)}),Tr=function(){for(var e,t={},n=0;n0&&l.edgeCount>0)return Se("The selector `"+e+"` is invalid because it uses both a compound selector and an edge selector"),!1;if(l.edgeCount>1)return Se("The selector `"+e+"` is invalid because it uses multiple edge selectors"),!1;1===l.edgeCount&&Se("The selector `"+e+"` is deprecated. Edge selectors do not take effect on changes to source and target nodes after an edge is added, for performance reasons. Use a class or data selector on edges instead, updating the class or data of an edge when your app detects a change in source or target nodes.")}return!0},toString:function(){if(null!=this.toStringCache)return this.toStringCache;for(var e=function(e){return null==e?"":e},t=function(t){return p(t)?'"'+t+'"':e(t)},n=function(e){return" "+e+" "},r=function(r,a){var o=r.type,s=r.value;switch(o){case or:var l=e(s);return l.substring(0,l.length-1);case ur:var u=r.field,c=r.operator;return"["+u+n(e(c))+t(s)+"]";case dr:var d=r.operator,h=r.field;return"["+e(d)+h+"]";case cr:return"["+r.field+"]";case hr:var p=r.operator;return"[["+r.field+n(e(p))+t(s)+"]]";case pr:return s;case fr:return"#"+s;case gr:return"."+s;case kr:case wr:return i(r.parent,a)+n(">")+i(r.child,a);case Cr:case Er:return i(r.ancestor,a)+" "+i(r.descendant,a);case Sr:var f=i(r.left,a),g=i(r.subject,a),v=i(r.right,a);return f+(f.length>0?" ":"")+g+v;case Pr:return""}},i=function(e,t){return e.checks.reduce(function(n,i,a){return n+(t===e&&0===a?"$":"")+r(i,t)},"")},a="",o=0;o1&&o=0&&(t=t.replace("!",""),c=!0),t.indexOf("@")>=0&&(t=t.replace("@",""),u=!0),(o||l||u)&&(i=o||s?""+e:"",a=""+n),u&&(e=i=i.toLowerCase(),n=a=a.toLowerCase()),t){case"*=":r=i.indexOf(a)>=0;break;case"$=":r=i.indexOf(a,i.length-a.length)>=0;break;case"^=":r=0===i.indexOf(a);break;case"=":r=e===n;break;case">":d=!0,r=e>n;break;case">=":d=!0,r=e>=n;break;case"<":d=!0,r=e0;){var u=i.shift();t(u),a.add(u.id()),o&&r(i,a,u)}return e}function Kr(e,t,n){if(n.isParent())for(var r=n._private.children,i=0;i1&&void 0!==arguments[1])||arguments[1];return Hr(this,e,t,Kr)},Wr.forEachUp=function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];return Hr(this,e,t,Gr)},Wr.forEachUpAndDown=function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];return Hr(this,e,t,Zr)},Wr.ancestors=Wr.parents,(jr=Yr={data:nr.data({field:"data",bindingEvent:"data",allowBinding:!0,allowSetting:!0,settingEvent:"data",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,immutableKeys:{id:!0,source:!0,target:!0,parent:!0},updateStyle:!0}),removeData:nr.removeData({field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!0,immutableKeys:{id:!0,source:!0,target:!0,parent:!0},updateStyle:!0}),scratch:nr.data({field:"scratch",bindingEvent:"scratch",allowBinding:!0,allowSetting:!0,settingEvent:"scratch",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,updateStyle:!0}),removeScratch:nr.removeData({field:"scratch",event:"scratch",triggerFnName:"trigger",triggerEvent:!0,updateStyle:!0}),rscratch:nr.data({field:"rscratch",allowBinding:!1,allowSetting:!0,settingTriggersEvent:!1,allowGetting:!0}),removeRscratch:nr.removeData({field:"rscratch",triggerEvent:!1}),id:function(){var e=this[0];if(e)return e._private.data.id}}).attr=jr.data,jr.removeAttr=jr.removeData;var Ur,$r,Qr=Yr,Jr={};function ei(e){return function(t){if(void 0===t&&(t=!0),0!==this.length&&this.isNode()&&!this.removed()){for(var n=0,r=this[0],i=r._private.edges,a=0;at}),minIndegree:ti("indegree",function(e,t){return et}),minOutdegree:ti("outdegree",function(e,t){return et})}),I(Jr,{totalDegree:function(e){for(var t=0,n=this.nodes(),r=0;r0,c=u;u&&(l=l[0]);var d=c?l.position():{x:0,y:0};return i={x:s.x-d.x,y:s.y-d.y},void 0===e?i:i[e]}for(var h=0;h0,m=y;y&&(g=g[0]);var b=m?g.position():{x:0,y:0};void 0!==t?f.position(e,t+b[e]):void 0!==i&&f.position({x:i.x+b.x,y:i.y+b.y})}}else if(!a)return;return this}}).modelPosition=Ur.point=Ur.position,Ur.modelPositions=Ur.points=Ur.positions,Ur.renderedPoint=Ur.renderedPosition,Ur.relativePoint=Ur.relativePosition;var ii,ai,oi=$r;ii=ai={},ai.renderedBoundingBox=function(e){var t=this.boundingBox(e),n=this.cy(),r=n.zoom(),i=n.pan(),a=t.x1*r+i.x,o=t.x2*r+i.x,s=t.y1*r+i.y,l=t.y2*r+i.y;return{x1:a,x2:o,y1:s,y2:l,w:o-a,h:l-s}},ai.dirtyCompoundBoundsCache=function(){var e=this.cy();return e.styleEnabled()&&e.hasCompoundNodes()?(this.forEachUp(function(e){if(e.isParent()){var t=e._private;t.compoundBoundsClean=!1,t.bbCache=null,e.emitAndNotify("bounds")}}),this):this},ai.updateCompoundBounds=function(){var e=arguments.length>0&&void 0!==arguments[0]&&arguments[0],t=this.cy();if(!t.styleEnabled()||!t.hasCompoundNodes())return this;if(!e&&t.batching())return this;function n(e){if(e.isParent()){var t=e._private,n=e.children(),r="include"===e.pstyle("compound-sizing-wrt-labels").value,i={width:{val:e.pstyle("min-width").pfValue,left:e.pstyle("min-width-bias-left"),right:e.pstyle("min-width-bias-right")},height:{val:e.pstyle("min-height").pfValue,top:e.pstyle("min-height-bias-top"),bottom:e.pstyle("min-height-bias-bottom")}},a=n.boundingBox({includeLabels:r,includeOverlays:!1,useCache:!1}),o=t.position;0!==a.w&&0!==a.h||((a={w:e.pstyle("width").pfValue,h:e.pstyle("height").pfValue}).x1=o.x-a.w/2,a.x2=o.x+a.w/2,a.y1=o.y-a.h/2,a.y2=o.y+a.h/2);var s=i.width.left.value;"px"===i.width.left.units&&i.width.val>0&&(s=100*s/i.width.val);var l=i.width.right.value;"px"===i.width.right.units&&i.width.val>0&&(l=100*l/i.width.val);var u=i.height.top.value;"px"===i.height.top.units&&i.height.val>0&&(u=100*u/i.height.val);var c=i.height.bottom.value;"px"===i.height.bottom.units&&i.height.val>0&&(c=100*c/i.height.val);var d=y(i.width.val-a.w,s,l),h=d.biasDiff,p=d.biasComplementDiff,f=y(i.height.val-a.h,u,c),g=f.biasDiff,v=f.biasComplementDiff;t.autoPadding=function(e,t,n,r){if("%"!==n.units)return"px"===n.units?n.pfValue:0;switch(r){case"width":return e>0?n.pfValue*e:0;case"height":return t>0?n.pfValue*t:0;case"average":return e>0&&t>0?n.pfValue*(e+t)/2:0;case"min":return e>0&&t>0?e>t?n.pfValue*t:n.pfValue*e:0;case"max":return e>0&&t>0?e>t?n.pfValue*e:n.pfValue*t:0;default:return 0}}(a.w,a.h,e.pstyle("padding"),e.pstyle("padding-relative-to").value),t.autoWidth=Math.max(a.w,i.width.val),o.x=(-h+a.x1+a.x2+p)/2,t.autoHeight=Math.max(a.h,i.height.val),o.y=(-g+a.y1+a.y2+v)/2}function y(e,t,n){var r=0,i=0,a=t+n;return e>0&&a>0&&(r=t/a*e,i=n/a*e),{biasDiff:r,biasComplementDiff:i}}}for(var r=0;re.x2?r:e.x2,e.y1=ne.y2?i:e.y2,e.w=e.x2-e.x1,e.h=e.y2-e.y1)},ui=function(e,t){return null==t?e:li(e,t.x1,t.y1,t.x2,t.y2)},ci=function(e,t,n){return ze(e,t,n)},di=function(e,t,n){if(!t.cy().headless()){var r,i,a=t._private,o=a.rstyle,s=o.arrowWidth/2;if("none"!==t.pstyle(n+"-arrow-shape").value){"source"===n?(r=o.srcX,i=o.srcY):"target"===n?(r=o.tgtX,i=o.tgtY):(r=o.midX,i=o.midY);var l=a.arrowBounds=a.arrowBounds||{},u=l[n]=l[n]||{};u.x1=r-s,u.y1=i-s,u.x2=r+s,u.y2=i+s,u.w=u.x2-u.x1,u.h=u.y2-u.y1,vt(u,1),li(e,u.x1,u.y1,u.x2,u.y2)}}},hi=function(e,t,n){if(!t.cy().headless()){var r;r=n?n+"-":"";var i=t._private,a=i.rstyle;if(t.pstyle(r+"label").strValue){var o,s,l,u,c=t.pstyle("text-halign"),d=t.pstyle("text-valign"),h=ci(a,"labelWidth",n),p=ci(a,"labelHeight",n),f=ci(a,"labelX",n),g=ci(a,"labelY",n),v=t.pstyle(r+"text-margin-x").pfValue,y=t.pstyle(r+"text-margin-y").pfValue,m=t.isEdge(),b=t.pstyle(r+"text-rotation"),x=t.pstyle("text-outline-width").pfValue,w=t.pstyle("text-border-width").pfValue/2,E=t.pstyle("text-background-padding").pfValue,k=p,C=h,S=C/2,P=k/2;if(m)o=f-S,s=f+S,l=g-P,u=g+P;else{switch(c.value){case"left":o=f-C,s=f;break;case"center":o=f-S,s=f+S;break;case"right":o=f,s=f+C}switch(d.value){case"top":l=g-k,u=g;break;case"center":l=g-P,u=g+P;break;case"bottom":l=g,u=g+k}}o+=v-Math.max(x,w)-E,s+=v+Math.max(x,w)+E,l+=y-Math.max(x,w)-E,u+=y+Math.max(x,w)+E;var D=n||"main",T=i.labelBounds,M=T[D]=T[D]||{};M.x1=o,M.y1=l,M.x2=s,M.y2=u,M.w=s-o,M.h=u-l,vt(M,1);var B=m&&"autorotate"===b.strValue,_=null!=b.pfValue&&0!==b.pfValue;if(B||_){var N=B?ci(i.rstyle,"labelAngle",n):b.pfValue,z=Math.cos(N),I=Math.sin(N),L=(o+s)/2,A=(l+u)/2;if(!m){switch(c.value){case"left":L=s;break;case"right":L=o}switch(d.value){case"top":A=u;break;case"bottom":A=l}}var O=function(e,t){return{x:(e-=L)*z-(t-=A)*I+L,y:e*I+t*z+A}},R=O(o,l),V=O(o,u),F=O(s,l),q=O(s,u);o=Math.min(R.x,V.x,F.x,q.x),s=Math.max(R.x,V.x,F.x,q.x),l=Math.min(R.y,V.y,F.y,q.y),u=Math.max(R.y,V.y,F.y,q.y)}var j=D+"Rot",Y=T[j]=T[j]||{};Y.x1=o,Y.y1=l,Y.x2=s,Y.y2=u,Y.w=s-o,Y.h=u-l,li(e,o,l,s,u),li(i.labelBounds.all,o,l,s,u)}return e}},pi=function(e){var t=0,n=function(e){return(e?1:0)<(r=P[1].x)){var D=n;n=r,r=D}if(i>(a=P[1].y)){var T=i;i=a,a=T}li(h,n-w,i-w,r+w,a+w)}}else if("bezier"===S||"unbundled-bezier"===S||"segments"===S||"taxi"===S){var M;switch(S){case"bezier":case"unbundled-bezier":M=v.bezierPts;break;case"segments":case"taxi":M=v.linePts}if(null!=M)for(var B=0;B(r=z.x)){var I=n;n=r,r=I}if((i=N.y)>(a=z.y)){var L=i;i=a,a=L}li(h,n-=w,i-=w,r+=w,a+=w)}if(c&&t.includeEdges&&g&&(di(h,e,"mid-source"),di(h,e,"mid-target"),di(h,e,"source"),di(h,e,"target")),c&&"yes"===e.pstyle("ghost").value){var A=e.pstyle("ghost-offset-x").pfValue,O=e.pstyle("ghost-offset-y").pfValue;li(h,h.x1+A,h.y1+O,h.x2+A,h.y2+O)}var R=p.bodyBounds=p.bodyBounds||{};mt(R,h),yt(R,y),vt(R,1),c&&(n=h.x1,r=h.x2,i=h.y1,a=h.y2,li(h,n-x,i-x,r+x,a+x));var V=p.overlayBounds=p.overlayBounds||{};mt(V,h),yt(V,y),vt(V,1);var F=p.labelBounds=p.labelBounds||{};null!=F.all?((l=F.all).x1=1/0,l.y1=1/0,l.x2=-1/0,l.y2=-1/0,l.w=0,l.h=0):F.all=ft(),c&&t.includeLabels&&(t.includeMainLabels&&hi(h,e,null),g&&(t.includeSourceLabels&&hi(h,e,"source"),t.includeTargetLabels&&hi(h,e,"target")))}return h.x1=si(h.x1),h.y1=si(h.y1),h.x2=si(h.x2),h.y2=si(h.y2),h.w=si(h.x2-h.x1),h.h=si(h.y2-h.y1),h.w>0&&h.h>0&&b&&(yt(h,y),vt(h,1)),h}(e,vi),r.bbCache=n,r.bbCacheShift.x=r.bbCacheShift.y=0,r.bbCachePosKey=o):n=r.bbCache,!u&&(0!==r.bbCacheShift.x||0!==r.bbCacheShift.y)){var c=bt,d=r.bbCacheShift,h=function(e,t){null!=e&&c(e,t)};c(n,d);var p=r.bodyBounds,f=r.overlayBounds,g=r.labelBounds,v=r.arrowBounds;h(p,d),h(f,d),null!=v&&(h(v.source,d),h(v.target,d),h(v["mid-source"],d),h(v["mid-target"],d)),null!=g&&(h(g.main,d),h(g.all,d),h(g.source,d),h(g.target,d))}if(r.bbCacheShift.x=r.bbCacheShift.y=0,!a){var y=e.isNode();n=ft(),(t.includeNodes&&y||t.includeEdges&&!y)&&(t.includeOverlays?ui(n,r.overlayBounds):ui(n,r.bodyBounds)),t.includeLabels&&(t.includeMainLabels&&(!i||t.includeSourceLabels&&t.includeTargetLabels)?ui(n,r.labelBounds.all):(t.includeMainLabels&&ui(n,r.labelBounds.mainRot),t.includeSourceLabels&&ui(n,r.labelBounds.sourceRot),t.includeTargetLabels&&ui(n,r.labelBounds.targetRot))),n.w=n.x2-n.x1,n.h=n.y2-n.y1}return n},vi={includeNodes:!0,includeEdges:!0,includeLabels:!0,includeMainLabels:!0,includeSourceLabels:!0,includeTargetLabels:!0,includeOverlays:!0,useCache:!0},yi=pi(vi),mi=Be(vi);ai.boundingBox=function(e){var t;if(1!==this.length||null==this[0]._private.bbCache||void 0!==e&&void 0!==e.useCache&&!0!==e.useCache){t=ft();var n=mi(e=e||vi);if(this.cy().styleEnabled())for(var r=0;r0&&void 0!==arguments[0]?arguments[0]:zi,t=arguments.length>1?arguments[1]:void 0,n=0;n=0;s--)o(s);return this},Li.removeAllListeners=function(){return this.removeListener("*")},Li.emit=Li.trigger=function(e,t,n){var r=this.listeners,i=r.length;return this.emitting++,g(t)||(t=[t]),Ri(this,function(e,a){null!=n&&(r=[{event:a.event,type:a.type,namespace:a.namespace,callback:n}],i=r.length);for(var o=function(n){var i=r[n];if(i.type===a.type&&(!i.namespace||i.namespace===a.namespace||".*"===i.namespace)&&e.eventMatches(e.context,i,a)){var o=[a];null!=t&&function(e,t){for(var n=0;n1&&!r){var i=this.length-1,a=this[i],o=a._private.data.id;this[i]=void 0,this[e]=a,n.set(o,{ele:a,index:e})}return this.length--,this},unmergeOne:function(e){e=e[0];var t=this._private,n=e._private.data.id,r=t.map.get(n);if(!r)return this;var i=r.index;return this.unmergeAt(i),this},unmerge:function(e){var t=this._private.cy;if(!e)return this;if(e&&p(e)){var n=e;e=t.mutableElements().filter(n)}for(var r=0;r=0;t--){e(this[t])&&this.unmergeAt(t)}return this},map:function(e,t){for(var n=[],r=0;rr&&(r=o,n=a)}return{value:r,ele:n}},min:function(e,t){for(var n,r=1/0,i=0;i=0&&i1&&void 0!==arguments[1])||arguments[1],n=this[0],r=n.cy();if(r.styleEnabled()&&n){var i=n._private.style[e];return null!=i?i:t?r.style().getDefaultProperty(e):null}},numericStyle:function(e){var t=this[0];if(t.cy().styleEnabled()&&t){var n=t.pstyle(e);return void 0!==n.pfValue?n.pfValue:n.value}},numericStyleUnits:function(e){var t=this[0];if(t.cy().styleEnabled())return t?t.pstyle(e).units:void 0},renderedStyle:function(e){var t=this.cy();if(!t.styleEnabled())return this;var n=this[0];return n?t.style().getRenderedStyle(n,e):void 0},style:function(e,t){var n=this.cy();if(!n.styleEnabled())return this;var r=n.style();if(v(e)){var i=e;r.applyBypass(this,i,!1),this.emitAndNotify("style")}else if(p(e)){if(void 0===t){var a=this[0];return a?r.getStylePropertyValue(a,e):void 0}r.applyBypass(this,e,t,!1),this.emitAndNotify("style")}else if(void 0===e){var o=this[0];return o?r.getRawStyle(o):void 0}return this},removeStyle:function(e){var t=this.cy();if(!t.styleEnabled())return this;var n=t.style();if(void 0===e)for(var r=0;r0&&t.push(c[0]),t.push(s[0])}return this.spawn(t,{unique:!0}).filter(e)},"neighborhood"),closedNeighborhood:function(e){return this.neighborhood().add(this).filter(e)},openNeighborhood:function(e){return this.neighborhood(e)}}),la.neighbourhood=la.neighborhood,la.closedNeighbourhood=la.closedNeighborhood,la.openNeighbourhood=la.openNeighborhood,I(la,{source:Xr(function(e){var t,n=this[0];return n&&(t=n._private.source||n.cy().collection()),t&&e?t.filter(e):t},"source"),target:Xr(function(e){var t,n=this[0];return n&&(t=n._private.target||n.cy().collection()),t&&e?t.filter(e):t},"target"),sources:ha({attr:"source"}),targets:ha({attr:"target"})}),I(la,{edgesWith:Xr(pa(),"edgesWith"),edgesTo:Xr(pa({thisIsSrc:!0}),"edgesTo")}),I(la,{connectedEdges:Xr(function(e){for(var t=[],n=0;n0);return a},component:function(){var e=this[0];return e.cy().mutableElements().components(e)[0]}}),la.componentsOf=la.components;var ga=function(e,t,n){for(var r=null!=n?n:De();e.hasElementWithId(r);)r=De();return r},va=function(e,t,n){if(void 0!==e&&E(e)){var r=new Le,i=!1;if(t){if(t.length>0&&v(t[0])&&!x(t[0])){i=!0;for(var a=[],o=new Oe,s=0,l=t.length;s0&&void 0!==arguments[0])||arguments[0],r=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],i=this,a=i.cy(),o=a._private,s=[],l=[],u=0,c=i.length;u0){for(var R=new va(a,e),V=0;V0&&void 0!==arguments[0])||arguments[0],t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=this,r=[],i={},a=n._private.cy;function o(e){for(var t=e._private.edges,n=0;n0&&(e?D.emitAndNotify("remove"):t&&D.emit("remove"));for(var T=0;T=a?function(t,r){for(var a=0;a0?i=l:r=l}while(Math.abs(a)>o&&++u1e-4&&Math.abs(s.v)>1e-4;);return a?function(e){return u[e*(u.length-1)|0]}:c}}(),wa=function(e,t,n,r){var i=ba(e,t,n,r);return function(e,t,n){return e+(t-e)*i(n)}},Ea={linear:function(e,t,n){return e+(t-e)*n},ease:wa(.25,.1,.25,1),"ease-in":wa(.42,0,1,1),"ease-out":wa(0,0,.58,1),"ease-in-out":wa(.42,0,.58,1),"ease-in-sine":wa(.47,0,.745,.715),"ease-out-sine":wa(.39,.575,.565,1),"ease-in-out-sine":wa(.445,.05,.55,.95),"ease-in-quad":wa(.55,.085,.68,.53),"ease-out-quad":wa(.25,.46,.45,.94),"ease-in-out-quad":wa(.455,.03,.515,.955),"ease-in-cubic":wa(.55,.055,.675,.19),"ease-out-cubic":wa(.215,.61,.355,1),"ease-in-out-cubic":wa(.645,.045,.355,1),"ease-in-quart":wa(.895,.03,.685,.22),"ease-out-quart":wa(.165,.84,.44,1),"ease-in-out-quart":wa(.77,0,.175,1),"ease-in-quint":wa(.755,.05,.855,.06),"ease-out-quint":wa(.23,1,.32,1),"ease-in-out-quint":wa(.86,0,.07,1),"ease-in-expo":wa(.95,.05,.795,.035),"ease-out-expo":wa(.19,1,.22,1),"ease-in-out-expo":wa(1,0,0,1),"ease-in-circ":wa(.6,.04,.98,.335),"ease-out-circ":wa(.075,.82,.165,1),"ease-in-out-circ":wa(.785,.135,.15,.86),spring:function(e,t,n){if(0===n)return Ea.linear;var r=xa(e,t,n);return function(e,t,n){return e+(t-e)*r(n)}},"cubic-bezier":wa};function ka(e,t,n,r,i){if(1===r)return n;if(t===n)return n;var a=i(t,n,r);return null==e?a:((e.roundValue||e.color)&&(a=Math.round(a)),void 0!==e.min&&(a=Math.max(a,e.min)),void 0!==e.max&&(a=Math.min(a,e.max)),a)}function Ca(e,t){return null!=e.pfValue||null!=e.value?null==e.pfValue||null!=t&&"%"===t.type.units?e.value:e.pfValue:e}function Sa(e,t,n,r,i){var a=null!=i?i.type:null;n<0?n=0:n>1&&(n=1);var o=Ca(e,i),s=Ca(t,i);if(y(o)&&y(s))return ka(a,o,s,n,r);if(g(o)&&g(s)){for(var l=[],u=0;u0?("spring"===d&&h.push(o.duration),o.easingImpl=Ea[d].apply(null,h)):o.easingImpl=Ea[d]}var f,g=o.easingImpl;if(f=0===o.duration?1:(n-l)/o.duration,o.applying&&(f=o.progress),f<0?f=0:f>1&&(f=1),null==o.delay){var v=o.startPosition,y=o.position;if(y&&i&&!e.locked()){var m={};Da(v.x,y.x)&&(m.x=Sa(v.x,y.x,f,g)),Da(v.y,y.y)&&(m.y=Sa(v.y,y.y,f,g)),e.position(m)}var b=o.startPan,x=o.pan,w=a.pan,E=null!=x&&r;E&&(Da(b.x,x.x)&&(w.x=Sa(b.x,x.x,f,g)),Da(b.y,x.y)&&(w.y=Sa(b.y,x.y,f,g)),e.emit("pan"));var k=o.startZoom,C=o.zoom,S=null!=C&&r;S&&(Da(k,C)&&(a.zoom=pt(a.minZoom,Sa(k,C,f,g),a.maxZoom)),e.emit("zoom")),(E||S)&&e.emit("viewport");var P=o.style;if(P&&P.length>0&&i){for(var D=0;D=0;t--){(0,e[t])()}e.splice(0,e.length)},d=a.length-1;d>=0;d--){var h=a[d],p=h._private;p.stopped?(a.splice(d,1),p.hooked=!1,p.playing=!1,p.started=!1,c(p.frames)):(p.playing||p.applying)&&(p.playing&&p.applying&&(p.applying=!1),p.started||Ta(0,h,e),Pa(t,h,e,n),p.applying&&(p.applying=!1),c(p.frames),null!=p.step&&p.step(e),h.completed()&&(a.splice(d,1),p.hooked=!1,p.playing=!1,p.started=!1,c(p.completes)),s=!0)}return n||0!==a.length||0!==o.length||r.push(t),s}for(var a=!1,o=0;o0?t.notify("draw",n):t.notify("draw")),n.unmerge(r),t.emit("step")}var Ba={animate:nr.animate(),animation:nr.animation(),animated:nr.animated(),clearQueue:nr.clearQueue(),delay:nr.delay(),delayAnimation:nr.delayAnimation(),stop:nr.stop(),addToAnimationPool:function(e){this.styleEnabled()&&this._private.aniEles.merge(e)},stopAnimationLoop:function(){this._private.animationsRunning=!1},startAnimationLoop:function(){var e=this;if(e._private.animationsRunning=!0,e.styleEnabled()){var t=e.renderer();t&&t.beforeRender?t.beforeRender(function(t,n){Ma(n,e)},t.beforeRenderPriorities.animations):function t(){e._private.animationsRunning&&se(function(n){Ma(n,e),t()})}()}}},_a={qualifierCompare:function(e,t){return null==e||null==t?null==e&&null==t:e.sameText(t)},eventMatches:function(e,t,n){var r=t.qualifier;return null==r||e!==n.target&&x(n.target)&&r.matches(n.target)},addEventFields:function(e,t){t.cy=e,t.target=e},callbackContext:function(e,t,n){return null!=t.qualifier?n.target:e}},Na=function(e){return p(e)?new Vr(e):e},za={createEmitter:function(){var e=this._private;return e.emitter||(e.emitter=new Ii(_a,this)),this},emitter:function(){return this._private.emitter},on:function(e,t,n){return this.emitter().on(e,Na(t),n),this},removeListener:function(e,t,n){return this.emitter().removeListener(e,Na(t),n),this},removeAllListeners:function(){return this.emitter().removeAllListeners(),this},one:function(e,t,n){return this.emitter().one(e,Na(t),n),this},once:function(e,t,n){return this.emitter().one(e,Na(t),n),this},emit:function(e,t){return this.emitter().emit(e,t),this},emitAndNotify:function(e,t){return this.emit(e),this.notify(e,t),this}};nr.eventAliasesOn(za);var Ia={png:function(e){return e=e||{},this._private.renderer.png(e)},jpg:function(e){var t=this._private.renderer;return(e=e||{}).bg=e.bg||"#fff",t.jpg(e)}};Ia.jpeg=Ia.jpg;var La={layout:function(e){if(null!=e)if(null!=e.name){var t=e.name,n=this.extension("layout",t);if(null!=n){var r;r=p(e.eles)?this.$(e.eles):null!=e.eles?e.eles:this.$();var i=new n(I({},e,{cy:this,eles:r}));return i}ke("No such layout `"+t+"` found. Did you forget to import it and `cytoscape.use()` it?")}else ke("A `name` must be specified to make a layout");else ke("Layout options must be specified to make a layout")}};La.createLayout=La.makeLayout=La.layout;var Aa={notify:function(e,t){var n=this._private;if(this.batching()){n.batchNotifications=n.batchNotifications||{};var r=n.batchNotifications[e]=n.batchNotifications[e]||this.collection();null!=t&&r.merge(t)}else if(n.notificationsEnabled){var i=this.renderer();!this.destroyed()&&i&&i.notify(e,t)}},notifications:function(e){var t=this._private;return void 0===e?t.notificationsEnabled:(t.notificationsEnabled=!!e,this)},noNotifications:function(e){this.notifications(!1),e(),this.notifications(!0)},batching:function(){return this._private.batchCount>0},startBatch:function(){var e=this._private;return null==e.batchCount&&(e.batchCount=0),0===e.batchCount&&(e.batchStyleEles=this.collection(),e.batchNotifications={}),e.batchCount++,this},endBatch:function(){var e=this._private;if(0===e.batchCount)return this;if(e.batchCount--,0===e.batchCount){e.batchStyleEles.updateStyle();var t=this.renderer();Object.keys(e.batchNotifications).forEach(function(n){var r=e.batchNotifications[n];r.empty()?t.notify(n):t.notify(n,r)})}return this},batch:function(e){return this.startBatch(),e(),this.endBatch(),this},batchData:function(e){var t=this;return this.batch(function(){for(var n=Object.keys(e),r=0;r0;)e.removeChild(e.childNodes[0]);this._private.renderer=null,this.mutableElements().forEach(function(e){var t=e._private;t.rscratch={},t.rstyle={},t.animation.current=[],t.animation.queue=[]})},onRender:function(e){return this.on("render",e)},offRender:function(e){return this.off("render",e)}};Ra.invalidateDimensions=Ra.resize;var Va={collection:function(e,t){return p(e)?this.$(e):b(e)?e.collection():g(e)?new va(this,e,t):new va(this)},nodes:function(e){var t=this.$(function(e){return e.isNode()});return e?t.filter(e):t},edges:function(e){var t=this.$(function(e){return e.isEdge()});return e?t.filter(e):t},$:function(e){var t=this._private.elements;return e?t.filter(e):t.spawnSelf()},mutableElements:function(){return this._private.elements}};Va.elements=Va.filter=Va.$;var Fa={};Fa.apply=function(e){var t=this._private,n=t.cy.collection();t.newStyle&&(t.contextStyles={},t.propDiffs={},this.cleanElements(e,!0));for(var r=0;r0;if(d||c&&h){var p=void 0;d&&h?p=l.properties:d?p=l.properties:h&&(p=l.mappedProperties);for(var f=0;f1&&(g=1),s.color){var w=i.valueMin[0],E=i.valueMax[0],k=i.valueMin[1],C=i.valueMax[1],S=i.valueMin[2],P=i.valueMax[2],D=null==i.valueMin[3]?1:i.valueMin[3],T=null==i.valueMax[3]?1:i.valueMax[3],M=[Math.round(w+(E-w)*g),Math.round(k+(C-k)*g),Math.round(S+(P-S)*g),Math.round(D+(T-D)*g)];n={bypass:i.bypass,name:i.name,value:M,strValue:"rgb("+M[0]+", "+M[1]+", "+M[2]+")"}}else{if(!s.number)return!1;var B=i.valueMin+(i.valueMax-i.valueMin)*g;n=this.parse(i.name,B,i.bypass,"mapping")}if(!n)return f(),!1;n.mapping=i,i=n;break;case o.data:for(var _=i.field.split("."),N=d.data,z=0;z<_.length&&N;z++){N=N[_[z]]}if(null!=N&&(n=this.parse(i.name,N,i.bypass,"mapping")),!n)return f(),!1;n.mapping=i,i=n;break;case o.fn:var I=i.value,L=null!=i.fnValue?i.fnValue:I(e);if(i.prevFnValue=L,null==L)return Se("Custom function mappers may not return null (i.e. `"+i.name+"` for ele `"+e.id()+"` is null)"),!1;if(!(n=this.parse(i.name,L,i.bypass,"mapping")))return Se("Custom function mappers may not return invalid values for the property type (i.e. `"+i.name+"` for ele `"+e.id()+"` is invalid)"),!1;n.mapping=Pe(i),i=n;break;case void 0:break;default:return!1}return l?(i.bypassed=c?u.bypassed:u,a[i.name]=i):c?u.bypassed=i:a[i.name]=i,p(),!0},Fa.cleanElements=function(e,t){for(var n=0;n0&&a>0){for(var s={},l=!1,u=0;u0?e.delayAnimation(o).play().promise().then(t):t()}).then(function(){return e.animation({style:s,duration:a,easing:e.pstyle("transition-timing-function").value,queue:!1}).play().promise()}).then(function(){n.removeBypasses(e,i),e.emitAndNotify("style"),r.transitioning=!1})}else r.transitioning&&(this.removeBypasses(e,i),e.emitAndNotify("style"),r.transitioning=!1)},Fa.checkTrigger=function(e,t,n,r,i,a){var o=this.properties[t],s=i(o);null!=s&&s(n,r)&&a(o)},Fa.checkZOrderTrigger=function(e,t,n,r){var i=this;this.checkTrigger(e,t,n,r,function(e){return e.triggersZOrder},function(){i._private.cy.notify("zorder",e)})},Fa.checkBoundsTrigger=function(e,t,n,r){this.checkTrigger(e,t,n,r,function(e){return e.triggersBounds},function(i){e.dirtyCompoundBoundsCache(),e.dirtyBoundingBoxCache(),"bezier"!==e.pstyle("curve-style").value&&("curve-style"!==t||"bezier"!==n&&"bezier"!==r)||!i.triggersBoundsOfParallelBeziers||e.parallelEdges().forEach(function(e){e.isBundledBezier()&&e.dirtyBoundingBoxCache()})})},Fa.checkTriggers=function(e,t,n,r){e.dirtyStyleCache(),this.checkZOrderTrigger(e,t,n,r),this.checkBoundsTrigger(e,t,n,r)};var qa={applyBypass:function(e,t,n,r){var i=[];if("*"===t||"**"===t){if(void 0!==n)for(var a=0;at.length?i.substr(t.length):""}function o(){n=n.length>r.length?n.substr(r.length):""}for(i=i.replace(/[/][*](\s|.)+?[*][/]/g,"");;){if(i.match(/^\s*$/))break;var s=i.match(/^\s*((?:.|\s)+?)\s*\{((?:.|\s)+?)\}/);if(!s){Se("Halting stylesheet parsing: String stylesheet contains more to parse but no selector and block found in: "+i);break}t=s[0];var l=s[1];if("core"!==l)if(new Vr(l).invalid){Se("Skipping parsing of block: Invalid selector found in string stylesheet: "+l),a();continue}var u=s[2],c=!1;n=u;for(var d=[];;){if(n.match(/^\s*$/))break;var h=n.match(/^\s*(.+?)\s*:\s*(.+?)\s*;/);if(!h){Se("Skipping parsing of block: Invalid formatting of style property and value definitions found in:"+u),c=!0;break}r=h[0];var p=h[1],f=h[2];if(this.properties[p])this.parse(p,f)?(d.push({name:p,val:f}),o()):(Se("Skipping property: Invalid property definition in: "+r),o());else Se("Skipping property: Invalid property name in: "+r),o()}if(c){a();break}this.selector(l);for(var g=0;g=7&&"d"===t[0]&&(l=new RegExp(o.data.regex).exec(t))){if(n)return!1;var d=o.data;return{name:e,value:l,strValue:""+t,mapped:d,field:l[1],bypass:n}}if(t.length>=10&&"m"===t[0]&&(u=new RegExp(o.mapData.regex).exec(t))){if(n)return!1;if(c.multiple)return!1;var h=o.mapData;if(!c.color&&!c.number)return!1;var v=this.parse(e,u[4]);if(!v||v.mapped)return!1;var m=this.parse(e,u[5]);if(!m||m.mapped)return!1;if(v.pfValue===m.pfValue||v.strValue===m.strValue)return Se("`"+e+": "+t+"` is not a valid mapper because the output range is zero; converting to `"+e+": "+v.strValue+"`"),this.parse(e,v.strValue);if(c.color){var b=v.value,x=m.value;if(!(b[0]!==x[0]||b[1]!==x[1]||b[2]!==x[2]||b[3]!==x[3]&&(null!=b[3]&&1!==b[3]||null!=x[3]&&1!==x[3])))return!1}return{name:e,value:u,strValue:""+t,mapped:h,field:u[1],fieldMin:parseFloat(u[2]),fieldMax:parseFloat(u[3]),valueMin:v.value,valueMax:m.value,bypass:n}}}if(c.multiple&&"multiple"!==r){var w;if(w=s?t.split(/\s+/):g(t)?t:[t],c.evenMultiple&&w.length%2!=0)return null;for(var E=[],k=[],C=[],S="",P=!1,D=0;D0?" ":"")+M.strValue}return c.validate&&!c.validate(E,k)?null:c.singleEnum&&P?1===E.length&&p(E[0])?{name:e,value:E[0],strValue:E[0],bypass:n}:null:{name:e,value:E,pfValue:C,strValue:S,bypass:n,units:k}}var B,_,z=function(){for(var r=0;rc.max||c.strictMax&&t===c.max))return null;var V={name:e,value:t,strValue:""+t+(I||""),units:I,bypass:n};return c.unitless||"px"!==I&&"em"!==I?V.pfValue=t:V.pfValue="px"!==I&&I?this.getEmSizeInPixels()*t:t,"ms"!==I&&"s"!==I||(V.pfValue="ms"===I?t:1e3*t),"deg"!==I&&"rad"!==I||(V.pfValue="rad"===I?t:(B=t,Math.PI*B/180)),"%"===I&&(V.pfValue=t/100),V}if(c.propList){var F=[],q=""+t;if("none"===q);else{for(var j=q.split(/\s*,\s*|\s+/),Y=0;Y0&&l>0&&!isNaN(n.w)&&!isNaN(n.h)&&n.w>0&&n.h>0)return{zoom:o=(o=(o=Math.min((s-2*t)/n.w,(l-2*t)/n.h))>this._private.maxZoom?this._private.maxZoom:o)=n.minZoom&&(n.maxZoom=t),this},minZoom:function(e){return void 0===e?this._private.minZoom:this.zoomRange({min:e})},maxZoom:function(e){return void 0===e?this._private.maxZoom:this.zoomRange({max:e})},getZoomedViewport:function(e){var t,n,r=this._private,i=r.pan,a=r.zoom,o=!1;if(r.zoomingEnabled||(o=!0),y(e)?n=e:v(e)&&(n=e.level,null!=e.position?t=nt(e.position,a,i):null!=e.renderedPosition&&(t=e.renderedPosition),null==t||r.panningEnabled||(o=!0)),n=(n=n>r.maxZoom?r.maxZoom:n)t.maxZoom||!t.zoomingEnabled?a=!0:(t.zoom=s,i.push("zoom"))}if(r&&(!a||!e.cancelOnFailedZoom)&&t.panningEnabled){var l=e.pan;y(l.x)&&(t.pan.x=l.x,o=!1),y(l.y)&&(t.pan.y=l.y,o=!1),o||i.push("pan")}return i.length>0&&(i.push("viewport"),this.emit(i.join(" ")),this.notify("viewport")),this},center:function(e){var t=this.getCenterPan(e);return t&&(this._private.pan=t,this.emit("pan viewport"),this.notify("viewport")),this},getCenterPan:function(e,t){if(this._private.panningEnabled){if(p(e)){var n=e;e=this.mutableElements().filter(n)}else b(e)||(e=this.mutableElements());if(0!==e.length){var r=e.boundingBox(),i=this.width(),a=this.height();return{x:(i-(t=void 0===t?this._private.zoom:t)*(r.x1+r.x2))/2,y:(a-t*(r.y1+r.y2))/2}}}},reset:function(){return this._private.panningEnabled&&this._private.zoomingEnabled?(this.viewport({pan:{x:0,y:0},zoom:1}),this):this},invalidateSize:function(){this._private.sizeCache=null},size:function(){var e,t,n=this._private,r=n.container;return n.sizeCache=n.sizeCache||(r?(e=o.getComputedStyle(r),t=function(t){return parseFloat(e.getPropertyValue(t))},{width:r.clientWidth-t("padding-left")-t("padding-right"),height:r.clientHeight-t("padding-top")-t("padding-bottom")}):{width:1,height:1})},width:function(){return this.size().width},height:function(){return this.size().height},extent:function(){var e=this._private.pan,t=this._private.zoom,n=this.renderedExtent(),r={x1:(n.x1-e.x)/t,x2:(n.x2-e.x)/t,y1:(n.y1-e.y)/t,y2:(n.y2-e.y)/t};return r.w=r.x2-r.x1,r.h=r.y2-r.y1,r},renderedExtent:function(){var e=this.width(),t=this.height();return{x1:0,y1:0,x2:e,y2:t,w:e,h:t}}};$a.centre=$a.center,$a.autolockNodes=$a.autolock,$a.autoungrabifyNodes=$a.autoungrabify;var Qa={data:nr.data({field:"data",bindingEvent:"data",allowBinding:!0,allowSetting:!0,settingEvent:"data",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0}),removeData:nr.removeData({field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!0}),scratch:nr.data({field:"scratch",bindingEvent:"scratch",allowBinding:!0,allowSetting:!0,settingEvent:"scratch",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0}),removeScratch:nr.removeData({field:"scratch",event:"scratch",triggerFnName:"trigger",triggerEvent:!0})};Qa.attr=Qa.data,Qa.removeAttr=Qa.removeData;var Ja=function(e){var t=this,n=(e=I({},e)).container;n&&!m(n)&&m(n[0])&&(n=n[0]);var r=n?n._cyreg:null;(r=r||{})&&r.cy&&(r.cy.destroy(),r={});var i=r.readies=r.readies||[];n&&(n._cyreg=r),r.cy=t;var a=void 0!==o&&void 0!==n&&!e.headless,s=e;s.layout=I({name:a?"grid":"null"},s.layout),s.renderer=I({name:a?"canvas":"null"},s.renderer);var l=function(e,t,n){return void 0!==t?t:void 0!==n?n:e},u=this._private={container:n,ready:!1,options:s,elements:new va(this),listeners:[],aniEles:new va(this),data:{},scratch:{},layout:null,renderer:null,destroyed:!1,notificationsEnabled:!0,minZoom:1e-50,maxZoom:1e50,zoomingEnabled:l(!0,s.zoomingEnabled),userZoomingEnabled:l(!0,s.userZoomingEnabled),panningEnabled:l(!0,s.panningEnabled),userPanningEnabled:l(!0,s.userPanningEnabled),boxSelectionEnabled:l(!0,s.boxSelectionEnabled),autolock:l(!1,s.autolock,s.autolockNodes),autoungrabify:l(!1,s.autoungrabify,s.autoungrabifyNodes),autounselectify:l(!1,s.autounselectify),styleEnabled:void 0===s.styleEnabled?a:s.styleEnabled,zoom:y(s.zoom)?s.zoom:1,pan:{x:v(s.pan)&&y(s.pan.x)?s.pan.x:0,y:v(s.pan)&&y(s.pan.y)?s.pan.y:0},animation:{current:[],queue:[]},hasCompoundNodes:!1};this.createEmitter(),this.selectionType(s.selectionType),this.zoomRange({min:s.minZoom,max:s.maxZoom});u.styleEnabled&&t.setStyle([]);var c=I({},s,s.renderer);t.initRenderer(c);!function(e,t){if(e.some(S))return Jn.all(e).then(t);t(e)}([s.style,s.elements],function(e){var n=e[0],a=e[1];u.styleEnabled&&t.style().append(n),function(e,n,r){t.notifications(!1);var i=t.mutableElements();i.length>0&&i.remove(),null!=e&&(v(e)||g(e))&&t.add(e),t.one("layoutready",function(e){t.notifications(!0),t.emit(e),t.one("load",n),t.emitAndNotify("load")}).one("layoutstop",function(){t.one("done",r),t.emit("done")});var a=I({},t._private.options.layout);a.eles=t.elements(),t.layout(a).run()}(a,function(){t.startAnimationLoop(),u.ready=!0,f(s.ready)&&t.on("ready",s.ready);for(var e=0;e0,u=ft(n.boundingBox?n.boundingBox:{x1:0,y1:0,w:r.width(),h:r.height()});if(b(n.roots))e=n.roots;else if(g(n.roots)){for(var c=[],d=0;d0;){var N=M.shift(),I=T(N,B);if(I)N.outgoers().filter(function(e){return e.isNode()&&i.has(e)}).forEach(_);else if(null===I){Se("Detected double maximal shift for node `"+N.id()+"`. Bailing maximal adjustment due to cycle. Use `options.maximal: true` only on DAGs.");break}}}D();var L=0;if(n.avoidOverlap)for(var A=0;A0&&x[0].length<=3?l/2:0),d=2*Math.PI/x[r].length*i;return 0===r&&1===x[0].length&&(c=1),{x:G+c*Math.cos(d),y:Z+c*Math.sin(d)}}return{x:G+(i+1-(a+1)/2)*o,y:(r+1)*s}}),this};var ao={fit:!0,padding:30,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,spacingFactor:void 0,radius:void 0,startAngle:1.5*Math.PI,sweep:void 0,clockwise:!0,sort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(e,t){return!0},ready:void 0,stop:void 0,transform:function(e,t){return t}};function oo(e){this.options=I({},ao,e)}oo.prototype.run=function(){var e=this.options,t=e,n=e.cy,r=t.eles,i=void 0!==t.counterclockwise?!t.counterclockwise:t.clockwise,a=r.nodes().not(":parent");t.sort&&(a=a.sort(t.sort));for(var o,s=ft(t.boundingBox?t.boundingBox:{x1:0,y1:0,w:n.width(),h:n.height()}),l=s.x1+s.w/2,u=s.y1+s.h/2,c=(void 0===t.sweep?2*Math.PI-2*Math.PI/a.length:t.sweep)/Math.max(1,a.length-1),d=0,h=0;h1&&t.avoidOverlap){d*=1.75;var v=Math.cos(c)-Math.cos(0),m=Math.sin(c)-Math.sin(0),b=Math.sqrt(d*d/(v*v+m*m));o=Math.max(b,o)}return a.layoutPositions(this,t,function(e,n){var r=t.startAngle+n*c*(i?1:-1),a=o*Math.cos(r),s=o*Math.sin(r);return{x:l+a,y:u+s}}),this};var so,lo={fit:!0,padding:30,startAngle:1.5*Math.PI,sweep:void 0,clockwise:!0,equidistant:!1,minNodeSpacing:10,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,height:void 0,width:void 0,spacingFactor:void 0,concentric:function(e){return e.degree()},levelWidth:function(e){return e.maxDegree()/4},animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(e,t){return!0},ready:void 0,stop:void 0,transform:function(e,t){return t}};function uo(e){this.options=I({},lo,e)}uo.prototype.run=function(){for(var e=this.options,t=e,n=void 0!==t.counterclockwise?!t.counterclockwise:t.clockwise,r=e.cy,i=t.eles.nodes().not(":parent"),a=ft(t.boundingBox?t.boundingBox:{x1:0,y1:0,w:r.width(),h:r.height()}),o=a.x1+a.w/2,s=a.y1+a.h/2,l=[],u=0,c=0;c0)Math.abs(y[0].value-b.value)>=g&&(y=[],v.push(y));y.push(b)}var x=u+t.minNodeSpacing;if(!t.avoidOverlap){var w=v.length>0&&v[0].length>1,E=(Math.min(a.w,a.h)/2-x)/(v.length+w?1:0);x=Math.min(x,E)}for(var k=0,C=0;C1&&t.avoidOverlap){var T=Math.cos(D)-Math.cos(0),M=Math.sin(D)-Math.sin(0),B=Math.sqrt(x*x/(T*T+M*M));k=Math.max(B,k)}S.r=k,k+=x}if(t.equidistant){for(var _=0,N=0,z=0;z=e.numIter)&&(bo(r,e),r.temperature=r.temperature*e.coolingFactor,!(r.temperature=e.animationThreshold&&a(),se(t)):(_o(r,e),s())}()}else{for(;u;)u=o(l),l++;_o(r,e),s()}return this},ho.prototype.stop=function(){return this.stopped=!0,this.thread&&this.thread.stop(),this.emit("layoutstop"),this},ho.prototype.destroy=function(){return this.thread&&this.thread.stop(),this};var po=function(e,t,n){for(var r=n.eles.edges(),i=n.eles.nodes(),a={isCompound:e.hasCompoundNodes(),layoutNodes:[],idToIndex:{},nodeSize:i.size(),graphSet:[],indexToGraph:[],layoutEdges:[],edgeSize:r.size(),temperature:n.initialTemp,clientWidth:e.width(),clientHeight:e.width(),boundingBox:ft(n.boundingBox?n.boundingBox:{x1:0,y1:0,w:e.width(),h:e.height()})},o=n.eles.components(),s={},l=0;l0){a.graphSet.push(w);for(l=0;lr.count?0:r.graph},go=function e(t,n,r,i){var a=i.graphSet[r];if(-10)var s=(u=r.nodeOverlap*o)*i/(g=Math.sqrt(i*i+a*a)),l=u*a/g;else{var u,c=Co(e,i,a),d=Co(t,-1*i,-1*a),h=d.x-c.x,p=d.y-c.y,f=h*h+p*p,g=Math.sqrt(f);s=(u=(e.nodeRepulsion+t.nodeRepulsion)/f)*h/g,l=u*p/g}e.isLocked||(e.offsetX-=s,e.offsetY-=l),t.isLocked||(t.offsetX+=s,t.offsetY+=l)}},ko=function(e,t,n,r){if(n>0)var i=e.maxX-t.minX;else i=t.maxX-e.minX;if(r>0)var a=e.maxY-t.minY;else a=t.maxY-e.minY;return i>=0&&a>=0?Math.sqrt(i*i+a*a):0},Co=function(e,t,n){var r=e.positionX,i=e.positionY,a=e.height||1,o=e.width||1,s=n/t,l=a/o,u={};return 0===t&&0n?(u.x=r,u.y=i+a/2,u):0t&&-1*l<=s&&s<=l?(u.x=r-o/2,u.y=i-o*n/2/t,u):0=l)?(u.x=r+a*t/2/n,u.y=i+a/2,u):0>n&&(s<=-1*l||s>=l)?(u.x=r-a*t/2/n,u.y=i-a/2,u):u},So=function(e,t){for(var n=0;n1){var f=t.gravity*d/p,g=t.gravity*h/p;c.offsetX+=f,c.offsetY+=g}}}}},Do=function(e,t){var n=[],r=0,i=-1;for(n.push.apply(n,e.graphSet[0]),i+=e.graphSet[0].length;r<=i;){var a=n[r++],o=e.idToIndex[a],s=e.layoutNodes[o],l=s.children;if(0n)var i={x:n*e/r,y:n*t/r};else i={x:e,y:t};return i},Bo=function e(t,n){var r=t.parentId;if(null!=r){var i=n.layoutNodes[n.idToIndex[r]],a=!1;return(null==i.maxX||t.maxX+i.padRight>i.maxX)&&(i.maxX=t.maxX+i.padRight,a=!0),(null==i.minX||t.minX-i.padLefti.maxY)&&(i.maxY=t.maxY+i.padBottom,a=!0),(null==i.minY||t.minY-i.padTopf&&(d+=p+t.componentSpacing,c=0,h=0,p=0)}}},No={fit:!0,padding:30,boundingBox:void 0,avoidOverlap:!0,avoidOverlapPadding:10,nodeDimensionsIncludeLabels:!1,spacingFactor:void 0,condense:!1,rows:void 0,cols:void 0,position:function(e){},sort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(e,t){return!0},ready:void 0,stop:void 0,transform:function(e,t){return t}};function zo(e){this.options=I({},No,e)}zo.prototype.run=function(){var e=this.options,t=e,n=e.cy,r=t.eles.nodes().not(":parent");t.sort&&(r=r.sort(t.sort));var i=ft(t.boundingBox?t.boundingBox:{x1:0,y1:0,w:n.width(),h:n.height()});if(0===i.h||0===i.w)r.layoutPositions(this,t,function(e){return{x:i.x1,y:i.y1}});else{var a=r.size(),o=Math.sqrt(a*i.h/i.w),s=Math.round(o),l=Math.round(i.w/i.h*o),u=function(e){if(null==e)return Math.min(s,l);Math.min(s,l)==s?s=e:l=e},c=function(e){if(null==e)return Math.max(s,l);Math.max(s,l)==s?s=e:l=e},d=t.rows,h=null!=t.cols?t.cols:t.columns;if(null!=d&&null!=h)s=d,l=h;else if(null!=d&&null==h)s=d,l=Math.ceil(a/s);else if(null==d&&null!=h)l=h,s=Math.ceil(a/l);else if(l*s>a){var p=u(),f=c();(p-1)*f>=a?u(p-1):(f-1)*p>=a&&c(f-1)}else for(;l*s=a?c(v+1):u(g+1)}var y=i.w/l,m=i.h/s;if(t.condense&&(y=0,m=0),t.avoidOverlap)for(var b=0;b=l&&(B=0,M++)},N={},z=0;z(r=Dt(e,t,x[w],x[w+1],x[w+2],x[w+3])))return v(n,r),!0}else if("bezier"===a.edgeType||"multibezier"===a.edgeType||"self"===a.edgeType||"compound"===a.edgeType)for(x=a.allpts,w=0;w+5(r=Pt(e,t,x[w],x[w+1],x[w+2],x[w+3],x[w+4],x[w+5])))return v(n,r),!0;m=m||i.source,b=b||i.target;var E=o.getArrowWidth(l,c),k=[{name:"source",x:a.arrowStartX,y:a.arrowStartY,angle:a.srcArrowAngle},{name:"target",x:a.arrowEndX,y:a.arrowEndY,angle:a.tgtArrowAngle},{name:"mid-source",x:a.midX,y:a.midY,angle:a.midsrcArrowAngle},{name:"mid-target",x:a.midX,y:a.midY,angle:a.midtgtArrowAngle}];for(w=0;w0&&(y(m),y(b))}function b(e,t,n){return ze(e,t,n)}function x(n,r){var i,a=n._private,o=f;i=r?r+"-":"",n.boundingBox();var s=a.labelBounds[r||"main"],l=n.pstyle(i+"label").value;if("yes"===n.pstyle("text-events").strValue&&l){var u=a.rstyle,c=b(u,"labelX",r),d=b(u,"labelY",r),h=b(a.rscratch,"labelAngle",r),p=s.x1-o,g=s.x2+o,y=s.y1-o,m=s.y2+o;if(h){var x=Math.cos(h),w=Math.sin(h),E=function(e,t){return{x:(e-=c)*x-(t-=d)*w+c,y:e*w+t*x+d}},k=E(p,y),C=E(p,m),S=E(g,y),P=E(g,m),D=[k.x,k.y,S.x,S.y,P.x,P.y,C.x,C.y];if(Tt(e,t,D))return v(n),!0}else if(wt(s,e,t))return v(n),!0}}n&&(l=l.interactive);for(var w=l.length-1;w>=0;w--){var E=l[w];E.isNode()?y(E)||x(E):m(E)||x(E)||x(E,"source")||x(E,"target")}return u},getAllInBox:function(e,t,n,r){for(var i,a,o=this.getCachedZSortedEles().interactive,s=[],l=Math.min(e,n),u=Math.max(e,n),c=Math.min(t,r),d=Math.max(t,r),h=ft({x1:e=l,y1:t=c,x2:n=u,y2:r=d}),p=0;p0?Math.max(e-t,0):Math.min(e+t,0)},x=b(y,g),w=b(m,v),E=!1;"auto"===u?u=Math.abs(x)>Math.abs(w)?"horizontal":"vertical":"upward"===u||"downward"===u?(u="vertical",E=!0):"leftward"!==u&&"rightward"!==u||(u="horizontal",E=!0);var k="vertical"===u,C=k?w:x,S=k?m:y,P=st(S),D=!1;E&&f||!("downward"===c&&S<0||"upward"===c&&S>0||"leftward"===c&&S>0||"rightward"===c&&S<0)||(C=(P*=-1)*Math.abs(C),D=!0);var T=f?h*C:h*P,M=function(e){return Math.abs(e)=Math.abs(C)},B=M(T),_=M(C-T);if((B||_)&&!D)if(k){var N=Math.abs(S)<=a/2,z=Math.abs(y)<=o/2;if(N){var I=(r.x1+r.x2)/2,L=r.y1,A=r.y2;n.segpts=[I,L,I,A]}else if(z){var O=(r.y1+r.y2)/2,R=r.x1,V=r.x2;n.segpts=[R,O,V,O]}else n.segpts=[r.x1,r.y2]}else{var F=Math.abs(S)<=i/2,q=Math.abs(m)<=s/2;if(F){var j=(r.y1+r.y2)/2,Y=r.x1,X=r.x2;n.segpts=[Y,j,X,j]}else if(q){var W=(r.x1+r.x2)/2,H=r.y1,K=r.y2;n.segpts=[W,H,W,K]}else n.segpts=[r.x2,r.y1]}else if(k){var G=r.y1+T+(l?a/2*P:0),Z=r.x1,U=r.x2;n.segpts=[Z,G,U,G]}else{var $=r.x1+T+(l?i/2*P:0),Q=r.y1,J=r.y2;n.segpts=[$,Q,$,J]}},Ko.tryToCorrectInvalidPoints=function(e,t){var n=e._private.rscratch;if("bezier"===n.edgeType){var r=t.srcPos,i=t.tgtPos,a=t.srcW,o=t.srcH,s=t.tgtW,l=t.tgtH,u=t.srcShape,c=t.tgtShape,d=!y(n.startX)||!y(n.startY),h=!y(n.arrowStartX)||!y(n.arrowStartY),p=!y(n.endX)||!y(n.endY),f=!y(n.arrowEndX)||!y(n.arrowEndY),g=3*(this.getArrowWidth(e.pstyle("width").pfValue,e.pstyle("arrow-scale").value)*this.arrowShapeWidth),v=lt({x:n.ctrlpts[0],y:n.ctrlpts[1]},{x:n.startX,y:n.startY}),m=vh.poolIndex()){var p=d;d=h,h=p}var f=s.srcPos=d.position(),g=s.tgtPos=h.position(),v=s.srcW=d.outerWidth(),m=s.srcH=d.outerHeight(),b=s.tgtW=h.outerWidth(),x=s.tgtH=h.outerHeight(),w=s.srcShape=n.nodeShapes[t.getNodeShape(d)],E=s.tgtShape=n.nodeShapes[t.getNodeShape(h)];s.dirCounts={north:0,west:0,south:0,east:0,northwest:0,southwest:0,northeast:0,southeast:0};for(var k=0;k0){var j=u,Y=ut(j,it(t)),X=ut(j,it(q)),W=Y;if(X2)ut(j,{x:q[2],y:q[3]})0){var ie=c,ae=ut(ie,it(t)),oe=ut(ie,it(re)),se=ae;if(oe2)ut(ie,{x:re[2],y:re[3]})=c||b){d={cp:v,segment:m};break}}if(d)break}var x=d.cp,w=d.segment,E=(c-p)/w.length,k=w.t1-w.t0,C=u?w.t0+k*E:w.t1-k*E;C=pt(0,C,1),t=ht(x.p0,x.p1,x.p2,C),l=function(e,t,n,r){var i=pt(0,r-.001,1),a=pt(0,r+.001,1),o=ht(e,t,n,i),s=ht(e,t,n,a);return es(o,s)}(x.p0,x.p1,x.p2,C);break;case"straight":case"segments":case"haystack":for(var S,P,D,T,M=0,B=r.allpts.length,_=0;_+3=c));_+=2);var N=(c-P)/S;N=pt(0,N,1),t=function(e,t,n,r){var i=t.x-e.x,a=t.y-e.y,o=lt(e,t),s=i/o,l=a/o;return n=null==n?0:n,r=null!=r?r:n*o,{x:e.x+s*r,y:e.y+l*r}}(D,T,N),l=es(D,T)}o("labelX",s,t.x),o("labelY",s,t.y),o("labelAutoAngle",s,l)}};l("source"),l("target"),this.applyLabelDimensions(e)}},Qo.applyLabelDimensions=function(e){this.applyPrefixedLabelDimensions(e),e.isEdge()&&(this.applyPrefixedLabelDimensions(e,"source"),this.applyPrefixedLabelDimensions(e,"target"))},Qo.applyPrefixedLabelDimensions=function(e,t){var n=e._private,r=this.getLabelText(e,t),i=this.calculateLabelDimensions(e,r),a=e.pstyle("line-height").pfValue,o=e.pstyle("text-wrap").strValue,s=ze(n.rscratch,"labelWrapCachedLines",t)||[],l="wrap"!==o?1:Math.max(s.length,1),u=i.height/l,c=u*a,d=i.width,h=i.height+(l-1)*(a-1)*u;Ie(n.rstyle,"labelWidth",t,d),Ie(n.rscratch,"labelWidth",t,d),Ie(n.rstyle,"labelHeight",t,h),Ie(n.rscratch,"labelHeight",t,h),Ie(n.rscratch,"labelLineHeight",t,c)},Qo.getLabelText=function(e,t){var n=e._private,r=t?t+"-":"",i=e.pstyle(r+"label").strValue,a=e.pstyle("text-transform").value,o=function(e,r){return r?(Ie(n.rscratch,e,t,r),r):ze(n.rscratch,e,t)};if(!i)return"";"none"==a||("uppercase"==a?i=i.toUpperCase():"lowercase"==a&&(i=i.toLowerCase()));var s=e.pstyle("text-wrap").value;if("wrap"===s){var l=o("labelKey");if(null!=l&&o("labelWrapKey")===l)return o("labelWrapCachedText");for(var u=i.split("\n"),c=e.pstyle("text-max-width").pfValue,d="anywhere"===e.pstyle("text-overflow-wrap").value,h=[],p=/[\s\u200b]+/,f=d?"":" ",g=0;gc){for(var b=v.split(p),x="",w=0;wC)break;S+=i[D],D===i.length-1&&(P=!0)}return P||(S+="…"),S}return i},Qo.getLabelJustification=function(e){var t=e.pstyle("text-justification").strValue,n=e.pstyle("text-halign").strValue;if("auto"!==t)return t;if(!e.isNode())return"center";switch(n){case"left":return"right";case"right":return"left";default:return"center"}},Qo.calculateLabelDimensions=function(e,t){var n=he(t,e._private.labelDimsKey),r=this.labelDimCache||(this.labelDimCache=[]),i=r[n];if(null!=i)return i;var a=e.pstyle("font-style").strValue,o=1*e.pstyle("font-size").pfValue+"px",s=e.pstyle("font-family").strValue,l=e.pstyle("font-weight").strValue,u=this.labelCalcDiv;u||(u=this.labelCalcDiv=document.createElement("div"),document.body.appendChild(u));var c=u.style;return c.fontFamily=s,c.fontStyle=a,c.fontSize=o,c.fontWeight=l,c.position="absolute",c.left="-9999px",c.top="-9999px",c.zIndex="-1",c.visibility="hidden",c.pointerEvents="none",c.padding="0",c.lineHeight="1",c.whiteSpace="pre",u.textContent=t,r[n]={width:Math.ceil(u.clientWidth/1),height:Math.ceil(u.clientHeight/1)}},Qo.calculateLabelAngle=function(e,t){var n=e._private.rscratch,r=e.isEdge(),i=t?t+"-":"",a=e.pstyle(i+"text-rotation"),o=a.strValue;return"none"===o?0:r&&"autorotate"===o?n.labelAutoAngle:"autorotate"===o?0:a.pfValue},Qo.calculateLabelAngles=function(e){var t=this,n=e.isEdge(),r=e._private.rscratch;r.labelAngle=t.calculateLabelAngle(e),n&&(r.sourceLabelAngle=t.calculateLabelAngle(e,"source"),r.targetLabelAngle=t.calculateLabelAngle(e,"target"))};var ts={},ns=!1;ts.getNodeShape=function(e){var t=e.pstyle("shape").value;if("cutrectangle"===t&&(e.width()<28||e.height()<28))return ns||(Se("The `cutrectangle` node shape can not be used at small sizes so `rectangle` is used instead"),ns=!0),"rectangle";if(e.isParent())return"rectangle"===t||"roundrectangle"===t||"cutrectangle"===t||"barrel"===t?t:"rectangle";if("polygon"===t){var n=e.pstyle("shape-polygon-points").value;return this.nodeShapes.makePolygon(n).name}return t};var rs={registerCalculationListeners:function(){var e=this.cy,t=e.collection(),n=this,r=function(e){var n=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(t.merge(e),n)for(var r=0;r=e.desktopTapThreshold2}var D=r(t);v&&(e.hoverData.tapholdCancelled=!0);a=!0,n(g,["mousemove","vmousemove","tapdrag"],t,{x:d[0],y:d[1]});var T=function(){e.data.bgActivePosistion=void 0,e.hoverData.selecting||o.emit({originalEvent:t,type:"boxstart",position:{x:d[0],y:d[1]}}),f[4]=1,e.hoverData.selecting=!0,e.redrawHint("select",!0),e.redraw()};if(3===e.hoverData.which){if(v){var M={originalEvent:t,type:"cxtdrag",position:{x:d[0],y:d[1]}};x?x.emit(M):o.emit(M),e.hoverData.cxtDragged=!0,e.hoverData.cxtOver&&g===e.hoverData.cxtOver||(e.hoverData.cxtOver&&e.hoverData.cxtOver.emit({originalEvent:t,type:"cxtdragout",position:{x:d[0],y:d[1]}}),e.hoverData.cxtOver=g,g&&g.emit({originalEvent:t,type:"cxtdragover",position:{x:d[0],y:d[1]}}))}}else if(e.hoverData.dragging){if(a=!0,o.panningEnabled()&&o.userPanningEnabled()){var B;if(e.hoverData.justStartedPan){var _=e.hoverData.mdownPos;B={x:(d[0]-_[0])*s,y:(d[1]-_[1])*s},e.hoverData.justStartedPan=!1}else B={x:w[0]*s,y:w[1]*s};o.panBy(B),e.hoverData.dragged=!0}d=e.projectIntoViewport(t.clientX,t.clientY)}else if(1!=f[4]||null!=x&&!x.pannable()){if(x&&x.pannable()&&x.active()&&x.unactivate(),x&&x.grabbed()||g==b||(b&&n(b,["mouseout","tapdragout"],t,{x:d[0],y:d[1]}),g&&n(g,["mouseover","tapdragover"],t,{x:d[0],y:d[1]}),e.hoverData.last=g),x)if(v){if(o.boxSelectionEnabled()&&D)x&&x.grabbed()&&(c(E),x.emit("freeon"),E.emit("free"),e.dragData.didDrag&&(x.emit("dragfreeon"),E.emit("dragfree"))),T();else if(x&&x.grabbed()&&e.nodeIsDraggable(x)){var N=!e.dragData.didDrag;N&&e.redrawHint("eles",!0),e.dragData.didDrag=!0;var z=o.collection();e.hoverData.draggingEles||l(E,{inDragLayer:!0});var I={x:0,y:0};if(y(w[0])&&y(w[1])&&(I.x+=w[0],I.y+=w[1],N)){var L=e.hoverData.dragDelta;L&&y(L[0])&&y(L[1])&&(I.x+=L[0],I.y+=L[1])}for(var A=0;A0&&e.redrawHint("eles",!0),e.dragData.possibleDragElements=u=a.collection()),l!=d||e.dragData.didDrag||e.hoverData.selecting||null!=l&&l._private.selectable&&(e.hoverData.dragging||("additive"===a.selectionType()||h?l.selected()?l.unselect(["tapunselect"]):l.select(["tapselect"]):h||(a.$(t).unmerge(l).unselect(["tapunselect"]),l.select(["tapselect"]))),e.redrawHint("eles",!0)),e.hoverData.selecting){var g=a.collection(e.getAllInBox(s[0],s[1],s[2],s[3]));e.redrawHint("select",!0),g.length>0&&e.redrawHint("eles",!0),a.emit({type:"boxend",originalEvent:i,position:{x:o[0],y:o[1]}});var v=function(e){return e.selectable()&&!e.selected()};"additive"===a.selectionType()?g.emit("box").stdFilter(v).select().emit("boxselect"):(h||a.$(t).unmerge(g).unselect(),g.emit("box").stdFilter(v).select().emit("boxselect")),e.redraw()}if(e.hoverData.dragging&&(e.hoverData.dragging=!1,e.redrawHint("select",!0),e.redrawHint("eles",!0),e.redraw()),!s[4]){e.redrawHint("drag",!0),e.redrawHint("eles",!0);var y=d&&d.grabbed();c(u),y&&(d.emit("freeon"),u.emit("free"),e.dragData.didDrag&&(d.emit("dragfreeon"),u.emit("dragfree")))}}s[4]=0,e.hoverData.down=null,e.hoverData.cxtStarted=!1,e.hoverData.draggingEles=!1,e.hoverData.selecting=!1,e.hoverData.isOverThresholdDrag=!1,e.dragData.didDrag=!1,e.hoverData.dragged=!1,e.hoverData.dragDelta=[],e.hoverData.mdownPos=null,e.hoverData.mdownGPos=null}},!1);var b,x,w,E,k,C,S,P,D,T,M,B,_;e.registerBinding(e.container,"wheel",function(t){if(!e.scrollingPage){var n,r=e.cy,i=e.projectIntoViewport(t.clientX,t.clientY),a=[i[0]*r.zoom()+r.pan().x,i[1]*r.zoom()+r.pan().y];e.hoverData.draggingEles||e.hoverData.dragging||e.hoverData.cxtStarted||0!==e.selection[4]?t.preventDefault():r.panningEnabled()&&r.userPanningEnabled()&&r.zoomingEnabled()&&r.userZoomingEnabled()&&(t.preventDefault(),e.data.wheelZooming=!0,clearTimeout(e.data.wheelTimeout),e.data.wheelTimeout=setTimeout(function(){e.data.wheelZooming=!1,e.redrawHint("eles",!0),e.redraw()},150),n=null!=t.deltaY?t.deltaY/-250:null!=t.wheelDeltaY?t.wheelDeltaY/1e3:t.wheelDelta/1e3,n*=e.wheelSensitivity,1===t.deltaMode&&(n*=33),r.zoom({level:r.zoom()*Math.pow(10,n),renderedPosition:{x:a[0],y:a[1]}}))}},!0),e.registerBinding(window,"scroll",function(t){e.scrollingPage=!0,clearTimeout(e.scrollingPageTimeout),e.scrollingPageTimeout=setTimeout(function(){e.scrollingPage=!1},250)},!0),e.registerBinding(e.container,"mouseout",function(t){var n=e.projectIntoViewport(t.clientX,t.clientY);e.cy.emit({originalEvent:t,type:"mouseout",position:{x:n[0],y:n[1]}})},!1),e.registerBinding(e.container,"mouseover",function(t){var n=e.projectIntoViewport(t.clientX,t.clientY);e.cy.emit({originalEvent:t,type:"mouseover",position:{x:n[0],y:n[1]}})},!1);var N,z,I,L,A=function(e,t,n,r){return Math.sqrt((n-e)*(n-e)+(r-t)*(r-t))},O=function(e,t,n,r){return(n-e)*(n-e)+(r-t)*(r-t)};if(e.registerBinding(e.container,"touchstart",N=function(t){if(m(t)){h(),e.touchData.capture=!0,e.data.bgActivePosistion=void 0;var r=e.cy,i=e.touchData.now,a=e.touchData.earlier;if(t.touches[0]){var s=e.projectIntoViewport(t.touches[0].clientX,t.touches[0].clientY);i[0]=s[0],i[1]=s[1]}if(t.touches[1]){s=e.projectIntoViewport(t.touches[1].clientX,t.touches[1].clientY);i[2]=s[0],i[3]=s[1]}if(t.touches[2]){s=e.projectIntoViewport(t.touches[2].clientX,t.touches[2].clientY);i[4]=s[0],i[5]=s[1]}if(t.touches[1]){e.touchData.singleTouchMoved=!0,c(e.dragData.touchDragEles);var d=e.findContainerClientCoords();D=d[0],T=d[1],M=d[2],B=d[3],b=t.touches[0].clientX-D,x=t.touches[0].clientY-T,w=t.touches[1].clientX-D,E=t.touches[1].clientY-T,_=0<=b&&b<=M&&0<=w&&w<=M&&0<=x&&x<=B&&0<=E&&E<=B;var p=r.pan(),f=r.zoom();k=A(b,x,w,E),C=O(b,x,w,E),P=[((S=[(b+w)/2,(x+E)/2])[0]-p.x)/f,(S[1]-p.y)/f];if(C<4e4&&!t.touches[2]){var g=e.findNearestElement(i[0],i[1],!0,!0),v=e.findNearestElement(i[2],i[3],!0,!0);return g&&g.isNode()?(g.activate().emit({originalEvent:t,type:"cxttapstart",position:{x:i[0],y:i[1]}}),e.touchData.start=g):v&&v.isNode()?(v.activate().emit({originalEvent:t,type:"cxttapstart",position:{x:i[0],y:i[1]}}),e.touchData.start=v):r.emit({originalEvent:t,type:"cxttapstart",position:{x:i[0],y:i[1]}}),e.touchData.start&&(e.touchData.start._private.grabbed=!1),e.touchData.cxt=!0,e.touchData.cxtDragged=!1,e.data.bgActivePosistion=void 0,void e.redraw()}}if(t.touches[2])r.boxSelectionEnabled()&&t.preventDefault();else if(t.touches[1]);else if(t.touches[0]){var y=e.findNearestElements(i[0],i[1],!0,!0),N=y[0];if(null!=N&&(N.activate(),e.touchData.start=N,e.touchData.starts=y,e.nodeIsGrabbable(N))){var z=e.dragData.touchDragEles=r.collection(),I=null;e.redrawHint("eles",!0),e.redrawHint("drag",!0),N.selected()?(I=r.$(function(t){return t.selected()&&e.nodeIsGrabbable(t)}),l(I,{addToList:z})):u(N,{addToList:z}),o(N);var L=function(e){return{originalEvent:t,type:e,position:{x:i[0],y:i[1]}}};N.emit(L("grabon")),I?I.forEach(function(e){e.emit(L("grab"))}):N.emit(L("grab"))}n(N,["touchstart","tapstart","vmousedown"],t,{x:i[0],y:i[1]}),null==N&&(e.data.bgActivePosistion={x:s[0],y:s[1]},e.redrawHint("select",!0),e.redraw()),e.touchData.singleTouchMoved=!1,e.touchData.singleTouchStartTime=+new Date,clearTimeout(e.touchData.tapholdTimeout),e.touchData.tapholdTimeout=setTimeout(function(){!1!==e.touchData.singleTouchMoved||e.pinching||e.touchData.selecting||n(e.touchData.start,["taphold"],t,{x:i[0],y:i[1]})},e.tapholdDuration)}if(t.touches.length>=1){for(var R=e.touchData.startPosition=[],V=0;V=e.touchTapThreshold2}if(r&&e.touchData.cxt){t.preventDefault();var N=t.touches[0].clientX-D,z=t.touches[0].clientY-T,I=t.touches[1].clientX-D,L=t.touches[1].clientY-T,R=O(N,z,I,L);if(R/C>=2.25||R>=22500){e.touchData.cxt=!1,e.data.bgActivePosistion=void 0,e.redrawHint("select",!0);var V={originalEvent:t,type:"cxttapend",position:{x:s[0],y:s[1]}};e.touchData.start?(e.touchData.start.unactivate().emit(V),e.touchData.start=null):o.emit(V)}}if(r&&e.touchData.cxt){V={originalEvent:t,type:"cxtdrag",position:{x:s[0],y:s[1]}};e.data.bgActivePosistion=void 0,e.redrawHint("select",!0),e.touchData.start?e.touchData.start.emit(V):o.emit(V),e.touchData.start&&(e.touchData.start._private.grabbed=!1),e.touchData.cxtDragged=!0;var F=e.findNearestElement(s[0],s[1],!0,!0);e.touchData.cxtOver&&F===e.touchData.cxtOver||(e.touchData.cxtOver&&e.touchData.cxtOver.emit({originalEvent:t,type:"cxtdragout",position:{x:s[0],y:s[1]}}),e.touchData.cxtOver=F,F&&F.emit({originalEvent:t,type:"cxtdragover",position:{x:s[0],y:s[1]}}))}else if(r&&t.touches[2]&&o.boxSelectionEnabled())t.preventDefault(),e.data.bgActivePosistion=void 0,this.lastThreeTouch=+new Date,e.touchData.selecting||o.emit({originalEvent:t,type:"boxstart",position:{x:s[0],y:s[1]}}),e.touchData.selecting=!0,e.touchData.didSelect=!0,a[4]=1,a&&0!==a.length&&void 0!==a[0]?(a[2]=(s[0]+s[2]+s[4])/3,a[3]=(s[1]+s[3]+s[5])/3):(a[0]=(s[0]+s[2]+s[4])/3,a[1]=(s[1]+s[3]+s[5])/3,a[2]=(s[0]+s[2]+s[4])/3+1,a[3]=(s[1]+s[3]+s[5])/3+1),e.redrawHint("select",!0),e.redraw();else if(r&&t.touches[1]&&!e.touchData.didSelect&&o.zoomingEnabled()&&o.panningEnabled()&&o.userZoomingEnabled()&&o.userPanningEnabled()){if(t.preventDefault(),e.data.bgActivePosistion=void 0,e.redrawHint("select",!0),ee=e.dragData.touchDragEles){e.redrawHint("drag",!0);for(var q=0;q0&&!e.hoverData.draggingEles&&!e.swipePanning&&null!=e.data.bgActivePosistion&&(e.data.bgActivePosistion=void 0,e.redrawHint("select",!0),e.redraw())}},!1),e.registerBinding(window,"touchcancel",I=function(t){var n=e.touchData.start;e.touchData.capture=!1,n&&n.unactivate()}),e.registerBinding(window,"touchend",L=function(r){var i=e.touchData.start;if(e.touchData.capture){0===r.touches.length&&(e.touchData.capture=!1),r.preventDefault();var a=e.selection;e.swipePanning=!1,e.hoverData.draggingEles=!1;var o,s=e.cy,l=s.zoom(),u=e.touchData.now,d=e.touchData.earlier;if(r.touches[0]){var h=e.projectIntoViewport(r.touches[0].clientX,r.touches[0].clientY);u[0]=h[0],u[1]=h[1]}if(r.touches[1]){h=e.projectIntoViewport(r.touches[1].clientX,r.touches[1].clientY);u[2]=h[0],u[3]=h[1]}if(r.touches[2]){h=e.projectIntoViewport(r.touches[2].clientX,r.touches[2].clientY);u[4]=h[0],u[5]=h[1]}if(i&&i.unactivate(),e.touchData.cxt){if(o={originalEvent:r,type:"cxttapend",position:{x:u[0],y:u[1]}},i?i.emit(o):s.emit(o),!e.touchData.cxtDragged){var p={originalEvent:r,type:"cxttap",position:{x:u[0],y:u[1]}};i?i.emit(p):s.emit(p)}return e.touchData.start&&(e.touchData.start._private.grabbed=!1),e.touchData.cxt=!1,e.touchData.start=null,void e.redraw()}if(!r.touches[2]&&s.boxSelectionEnabled()&&e.touchData.selecting){e.touchData.selecting=!1;var f=s.collection(e.getAllInBox(a[0],a[1],a[2],a[3]));a[0]=void 0,a[1]=void 0,a[2]=void 0,a[3]=void 0,a[4]=0,e.redrawHint("select",!0),s.emit({type:"boxend",originalEvent:r,position:{x:u[0],y:u[1]}});f.emit("box").stdFilter(function(e){return e.selectable()&&!e.selected()}).select().emit("boxselect"),f.nonempty()&&e.redrawHint("eles",!0),e.redraw()}if(null!=i&&i.unactivate(),r.touches[2])e.data.bgActivePosistion=void 0,e.redrawHint("select",!0);else if(r.touches[1]);else if(r.touches[0]);else if(!r.touches[0]){e.data.bgActivePosistion=void 0,e.redrawHint("select",!0);var g=e.dragData.touchDragEles;if(null!=i){var v=i._private.grabbed;c(g),e.redrawHint("drag",!0),e.redrawHint("eles",!0),v&&(i.emit("freeon"),g.emit("free"),e.dragData.didDrag&&(i.emit("dragfreeon"),g.emit("dragfree"))),n(i,["touchend","tapend","vmouseup","tapdragout"],r,{x:u[0],y:u[1]}),i.unactivate(),e.touchData.start=null}else{var y=e.findNearestElement(u[0],u[1],!0,!0);n(y,["touchend","tapend","vmouseup","tapdragout"],r,{x:u[0],y:u[1]})}var m=e.touchData.startPosition[0]-u[0],b=m*m,x=e.touchData.startPosition[1]-u[1],w=(b+x*x)*l*l;e.touchData.singleTouchMoved||(i||s.$(":selected").unselect(["tapunselect"]),n(i,["tap","vclick"],r,{x:u[0],y:u[1]})),null!=i&&!e.dragData.didDrag&&i._private.selectable&&w2){for(var T=[u[0],u[1]],M=Math.pow(T[0]-e,2)+Math.pow(T[1]-t,2),B=1;B0)return g[0]}return null},h=Object.keys(c),p=0;p0?l:kt(i,a,e,t,n,r,o)},checkPoint:function(e,t,n,r,i,a,o){var s=qt(r,i),l=2*s;if(Mt(e,t,this.points,a,o,r,i-l,[0,-1],n))return!0;if(Mt(e,t,this.points,a,o,r-l,i,[0,-1],n))return!0;var u=r/2+2*n,c=i/2+2*n;return!!Tt(e,t,[a-u,o-c,a-u,o,a+u,o,a+u,o-c])||(!!Nt(e,t,l,l,a+r/2-s,o+i/2-s,n)||!!Nt(e,t,l,l,a-r/2+s,o+i/2-s,n))}}},ls.registerNodeShapes=function(){var e=this.nodeShapes={},t=this;this.generateEllipse(),this.generatePolygon("triangle",Rt(3,0)),this.generateRoundPolygon("round-triangle",Rt(3,0)),this.generatePolygon("rectangle",Rt(4,0)),e.square=e.rectangle,this.generateRoundRectangle(),this.generateCutRectangle(),this.generateBarrel(),this.generateBottomRoundrectangle();var n=[0,1,1,0,0,-1,-1,0];this.generatePolygon("diamond",n),this.generateRoundPolygon("round-diamond",n),this.generatePolygon("pentagon",Rt(5,0)),this.generateRoundPolygon("round-pentagon",Rt(5,0)),this.generatePolygon("hexagon",Rt(6,0)),this.generateRoundPolygon("round-hexagon",Rt(6,0)),this.generatePolygon("heptagon",Rt(7,0)),this.generateRoundPolygon("round-heptagon",Rt(7,0)),this.generatePolygon("octagon",Rt(8,0)),this.generateRoundPolygon("round-octagon",Rt(8,0));var r=new Array(20),i=Ft(5,0),a=Ft(5,Math.PI/5),o=.5*(3-Math.sqrt(5));o*=1.57;for(var s=0;s=e.deqFastCost*g)break}else if(i){if(p>=e.deqCost*l||p>=e.deqAvgCost*s)break}else if(f>=e.deqNoDrawCost*(1e3/60))break;var v=e.deq(t,d,c);if(!(v.length>0))break;for(var y=0;y0&&(e.onDeqd(t,u),!i&&e.shouldRedraw(t,u,d,c)&&r())},i(t))}}},fs=function(){function e(n){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:xe;t(this,e),this.idsByKey=new Le,this.keyForId=new Le,this.cachesByLvl=new Le,this.lvls=[],this.getKey=n,this.doesEleInvalidateKey=r}return r(e,[{key:"getIdsFor",value:function(e){null==e&&ke("Can not get id list for null key");var t=this.idsByKey,n=this.idsByKey.get(e);return n||(n=new Oe,t.set(e,n)),n}},{key:"addIdForKey",value:function(e,t){null!=e&&this.getIdsFor(e).add(t)}},{key:"deleteIdForKey",value:function(e,t){null!=e&&this.getIdsFor(e).delete(t)}},{key:"getNumberOfIdsForKey",value:function(e){return null==e?0:this.getIdsFor(e).size}},{key:"updateKeyMappingFor",value:function(e){var t=e.id(),n=this.keyForId.get(t),r=this.getKey(e);this.deleteIdForKey(n,t),this.addIdForKey(r,t),this.keyForId.set(t,r)}},{key:"deleteKeyMappingFor",value:function(e){var t=e.id(),n=this.keyForId.get(t);this.deleteIdForKey(n,t),this.keyForId.delete(t)}},{key:"keyHasChangedFor",value:function(e){var t=e.id();return this.keyForId.get(t)!==this.getKey(e)}},{key:"isInvalid",value:function(e){return this.keyHasChangedFor(e)||this.doesEleInvalidateKey(e)}},{key:"getCachesAt",value:function(e){var t=this.cachesByLvl,n=this.lvls,r=t.get(e);return r||(r=new Le,t.set(e,r),n.push(e)),r}},{key:"getCache",value:function(e,t){return this.getCachesAt(t).get(e)}},{key:"get",value:function(e,t){var n=this.getKey(e),r=this.getCache(n,t);return null!=r&&this.updateKeyMappingFor(e),r}},{key:"getForCachedKey",value:function(e,t){var n=this.keyForId.get(e.id());return this.getCache(n,t)}},{key:"hasCache",value:function(e,t){return this.getCachesAt(t).has(e)}},{key:"has",value:function(e,t){var n=this.getKey(e);return this.hasCache(n,t)}},{key:"setCache",value:function(e,t,n){n.key=e,this.getCachesAt(t).set(e,n)}},{key:"set",value:function(e,t,n){var r=this.getKey(e);this.setCache(r,t,n),this.updateKeyMappingFor(e)}},{key:"deleteCache",value:function(e,t){this.getCachesAt(t).delete(e)}},{key:"delete",value:function(e,t){var n=this.getKey(e);this.deleteCache(n,t)}},{key:"invalidateKey",value:function(e){var t=this;this.lvls.forEach(function(n){return t.deleteCache(e,n)})}},{key:"invalidate",value:function(e){var t=e.id(),n=this.keyForId.get(t);this.deleteKeyMappingFor(e);var r=this.doesEleInvalidateKey(e);return r&&this.invalidateKey(n),r||0===this.getNumberOfIdsForKey(n)}}]),e}(),gs={dequeue:"dequeue",downscale:"downscale",highQuality:"highQuality"},vs=Be({getKey:null,doesEleInvalidateKey:xe,drawElement:null,getBoundingBox:null,getRotationPoint:null,getRotationOffset:null,isVisible:be,allowEdgeTxrCaching:!0,allowParentTxrCaching:!0}),ys=function(e,t){this.renderer=e,this.onDequeues=[];var n=vs(t);I(this,n),this.lookup=new fs(n.getKey,n.doesEleInvalidateKey),this.setupDequeueing()},ms=ys.prototype;ms.reasons=gs,ms.getTextureQueue=function(e){return this.eleImgCaches=this.eleImgCaches||{},this.eleImgCaches[e]=this.eleImgCaches[e]||[]},ms.getRetiredTextureQueue=function(e){var t=this.eleImgCaches.retired=this.eleImgCaches.retired||{};return t[e]=t[e]||[]},ms.getElementQueue=function(){return this.eleCacheQueue=this.eleCacheQueue||new qe(function(e,t){return t.reqs-e.reqs})},ms.getElementKeyToQueue=function(){return this.eleKeyToCacheQueue=this.eleKeyToCacheQueue||{}},ms.getElement=function(e,t,n,r,i){var a=this,o=this.renderer,s=o.cy.zoom(),l=this.lookup;if(0===t.w||0===t.h||isNaN(t.w)||isNaN(t.h)||!e.visible())return null;if(!a.allowEdgeTxrCaching&&e.isEdge()||!a.allowParentTxrCaching&&e.isParent())return null;if(null==r&&(r=Math.ceil(ot(s*n))),r<-4)r=-4;else if(s>=7.99||r>3)return null;var u=Math.pow(2,r),c=t.h*u,d=t.w*u,h=o.eleTextBiggerThanMin(e,u);if(!this.isVisible(e,h))return null;var p,f=l.get(e,r);if(f&&f.invalidated&&(f.invalidated=!1,f.texture.invalidatedWidth-=f.width),f)return f;if(p=c<=25?25:c<=50?50:50*Math.ceil(c/50),c>1024||d>1024)return null;var g=a.getTextureQueue(p),v=g[g.length-2],y=function(){return a.recycleTexture(p,d)||a.addTexture(p,d)};v||(v=g[g.length-1]),v||(v=y()),v.width-v.usedWidthr;D--)S=a.getElement(e,t,n,D,gs.downscale);P()}else{var T;if(!x&&!w&&!E)for(var M=r-1;M>=-4;M--){var B=l.get(e,M);if(B){T=B;break}}if(b(T))return a.queueElement(e,r),T;v.context.translate(v.usedWidth,0),v.context.scale(u,u),this.drawElement(v.context,e,t,h,!1),v.context.scale(1/u,1/u),v.context.translate(-v.usedWidth,0)}return f={x:v.usedWidth,texture:v,level:r,scale:u,width:d,height:c,scaledLabelShown:h},v.usedWidth+=Math.ceil(d+8),v.eleCaches.push(f),l.set(e,r,f),a.checkTextureFullness(v),f},ms.invalidateElements=function(e){for(var t=0;t=.2*e.width&&this.retireTexture(e)},ms.checkTextureFullness=function(e){var t=this.getTextureQueue(e.height);e.usedWidth/e.width>.8&&e.fullnessChecks>=10?_e(t,e):e.fullnessChecks++},ms.retireTexture=function(e){var t=e.height,n=this.getTextureQueue(t),r=this.lookup;_e(n,e),e.retired=!0;for(var i=e.eleCaches,a=0;a=t)return a.retired=!1,a.usedWidth=0,a.invalidatedWidth=0,a.fullnessChecks=0,Ne(a.eleCaches),a.context.setTransform(1,0,0,1,0,0),a.context.clearRect(0,0,a.width,a.height),_e(r,a),n.push(a),a}},ms.queueElement=function(e,t){var n=this.getElementQueue(),r=this.getElementKeyToQueue(),i=this.getKey(e),a=r[i];if(a)a.level=Math.max(a.level,t),a.eles.merge(e),a.reqs++,n.updateItem(a);else{var o={eles:e.spawn().merge(e),level:t,reqs:1,key:i};n.push(o),r[i]=o}},ms.dequeue=function(e){for(var t=this.getElementQueue(),n=this.getElementKeyToQueue(),r=[],i=this.lookup,a=0;a<1&&t.size()>0;a++){var o=t.pop(),s=o.key,l=o.eles[0],u=i.hasCache(l,o.level);if(n[s]=null,!u){r.push(o);var c=this.getBoundingBox(l);this.getElement(l,c,e,o.level,gs.dequeue)}}return r},ms.removeFromQueue=function(e){var t=this.getElementQueue(),n=this.getElementKeyToQueue(),r=this.getKey(e),i=n[r];null!=i&&(1===i.eles.length?(i.reqs=me,t.updateItem(i),t.pop(),n[r]=null):i.eles.unmerge(e))},ms.onDequeue=function(e){this.onDequeues.push(e)},ms.offDequeue=function(e){_e(this.onDequeues,e)},ms.setupDequeueing=ps({deqRedrawThreshold:100,deqCost:.15,deqAvgCost:.1,deqNoDrawCost:.9,deqFastCost:.9,deq:function(e,t,n){return e.dequeue(t,n)},onDeqd:function(e,t){for(var n=0;n=3.99||n>2)return null;r.validateLayersElesOrdering(n,e);var o,s,l=r.layersByLevel,u=Math.pow(2,n),c=l[n]=l[n]||[];if(r.levelIsComplete(n,e))return c;!function(){var t=function(t){if(r.validateLayersElesOrdering(t,e),r.levelIsComplete(t,e))return s=l[t],!0},i=function(e){if(!s)for(var r=n+e;-4<=r&&r<=2&&!t(r);r+=e);};i(1),i(-1);for(var a=c.length-1;a>=0;a--){var o=c[a];o.invalid&&_e(c,o)}}();var d=function(t){var i=(t=t||{}).after;if(function(){if(!o){o=ft();for(var t=0;t16e6)return null;var a=r.makeLayer(o,n);if(null!=i){var s=c.indexOf(i)+1;c.splice(s,0,a)}else(void 0===t.insert||t.insert)&&c.unshift(a);return a};if(r.skipping&&!a)return null;for(var h=null,p=e.length/1,f=!a,g=0;g=p||!Et(h.bb,v.boundingBox()))&&!(h=d({insert:!0,after:h})))return null;s||f?r.queueLayer(h,v):r.drawEleInLayer(h,v,n,t),h.eles.push(v),m[n]=h}}return s||(f?null:c)},xs.getEleLevelForLayerLevel=function(e,t){return e},xs.drawEleInLayer=function(e,t,n,r){var i=this.renderer,a=e.context,o=t.boundingBox();0!==o.w&&0!==o.h&&t.visible()&&(n=this.getEleLevelForLayerLevel(n,r),i.setImgSmoothing(a,!1),i.drawCachedElement(a,t,null,null,n,!0),i.setImgSmoothing(a,!0))},xs.levelIsComplete=function(e,t){var n=this.layersByLevel[e];if(!n||0===n.length)return!1;for(var r=0,i=0;i0)return!1;if(a.invalid)return!1;r+=a.eles.length}return r===t.length},xs.validateLayersElesOrdering=function(e,t){var n=this.layersByLevel[e];if(n)for(var r=0;r0){e=!0;break}}return e},xs.invalidateElements=function(e){var t=this;0!==e.length&&(t.lastInvalidationTime=le(),0!==e.length&&t.haveLayers()&&t.updateElementsInLayers(e,function(e,n,r){t.invalidateLayer(e)}))},xs.invalidateLayer=function(e){if(this.lastInvalidationTime=le(),!e.invalid){var t=e.level,n=e.eles,r=this.layersByLevel[t];_e(r,e),e.elesQueue=[],e.invalid=!0,e.replacement&&(e.replacement.invalid=!0);for(var i=0;i3&&void 0!==arguments[3])||arguments[3],i=!(arguments.length>4&&void 0!==arguments[4])||arguments[4],a=!(arguments.length>5&&void 0!==arguments[5])||arguments[5],o=this,s=t._private.rscratch;if((!a||t.visible())&&!s.badLine&&null!=s.allpts&&!isNaN(s.allpts[0])){var l;n&&(l=n,e.translate(-l.x1,-l.y1));var u=a?t.pstyle("opacity").value:1,c=t.pstyle("line-style").value,d=t.pstyle("width").pfValue,h=t.pstyle("line-cap").value,p=function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:u;e.lineWidth=d,e.lineCap=h,o.eleStrokeStyle(e,t,n),o.drawEdgePath(t,e,s.allpts,c),e.lineCap="butt"},f=function(){i&&o.drawEdgeOverlay(e,t)},g=function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:u;o.drawArrowheads(e,t,n)},v=function(){o.drawElementText(e,t,null,r)};e.lineJoin="round";var y="yes"===t.pstyle("ghost").value;if(y){var m=t.pstyle("ghost-offset-x").pfValue,b=t.pstyle("ghost-offset-y").pfValue,x=t.pstyle("ghost-opacity").value,w=u*x;e.translate(m,b),p(w),g(w),e.translate(-m,-b)}p(),g(),f(),v(),n&&e.translate(l.x1,l.y1)}},drawEdgeOverlay:function(e,t){if(t.visible()){var n=t.pstyle("overlay-opacity").value;if(0!==n){var r=this,i=r.usePaths(),a=t._private.rscratch,o=2*t.pstyle("overlay-padding").pfValue,s=t.pstyle("overlay-color").value;e.lineWidth=o,"self"!==a.edgeType||i?e.lineCap="round":e.lineCap="butt",r.colorStrokeStyle(e,s[0],s[1],s[2],n),r.drawEdgePath(t,e,a.allpts,"solid")}}},drawEdgePath:function(e,t,n,r){var i,a=e._private.rscratch,o=t,s=!1,l=this.usePaths(),u=e.pstyle("line-dash-pattern").pfValue,c=e.pstyle("line-dash-offset").pfValue;if(l){var d=n.join("$");a.pathCacheKey&&a.pathCacheKey===d?(i=t=a.pathCache,s=!0):(i=t=new Path2D,a.pathCacheKey=d,a.pathCache=i)}if(o.setLineDash)switch(r){case"dotted":o.setLineDash([1,1]);break;case"dashed":o.setLineDash(u),o.lineDashOffset=c;break;case"solid":o.setLineDash([])}if(!s&&!a.badLine)switch(t.beginPath&&t.beginPath(),t.moveTo(n[0],n[1]),a.edgeType){case"bezier":case"self":case"compound":case"multibezier":for(var h=2;h+35&&void 0!==arguments[5]?arguments[5]:5;e.beginPath(),e.moveTo(t+a,n),e.lineTo(t+r-a,n),e.quadraticCurveTo(t+r,n,t+r,n+a),e.lineTo(t+r,n+i-a),e.quadraticCurveTo(t+r,n+i,t+r-a,n+i),e.lineTo(t+a,n+i),e.quadraticCurveTo(t,n+i,t,n+i-a),e.lineTo(t,n+a),e.quadraticCurveTo(t,n,t+a,n),e.closePath(),e.fill()}Rs.eleTextBiggerThanMin=function(e,t){if(!t){var n=e.cy().zoom(),r=this.getPixelRatio(),i=Math.ceil(ot(n*r));t=Math.pow(2,i)}return!(e.pstyle("font-size").pfValue*t5&&void 0!==arguments[5])||arguments[5],o=this;if(null==r){if(a&&!o.eleTextBiggerThanMin(t))return}else if(!1===r)return;if(t.isNode()){var s=t.pstyle("label");if(!s||!s.value)return;var l=o.getLabelJustification(t);e.textAlign=l,e.textBaseline="bottom"}else{var u=t.element()._private.rscratch.badLine,c=t.pstyle("label"),d=t.pstyle("source-label"),h=t.pstyle("target-label");if(u||(!c||!c.value)&&(!d||!d.value)&&(!h||!h.value))return;e.textAlign="center",e.textBaseline="bottom"}var p,f=!n;n&&(p=n,e.translate(-p.x1,-p.y1)),null==i?(o.drawText(e,t,null,f,a),t.isEdge()&&(o.drawText(e,t,"source",f,a),o.drawText(e,t,"target",f,a))):o.drawText(e,t,i,f,a),n&&e.translate(p.x1,p.y1)},Rs.getFontCache=function(e){var t;this.fontCaches=this.fontCaches||[];for(var n=0;n2&&void 0!==arguments[2])||arguments[2],r=t.pstyle("font-style").strValue,i=t.pstyle("font-size").pfValue+"px",a=t.pstyle("font-family").strValue,o=t.pstyle("font-weight").strValue,s=n?t.effectiveOpacity()*t.pstyle("text-opacity").value:1,l=t.pstyle("text-outline-opacity").value*s,u=t.pstyle("color").value,c=t.pstyle("text-outline-color").value;e.font=r+" "+o+" "+i+" "+a,e.lineJoin="round",this.colorFillStyle(e,u[0],u[1],u[2],s),this.colorStrokeStyle(e,c[0],c[1],c[2],l)},Rs.getTextAngle=function(e,t){var n=e._private.rscratch,r=t?t+"-":"",i=e.pstyle(r+"text-rotation"),a=ze(n,"labelAngle",t);return"autorotate"===i.strValue?e.isEdge()?a:0:"none"===i.strValue?0:i.pfValue},Rs.drawText=function(e,t,n){var r=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],i=!(arguments.length>4&&void 0!==arguments[4])||arguments[4],a=t._private,o=a.rscratch,s=i?t.effectiveOpacity():1;if(!i||0!==s&&0!==t.pstyle("text-opacity").value){"main"===n&&(n=null);var l,u,c=ze(o,"labelX",n),d=ze(o,"labelY",n),h=this.getLabelText(t,n);if(null!=h&&""!==h&&!isNaN(c)&&!isNaN(d)){this.setupTextStyle(e,t,i);var p,f=n?n+"-":"",g=ze(o,"labelWidth",n),v=ze(o,"labelHeight",n),y=t.pstyle(f+"text-margin-x").pfValue,m=t.pstyle(f+"text-margin-y").pfValue,b=t.isEdge(),x=t.pstyle("text-halign").value,w=t.pstyle("text-valign").value;switch(b&&(x="center",w="center"),c+=y,d+=m,0!==(p=r?this.getTextAngle(t,n):0)&&(l=c,u=d,e.translate(l,u),e.rotate(p),c=0,d=0),w){case"top":break;case"center":d+=v/2;break;case"bottom":d+=v}var E=t.pstyle("text-background-opacity").value,k=t.pstyle("text-border-opacity").value,C=t.pstyle("text-border-width").pfValue,S=t.pstyle("text-background-padding").pfValue;if(E>0||C>0&&k>0){var P=c-S;switch(x){case"left":P-=g;break;case"center":P-=g/2}var D=d-v-S,T=g+2*S,M=v+2*S;if(E>0){var B=e.fillStyle,_=t.pstyle("text-background-color").value;e.fillStyle="rgba("+_[0]+","+_[1]+","+_[2]+","+E*s+")";var N=t.pstyle("text-background-shape").strValue;0===N.indexOf("round")?Vs(e,P,D,T,M,2):e.fillRect(P,D,T,M),e.fillStyle=B}if(C>0&&k>0){var z=e.strokeStyle,I=e.lineWidth,L=t.pstyle("text-border-color").value,A=t.pstyle("text-border-style").value;if(e.strokeStyle="rgba("+L[0]+","+L[1]+","+L[2]+","+k*s+")",e.lineWidth=C,e.setLineDash)switch(A){case"dotted":e.setLineDash([1,1]);break;case"dashed":e.setLineDash([4,2]);break;case"double":e.lineWidth=C/4,e.setLineDash([]);break;case"solid":e.setLineDash([])}if(e.strokeRect(P,D,T,M),"double"===A){var O=C/2;e.strokeRect(P+O,D+O,T-2*O,M-2*O)}e.setLineDash&&e.setLineDash([]),e.lineWidth=I,e.strokeStyle=z}}var R=2*t.pstyle("text-outline-width").pfValue;if(R>0&&(e.lineWidth=R),"wrap"===t.pstyle("text-wrap").value){var V=ze(o,"labelWrapCachedLines",n),F=ze(o,"labelLineHeight",n),q=g/2,j=this.getLabelJustification(t);switch("auto"===j||("left"===x?"left"===j?c+=-g:"center"===j&&(c+=-q):"center"===x?"left"===j?c+=-q:"right"===j&&(c+=q):"right"===x&&("center"===j?c+=q:"right"===j&&(c+=g))),w){case"top":d-=(V.length-1)*F;break;case"center":case"bottom":d-=(V.length-1)*F}for(var Y=0;Y0&&e.strokeText(V[Y],c,d),e.fillText(V[Y],c,d),d+=F}else R>0&&e.strokeText(h,c,d),e.fillText(h,c,d);0!==p&&(e.rotate(-p),e.translate(-l,-u))}}};var Fs={drawNode:function(e,t,n){var r,i,a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],o=!(arguments.length>4&&void 0!==arguments[4])||arguments[4],s=!(arguments.length>5&&void 0!==arguments[5])||arguments[5],l=this,u=t._private,c=u.rscratch,d=t.position();if(y(d.x)&&y(d.y)&&(!s||t.visible())){var h,p,f=s?t.effectiveOpacity():1,g=l.usePaths(),v=!1,m=t.padding();r=t.width()+2*m,i=t.height()+2*m,n&&(p=n,e.translate(-p.x1,-p.y1));for(var b=t.pstyle("background-image"),x=b.value,w=new Array(x.length),E=new Array(x.length),k=0,C=0;C0&&void 0!==arguments[0]?arguments[0]:B;l.eleFillStyle(e,t,n)},L=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:z;l.colorStrokeStyle(e,_[0],_[1],_[2],t)},A=t.pstyle("shape").strValue,O=t.pstyle("shape-polygon-points").pfValue;if(g){e.translate(d.x,d.y);var R=l.nodePathCache=l.nodePathCache||[],V=pe("polygon"===A?A+","+O.join(","):A,""+i,""+r),F=R[V];null!=F?(h=F,v=!0,c.pathCache=h):(h=new Path2D,R[V]=c.pathCache=h)}var q=function(){if(!v){var n=d;g&&(n={x:0,y:0}),l.nodeShapes[l.getNodeShape(t)].draw(h||e,n.x,n.y,r,i)}g?e.fill(h):e.fill()},j=function(){for(var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:f,r=u.backgrounding,i=0,a=0;a0&&void 0!==arguments[0]&&arguments[0],a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:f;l.hasPie(t)&&(l.drawPie(e,t,a),n&&(g||l.nodeShapes[l.getNodeShape(t)].draw(e,d.x,d.y,r,i)))},X=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:f,n=(T>0?T:-T)*t,r=T>0?0:255;0!==T&&(l.colorFillStyle(e,r,r,r,n),g?e.fill(h):e.fill())},W=function(){if(M>0){if(e.lineWidth=M,e.lineCap="butt",e.setLineDash)switch(N){case"dotted":e.setLineDash([1,1]);break;case"dashed":e.setLineDash([4,2]);break;case"solid":case"double":e.setLineDash([])}if(g?e.stroke(h):e.stroke(),"double"===N){e.lineWidth=M/3;var t=e.globalCompositeOperation;e.globalCompositeOperation="destination-out",g?e.stroke(h):e.stroke(),e.globalCompositeOperation=t}e.setLineDash&&e.setLineDash([])}},H=function(){o&&l.drawNodeOverlay(e,t,d,r,i)},K=function(){l.drawElementText(e,t,null,a)},G="yes"===t.pstyle("ghost").value;if(G){var Z=t.pstyle("ghost-offset-x").pfValue,U=t.pstyle("ghost-offset-y").pfValue,$=t.pstyle("ghost-opacity").value,Q=$*f;e.translate(Z,U),I($*B),q(),j(Q),Y(0!==T||0!==M),X(Q),L($*z),W(),e.translate(-Z,-U)}I(),q(),j(),Y(0!==T||0!==M),X(),L(),W(),g&&e.translate(-d.x,-d.y),K(),H(),n&&e.translate(p.x1,p.y1)}},drawNodeOverlay:function(e,t,n,r,i){if(t.visible()){var a=t.pstyle("overlay-padding").pfValue,o=t.pstyle("overlay-opacity").value,s=t.pstyle("overlay-color").value;if(o>0){if(n=n||t.position(),null==r||null==i){var l=t.padding();r=t.width()+2*l,i=t.height()+2*l}this.colorFillStyle(e,s[0],s[1],s[2],o),this.nodeShapes.roundrectangle.draw(e,n.x,n.y,r+2*a,i+2*a),e.fill()}}},hasPie:function(e){return(e=e[0])._private.hasPie},drawPie:function(e,t,n,r){t=t[0],r=r||t.position();var i=t.cy().style(),a=t.pstyle("pie-size"),o=r.x,s=r.y,l=t.width(),u=t.height(),c=Math.min(l,u)/2,d=0;this.usePaths()&&(o=0,s=0),"%"===a.units?c*=a.pfValue:void 0!==a.pfValue&&(c=a.pfValue/2);for(var h=1;h<=i.pieBackgroundN;h++){var p=t.pstyle("pie-"+h+"-background-size").value,f=t.pstyle("pie-"+h+"-background-color").value,g=t.pstyle("pie-"+h+"-background-opacity").value*n,v=p/100;v+d>1&&(v=1-d);var y=1.5*Math.PI+2*Math.PI*d,m=y+2*Math.PI*v;0===p||d>=1||d+v>1||(e.beginPath(),e.moveTo(o,s),e.arc(o,s,c,y,m),e.closePath(),this.colorFillStyle(e,f[0],f[1],f[2],g),e.fill(),d+=v)}}},qs={};qs.getPixelRatio=function(){var e=this.data.contexts[0];if(null!=this.forcedPixelRatio)return this.forcedPixelRatio;var t=e.backingStorePixelRatio||e.webkitBackingStorePixelRatio||e.mozBackingStorePixelRatio||e.msBackingStorePixelRatio||e.oBackingStorePixelRatio||e.backingStorePixelRatio||1;return(window.devicePixelRatio||1)/t},qs.paintCache=function(e){for(var t,n=this.paintCaches=this.paintCaches||[],r=!0,i=0;io.minMbLowQualFrames&&(o.motionBlurPxRatio=o.mbPxRBlurry)),o.clearingMotionBlur&&(o.motionBlurPxRatio=1),o.textureDrawLastFrame&&!d&&(c[o.NODE]=!0,c[o.SELECT_BOX]=!0);var m=l.style(),b=l.zoom(),x=void 0!==i?i:b,w=l.pan(),E={x:w.x,y:w.y},k={zoom:b,pan:{x:w.x,y:w.y}},C=o.prevViewport;void 0===C||k.zoom!==C.zoom||k.pan.x!==C.pan.x||k.pan.y!==C.pan.y||g&&!f||(o.motionBlurPxRatio=1),a&&(E=a),x*=s,E.x*=s,E.y*=s;var S=o.getCachedZSortedEles();function P(e,t,n,r,i){var a=e.globalCompositeOperation;e.globalCompositeOperation="destination-out",o.colorFillStyle(e,255,255,255,o.motionBlurTransparency),e.fillRect(t,n,r,i),e.globalCompositeOperation=a}function D(e,r){var s,l,c,d;o.clearingMotionBlur||e!==u.bufferContexts[o.MOTIONBLUR_BUFFER_NODE]&&e!==u.bufferContexts[o.MOTIONBLUR_BUFFER_DRAG]?(s=E,l=x,c=o.canvasWidth,d=o.canvasHeight):(s={x:w.x*p,y:w.y*p},l=b*p,c=o.canvasWidth*p,d=o.canvasHeight*p),e.setTransform(1,0,0,1,0,0),"motionBlur"===r?P(e,0,0,c,d):t||void 0!==r&&!r||e.clearRect(0,0,c,d),n||(e.translate(s.x,s.y),e.scale(l,l)),a&&e.translate(a.x,a.y),i&&e.scale(i,i)}if(d||(o.textureDrawLastFrame=!1),d){if(o.textureDrawLastFrame=!0,!o.textureCache){o.textureCache={},o.textureCache.bb=l.mutableElements().boundingBox(),o.textureCache.texture=o.data.bufferCanvases[o.TEXTURE_BUFFER];var T=o.data.bufferContexts[o.TEXTURE_BUFFER];T.setTransform(1,0,0,1,0,0),T.clearRect(0,0,o.canvasWidth*o.textureMult,o.canvasHeight*o.textureMult),o.render({forcedContext:T,drawOnlyNodeLayer:!0,forcedPxRatio:s*o.textureMult}),(k=o.textureCache.viewport={zoom:l.zoom(),pan:l.pan(),width:o.canvasWidth,height:o.canvasHeight}).mpan={x:(0-k.pan.x)/k.zoom,y:(0-k.pan.y)/k.zoom}}c[o.DRAG]=!1,c[o.NODE]=!1;var M=u.contexts[o.NODE],B=o.textureCache.texture;k=o.textureCache.viewport;M.setTransform(1,0,0,1,0,0),h?P(M,0,0,k.width,k.height):M.clearRect(0,0,k.width,k.height);var _=m.core("outside-texture-bg-color").value,N=m.core("outside-texture-bg-opacity").value;o.colorFillStyle(M,_[0],_[1],_[2],N),M.fillRect(0,0,k.width,k.height);b=l.zoom();D(M,!1),M.clearRect(k.mpan.x,k.mpan.y,k.width/k.zoom/s,k.height/k.zoom/s),M.drawImage(B,k.mpan.x,k.mpan.y,k.width/k.zoom/s,k.height/k.zoom/s)}else o.textureOnViewport&&!t&&(o.textureCache=null);var z=l.extent(),I=o.pinching||o.hoverData.dragging||o.swipePanning||o.data.wheelZooming||o.hoverData.draggingEles||o.cy.animated(),L=o.hideEdgesOnViewport&&I,A=[];if(A[o.NODE]=!c[o.NODE]&&h&&!o.clearedForMotionBlur[o.NODE]||o.clearingMotionBlur,A[o.NODE]&&(o.clearedForMotionBlur[o.NODE]=!0),A[o.DRAG]=!c[o.DRAG]&&h&&!o.clearedForMotionBlur[o.DRAG]||o.clearingMotionBlur,A[o.DRAG]&&(o.clearedForMotionBlur[o.DRAG]=!0),c[o.NODE]||n||r||A[o.NODE]){var O=h&&!A[o.NODE]&&1!==p;D(M=t||(O?o.data.bufferContexts[o.MOTIONBLUR_BUFFER_NODE]:u.contexts[o.NODE]),h&&!O?"motionBlur":void 0),L?o.drawCachedNodes(M,S.nondrag,s,z):o.drawLayeredElements(M,S.nondrag,s,z),o.debug&&o.drawDebugPoints(M,S.nondrag),n||h||(c[o.NODE]=!1)}if(!r&&(c[o.DRAG]||n||A[o.DRAG])){O=h&&!A[o.DRAG]&&1!==p;D(M=t||(O?o.data.bufferContexts[o.MOTIONBLUR_BUFFER_DRAG]:u.contexts[o.DRAG]),h&&!O?"motionBlur":void 0),L?o.drawCachedNodes(M,S.drag,s,z):o.drawCachedElements(M,S.drag,s,z),o.debug&&o.drawDebugPoints(M,S.drag),n||h||(c[o.DRAG]=!1)}if(o.showFps||!r&&c[o.SELECT_BOX]&&!n){if(D(M=t||u.contexts[o.SELECT_BOX]),1==o.selection[4]&&(o.hoverData.selecting||o.touchData.selecting)){b=o.cy.zoom();var R=m.core("selection-box-border-width").value/b;M.lineWidth=R,M.fillStyle="rgba("+m.core("selection-box-color").value[0]+","+m.core("selection-box-color").value[1]+","+m.core("selection-box-color").value[2]+","+m.core("selection-box-opacity").value+")",M.fillRect(o.selection[0],o.selection[1],o.selection[2]-o.selection[0],o.selection[3]-o.selection[1]),R>0&&(M.strokeStyle="rgba("+m.core("selection-box-border-color").value[0]+","+m.core("selection-box-border-color").value[1]+","+m.core("selection-box-border-color").value[2]+","+m.core("selection-box-opacity").value+")",M.strokeRect(o.selection[0],o.selection[1],o.selection[2]-o.selection[0],o.selection[3]-o.selection[1]))}if(u.bgActivePosistion&&!o.hoverData.selecting){b=o.cy.zoom();var V=u.bgActivePosistion;M.fillStyle="rgba("+m.core("active-bg-color").value[0]+","+m.core("active-bg-color").value[1]+","+m.core("active-bg-color").value[2]+","+m.core("active-bg-opacity").value+")",M.beginPath(),M.arc(V.x,V.y,m.core("active-bg-size").pfValue/b,0,2*Math.PI),M.fill()}var F=o.lastRedrawTime;if(o.showFps&&F){F=Math.round(F);var q=Math.round(1e3/F);M.setTransform(1,0,0,1,0,0),M.fillStyle="rgba(255, 0, 0, 0.75)",M.strokeStyle="rgba(255, 0, 0, 0.75)",M.lineWidth=1,M.fillText("1 frame = "+F+" ms = "+q+" fps",0,20);M.strokeRect(0,30,250,20),M.fillRect(0,30,250*Math.min(q/60,1),20)}n||(c[o.SELECT_BOX]=!1)}if(h&&1!==p){var j=u.contexts[o.NODE],Y=o.data.bufferCanvases[o.MOTIONBLUR_BUFFER_NODE],X=u.contexts[o.DRAG],W=o.data.bufferCanvases[o.MOTIONBLUR_BUFFER_DRAG],H=function(e,t,n){e.setTransform(1,0,0,1,0,0),n||!y?e.clearRect(0,0,o.canvasWidth,o.canvasHeight):P(e,0,0,o.canvasWidth,o.canvasHeight);var r=p;e.drawImage(t,0,0,o.canvasWidth*r,o.canvasHeight*r,0,0,o.canvasWidth,o.canvasHeight)};(c[o.NODE]||A[o.NODE])&&(H(j,Y,A[o.NODE]),c[o.NODE]=!1),(c[o.DRAG]||A[o.DRAG])&&(H(X,W,A[o.DRAG]),c[o.DRAG]=!1)}o.prevViewport=k,o.clearingMotionBlur&&(o.clearingMotionBlur=!1,o.motionBlurCleared=!0,o.motionBlur=!0),h&&(o.motionBlurTimeout=setTimeout(function(){o.motionBlurTimeout=null,o.clearedForMotionBlur[o.NODE]=!1,o.clearedForMotionBlur[o.DRAG]=!1,o.motionBlur=!1,o.clearingMotionBlur=!d,o.mbFrames=0,c[o.NODE]=!0,c[o.DRAG]=!0,o.redraw()},100)),t||l.emit("render")};for(var js={drawPolygonPath:function(e,t,n,r,i,a){var o=r/2,s=i/2;e.beginPath&&e.beginPath(),e.moveTo(t+o*a[0],n+s*a[1]);for(var l=1;l0&&a>0){h.clearRect(0,0,i,a),h.globalCompositeOperation="source-over";var p=this.getCachedZSortedEles();if(e.full)h.translate(-n.x1*l,-n.y1*l),h.scale(l,l),this.drawElements(h,p),h.scale(1/l,1/l),h.translate(n.x1*l,n.y1*l);else{var f=t.pan(),g={x:f.x*l,y:f.y*l};l*=t.zoom(),h.translate(g.x,g.y),h.scale(l,l),this.drawElements(h,p),h.scale(1/l,1/l),h.translate(-g.x,-g.y)}e.bg&&(h.globalCompositeOperation="destination-over",h.fillStyle=e.bg,h.rect(0,0,i,a),h.fill())}return d},Zs.png=function(e){return $s(e,this.bufferCanvasImage(e),"image/png")},Zs.jpg=function(e){return $s(e,this.bufferCanvasImage(e),"image/jpeg")};var Qs={nodeShapeImpl:function(e,t,n,r,i,a,o){switch(e){case"ellipse":return this.drawEllipsePath(t,n,r,i,a);case"polygon":return this.drawPolygonPath(t,n,r,i,a,o);case"round-polygon":return this.drawRoundPolygonPath(t,n,r,i,a,o);case"roundrectangle":case"round-rectangle":return this.drawRoundRectanglePath(t,n,r,i,a);case"cutrectangle":case"cut-rectangle":return this.drawCutRectanglePath(t,n,r,i,a);case"bottomroundrectangle":case"bottom-round-rectangle":return this.drawBottomRoundRectanglePath(t,n,r,i,a);case"barrel":return this.drawBarrelPath(t,n,r,i,a)}}},Js=tl,el=tl.prototype;function tl(e){var t=this;t.data={canvases:new Array(el.CANVAS_LAYERS),contexts:new Array(el.CANVAS_LAYERS),canvasNeedsRedraw:new Array(el.CANVAS_LAYERS),bufferCanvases:new Array(el.BUFFER_COUNT),bufferContexts:new Array(el.CANVAS_LAYERS)};t.data.canvasContainer=document.createElement("div");var n=t.data.canvasContainer.style;t.data.canvasContainer.style["-webkit-tap-highlight-color"]="rgba(0,0,0,0)",n.position="relative",n.zIndex="0",n.overflow="hidden";var r=e.cy.container();r.appendChild(t.data.canvasContainer),r.style["-webkit-tap-highlight-color"]="rgba(0,0,0,0)";var i={"-webkit-user-select":"none","-moz-user-select":"-moz-none","user-select":"none","-webkit-tap-highlight-color":"rgba(0,0,0,0)","outline-style":"none"};P()&&(i["-ms-touch-action"]="none",i["touch-action"]="none");for(var a=0;a Date: Fri, 28 Feb 2020 18:12:53 +0100 Subject: [PATCH 419/467] fix various js errors probably due to new cytoscape version --- views/bootstrap/class.WorkflowGraph.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php index 71f46f813..2eb3bcde2 100644 --- a/views/bootstrap/class.WorkflowGraph.php +++ b/views/bootstrap/class.WorkflowGraph.php @@ -185,8 +185,8 @@ cy.on('free', 'node', function(evt) { }); cy.on('tap', 'node', function(evt) { - var node = evt.cyTarget; - var scratch = node.scratch('app'); + var node = evt.target; + var scratch = node.scratch('_app'); if(typeof scratch !== 'undefined') { noty({ text: (scratch.users ? '

          ' ?> ' + scratch.users + '

          ' : '') + (scratch.groups ? ' ' ?> ' + scratch.groups + '

          ' : ''), @@ -272,7 +272,7 @@ $(document).ready(function() { 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))."\"} + _app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"} }" : "")." });\n"; } @@ -321,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()."' }, @@ -329,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()."' }, From 0e4a819e2b3b66fb4b2e695fd2294efa27c8bb3e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 28 Feb 2020 18:20:44 +0100 Subject: [PATCH 420/467] run various outputs through htmlspecialchars() --- views/bootstrap/class.ViewDocument.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 654796b20..f696193f2 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -989,11 +989,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } } - echo "

          ".$workflow->getName()."

          "; + echo "

          ".htmlspecialchars($workflow->getName())."

          "; if($parentworkflow = $latestContent->getParentWorkflow()) { - echo "

          Sub workflow of '".$parentworkflow->getName()."'

          "; + echo "

          Sub workflow of '".htmlspecialchars($parentworkflow->getName())."'

          "; } - echo "
          ".getMLText('current_state').": ".$workflowstate->getName()."
          "; + echo "
          ".getMLText('current_state').": ".htmlspecialchars($workflowstate->getName())."
          "; echo "\n"; echo ""; echo ""; @@ -1017,7 +1017,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { echo "\n\n\n"; $printheader=false; } - $sammel[] = array($document->getID(), $version->getVersion); + $sammel[] = array($document->getID(), $version->getVersion()); $txt = $this->callHook('documentListItem', $document, $previewer); if(is_string($txt)) echo $txt; From e543f100d5ed73c96b21949b0a8225ea5cc9ef71 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:43:39 +0100 Subject: [PATCH 430/467] update release date and notes --- SeedDMS_Core/package.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index f1a4e8cbd..a8c060e33 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,8 +12,8 @@ uwe@steinmann.cx yes - 2020-02-18 - + 2020-03-02 + 5.1.15 5.1.15 @@ -24,6 +24,7 @@ GPL License +- no changes, just keep same version as seeddms application From 67e5eb5efe6555dcf46e347a9499501553e122f5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 11:50:55 +0100 Subject: [PATCH 431/467] set notes for 5.1.15 --- SeedDMS_Core/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index a99722c6d..184b51afd 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -1744,6 +1744,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp() GPL License +- no changes, just keep same version as seeddms application From 25b979d9ef58d768b7160890ee2740afbb7bbf55 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 17:51:25 +0100 Subject: [PATCH 432/467] start new version 5.1.16 --- CHANGELOG | 4 ++++ SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- inc/inc.Version.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 68c3d0831..f41bfe6c3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.16 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.15 -------------------------------------------------------------------------------- diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index bbaa830bb..070d9f098 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -383,7 +383,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '5.1.15'; + $this->version = '5.1.16'; } /* }}} */ /** diff --git a/inc/inc.Version.php b/inc/inc.Version.php index d4e7d8127..f04d14174 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { /* {{{ */ - const _number = "5.1.15"; + const _number = "5.1.16"; const _string = "SeedDMS"; function __construct() { From 92b291d4d2fc7fb50455ddb8141385c164c490e4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 18:16:40 +0100 Subject: [PATCH 433/467] start new version 5.1.16 --- SeedDMS_Core/package.xml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index a8c060e33..dda3454c6 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2020-03-02 + 2020-04-02 - 5.1.15 - 5.1.15 + 5.1.16 + 5.1.16 stable @@ -1728,5 +1728,21 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp() - speed up SeedDMS_Core_Folder::getSubFolders() SeedDMS_Core_Folder::getDocuments() by minimizing the number of sql queries. + + 2020-03-02 + + + 5.1.15 + 5.1.15 + + + stable + stable + + GPL License + +- no changes, just keep same version as seeddms application + + From 6950f7777e5af6444bdbc377d02e0d9e75781d6d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 18:23:11 +0100 Subject: [PATCH 434/467] fix bug #465 --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 89b056fa2..e63328eab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- + Changes in version 6.0.9 +-------------------------------------------------------------------------------- +- fix removal of roles (Closes: #465) + -------------------------------------------------------------------------------- Changes in version 6.0.8 -------------------------------------------------------------------------------- From d928c439812f507082c6065357876fd05ff488fa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 18:27:10 +0100 Subject: [PATCH 435/467] fix bug #465 --- SeedDMS_Core/Core/inc.ClassUser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 5c0870e62..d5ef069e5 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -182,7 +182,7 @@ class SeedDMS_Core_Role { /* {{{ */ * * @return boolean true on success or false in case of an error */ - function remove($user) { /* {{{ */ + function remove() { /* {{{ */ $db = $this->_dms->getDB(); $queryStr = "DELETE FROM `tblRoles` WHERE `id` = " . $this->_id; From 0ed11fcb36123176ed2f0c1853a087f90ef00826 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 18:27:24 +0100 Subject: [PATCH 436/467] fix bug #458 --- op/op.ImportFS.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php index e19389c66..73afdeed4 100644 --- a/op/op.ImportFS.php +++ b/op/op.ImportFS.php @@ -61,6 +61,7 @@ function getAttributeData($attrdef, $coldata, $objdata) { /* {{{ */ function getCategoryData($colname, $coldata, $objdata) { /* {{{ */ global $catids; $kk = explode(',', $coldata); + $objdata['category'][] = array(); foreach($kk as $k) { if(isset($catids[$k])) $objdata['category'][] = $catids[$k]; From 41b9ca549ed07da7302dfd12ed622bcd60745484 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 18:27:24 +0100 Subject: [PATCH 437/467] fix bug #458 --- op/op.ImportFS.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php index e19389c66..73afdeed4 100644 --- a/op/op.ImportFS.php +++ b/op/op.ImportFS.php @@ -61,6 +61,7 @@ function getAttributeData($attrdef, $coldata, $objdata) { /* {{{ */ function getCategoryData($colname, $coldata, $objdata) { /* {{{ */ global $catids; $kk = explode(',', $coldata); + $objdata['category'][] = array(); foreach($kk as $k) { if(isset($catids[$k])) $objdata['category'][] = $catids[$k]; From 5e1947ad16a717eb09ecbb4671e995581f9758f3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 18:29:20 +0100 Subject: [PATCH 438/467] add entry for 5.1.16 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index f41bfe6c3..cd62b667f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 5.1.16 -------------------------------------------------------------------------------- +- initialize categories to empty array. Closes #458 -------------------------------------------------------------------------------- Changes in version 5.1.15 From 8a789800e1a7bd51aa00b3a4860639000b0e0d71 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 18:34:39 +0100 Subject: [PATCH 439/467] fix some php warnings --- out/out.ApprovalSummary.php | 1 + out/out.ReviewSummary.php | 1 + 2 files changed, 2 insertions(+) diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index 6132b73e8..ecc8374a8 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -37,6 +37,7 @@ if ($user->isGuest()) { } if($view) { + $view->setParam('showtree', showtree()); $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index 6132b73e8..ecc8374a8 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -37,6 +37,7 @@ if ($user->isGuest()) { } if($view) { + $view->setParam('showtree', showtree()); $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); From 083820e42df48c22f53ec393955dac48913b9fee Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 20:37:51 +0100 Subject: [PATCH 440/467] set min-width and padding of div.popupbox --- styles/bootstrap/application.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index d24cab1bd..432bf5ef5 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -209,10 +209,10 @@ div.popupbox { text-align: left; text-shadow: none; border: 1px solid #ccc; - padding: 15px; + padding: 25px 15px 15px 15px; display: none; position: absolute; - width: 250px; + min-width: 250px; } div.popupbox span.closepopupbox { From 8546b4823091f8734ec116391734bd06472690bb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 20:38:20 +0100 Subject: [PATCH 441/467] stop propagation when opening and closing a popup box --- styles/bootstrap/application.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index da9d4e291..6aaba78e9 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -1139,6 +1139,7 @@ $(document).ready(function() { /* {{{ */ $("body").on("click", "span.openpopupbox", function(e) { $(""+$(e.target).data("href")).toggle(); + e.stopPropagation(); }); $("body").on("click", "span.openpopupbox i", function(e) { $(e.target).parent().click(); @@ -1148,6 +1149,7 @@ $(document).ready(function() { /* {{{ */ }); $("body").on("click", "span.closepopupbox", function(e) { $(this).parent().hide(); + e.stopPropagation(); }); }); /* }}} */ From 987c9a1fcb22692e6c487dcd22d10506a782e296 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 20:47:25 +0100 Subject: [PATCH 442/467] set min-width of popup box to 230px --- styles/bootstrap/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index 432bf5ef5..8ae479df4 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -212,7 +212,7 @@ div.popupbox { padding: 25px 15px 15px 15px; display: none; position: absolute; - min-width: 250px; + min-width: 230px; } div.popupbox span.closepopupbox { From 6aa57ad2b1e0c47aaf7e4629f8321ad5448925fd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 22:24:32 +0100 Subject: [PATCH 443/467] set onepage mode in view --- out/out.Calendar.php | 2 +- out/out.Categories.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/out/out.Calendar.php b/out/out.Calendar.php index e8f1ad8e0..1bb27108b 100644 --- a/out/out.Calendar.php +++ b/out/out.Calendar.php @@ -66,7 +66,7 @@ if(isset($_GET['eventtype']) && $_GET['eventtype']) { if($view) { $view->setParam('accessobject', $accessop); - $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view->setParam('calendar', $calendar); $view->setParam('start', $start); $view->setParam('end', $end); diff --git a/out/out.Categories.php b/out/out.Categories.php index 6009753b4..35092df49 100644 --- a/out/out.Categories.php +++ b/out/out.Categories.php @@ -50,6 +50,7 @@ if($view) { $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view->setParam('xsendfile', $settings->_enableXsendfile); $view($_GET); } From 54a14286f378bdc9c739b6bb4fb7727216ac377b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 22:25:10 +0100 Subject: [PATCH 444/467] set cursor of documentListRow in onepage mode, show id on mouse over --- views/bootstrap/class.Bootstrap.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index f1dcb76b4..f20243e9d 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2371,9 +2371,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; $content .= ""; - $content .= "\n"; if($onepage) - $content .= "\n"; } /* }}} */ - function folderListRow($subFolder, $extracontent=array()) { /* {{{ */ + function folderListRow($subFolder, $skipcont=false, $extracontent=array()) { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; // $folder = $this->params['folder']; @@ -2490,7 +2490,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; $content = ''; - $content .= $this->folderListRowStart($subFolder); + if(!$skipcont) + $content .= $this->folderListRowStart($subFolder); $content .= "\n"; if($onepage) $content .= ""; - $content .= $this->folderListRowEnd($subFolder); + if(!$skipcont) + $content .= $this->folderListRowEnd($subFolder); return $content; } /* }}} */ From 09f5943eb008fb9ea221e930f2ee18086104b248 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Mar 2020 09:12:25 +0100 Subject: [PATCH 450/467] pass new parameter $skipcont to folderListRow() --- views/bootstrap/class.Search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 0df46af47..0b64409b7 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -558,7 +558,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $extracontent = array(); if($attrstr) $extracontent['bottom_title'] = '
          '.$this->printPopupBox(''.getMLText('attributes').'', $attrstr, true); - print $this->folderListRow($folder, $extracontent); + print $this->folderListRow($folder, false, $extracontent); } } print "
          ".getMLText('next_state').":"; foreach($transusers as $transuser) { $u = $transuser->getUser(); - echo $u->getFullName(); + echo htmlspecialchars($u->getFullName()); if($document->getAccessMode($u) < M_READ) { echo " (no access)"; } @@ -1035,7 +1035,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $g = $transgroup->getGroup(); echo getMLText('at_least_n_users_of_group', array("number_of_users" => $transgroup->getNumOfUsers(), - "group" => $g->getName())); + "group" => htmlspecialchars($g->getName()))); if ($document->getGroupAccessMode($g) < M_READ) { echo " (no access)"; } @@ -1065,10 +1065,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $wkflogs = $latestContent->getWorkflowLog($transition); foreach($wkflogs as $wkflog) { $loguser = $wkflog->getUser(); - echo $loguser->getFullName()." ("; + echo htmlspecialchars($loguser->getFullName())." ("; $names = array(); foreach($loguser->getGroups() as $loggroup) { - $names[] = $loggroup->getName(); + $names[] = htmlspecialchars($loggroup->getName()); } echo implode(", ", $names); echo ") - "; From 13e27496e09aefb6f432f0a3de9ec0dc77c6dfd3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 29 Feb 2020 15:19:11 +0100 Subject: [PATCH 421/467] fix getting workflow log when triggering a transition --- views/bootstrap/class.TriggerWorkflow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php index b9a89bbd5..12091106e 100644 --- a/views/bootstrap/class.TriggerWorkflow.php +++ b/views/bootstrap/class.TriggerWorkflow.php @@ -79,7 +79,7 @@ $(document).ready(function() { $action = $transition->getAction(); $currentstate = $latestContent->getWorkflowState(); - $wkflog = $latestContent->getWorkflowLog(); + $wkflog = array_shift($latestContent->getWorkflowLog()); $workflow = $latestContent->getWorkflow(); $msg = "The document is currently in state: ".$currentstate->getName()."
          "; From 479214118ef7bd5755646cf5a4f6024e649c7cb3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 29 Feb 2020 15:20:09 +0100 Subject: [PATCH 422/467] add entry for 6.0.8 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c2edec888..f481aeba4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - merge changes up to 5.1.15 - fix syntax error in op/op.EditComment.php - fix use of private variable in op/op.SetRecipients.php and op/op.SetRevisors.php +- fix triggering a transition in advanced workflow mode -------------------------------------------------------------------------------- Changes in version 6.0.7 From cbf6afa6d2cacc28255f8357f53c7f1e19677960 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:15:25 +0100 Subject: [PATCH 423/467] load/save proxy paramters --- inc/inc.ClassSettings.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index d511e7d08..897e42689 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -527,6 +527,9 @@ class Settings { /* {{{ */ $this->_dropFolderDir = strval($tab["dropFolderDir"]); $this->_backupDir = strval($tab["backupDir"]); $this->_repositoryUrl = strval($tab["repositoryUrl"]); + $this->_proxyUrl = strval($tab["proxyUrl"]); + $this->_proxyUser = strval($tab["proxyUser"]); + $this->_proxyPassword = strval($tab["proxyPassword"]); $this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]); $this->_logFileRotation = strval($tab["logFileRotation"]); $this->_enableLargeFileUpload = Settings::boolVal($tab["enableLargeFileUpload"]); @@ -874,6 +877,9 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "dropFolderDir", $this->_dropFolderDir); $this->setXMLAttributValue($node, "backupDir", $this->_backupDir); $this->setXMLAttributValue($node, "repositoryUrl", $this->_repositoryUrl); + $this->setXMLAttributValue($node, "proxyUrl", $this->_proxyUrl); + $this->setXMLAttributValue($node, "proxyUser", $this->_proxyUser); + $this->setXMLAttributValue($node, "proxyPassword", $this->_proxyPassword); $this->setXMLAttributValue($node, "logFileEnable", $this->_logFileEnable); $this->setXMLAttributValue($node, "logFileRotation", $this->_logFileRotation); $this->setXMLAttributValue($node, "enableLargeFileUpload", $this->_enableLargeFileUpload); From 6454f466cfcba3a75e2646f1dfaa8694a2075a03 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:16:03 +0100 Subject: [PATCH 424/467] pass proxy parameters to construction of Extension Mgr --- inc/inc.Extension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 77f4b6eb6..e53c88485 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -16,7 +16,7 @@ require_once "inc.ClassExtBase.php"; require_once "inc.Version.php"; require_once "inc.Utils.php"; -$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl); +$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl, $settings->_proxyUrl, $settings->_proxyUser, $settings->_proxyPassword); $version = new SeedDMS_Version; From 02dd7989fbfde2276dba3617528bbdaeff1e8404 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:16:45 +0100 Subject: [PATCH 425/467] add new method getExtensionFromRepository(), support for proxy --- inc/inc.ClassExtensionMgr.php | 42 +++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index 758215ddb..e2dcd2c3e 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -103,10 +103,13 @@ class SeedDMS_Extension_Mgr { * configuration file if it does not exist and the extension dir * is given */ - public function __construct($extdir = '', $cachedir = '', $reposurl = '') { /* {{{ */ + public function __construct($extdir = '', $cachedir = '', $reposurl = '', $proxyurl='', $proxyuser='', $proxypass='') { /* {{{ */ $this->cachedir = $cachedir; $this->extdir = $extdir; $this->reposurl = $reposurl; + $this->proxyurl = $proxyurl; + $this->proxyuser = $proxyuser; + $this->proxypass = $proxypass; $this->extconf = array(); if($extdir) { if(!file_exists($this->getExtensionsConfFile())) { @@ -119,6 +122,29 @@ class SeedDMS_Extension_Mgr { } } /* }}} */ + private function getStreamContext() { /* {{{ */ + if(!$this->proxyurl) + return null; + $url = parse_url($this->proxyurl); + $opts = [ + $url['scheme'] => [ + 'proxy' => 'tcp://'.$url['host'].($url['port'] ? ':'.$url['port'] : ''), + 'request_fulluri' => true, + ] + ]; + if($this->proxyuser && $this->proxypass) { + $auth = base64_encode($this->proxyurl.':'.$this->proxypass); + $opts[$url['scheme']] = [ + 'header' => [ + 'Proxy-Authorization: Basic '.$auth + ] + ]; + } + + $context = stream_context_create($opts); + return $context; + } /* }}} */ + protected function getExtensionsConfFile() { /* {{{ */ return $this->cachedir."/extensions.php"; } /* }}} */ @@ -539,7 +565,7 @@ class SeedDMS_Extension_Mgr { public function updateExtensionList($version='', $force=false) { /* {{{ */ if($this->reposurl) { if(!file_exists($this->cachedir."/".self::repos_list_file) || $force) { - if($file = @file_get_contents($this->reposurl.($version ? '?seeddms_version='.$version : ''))) { + if($file = @file_get_contents($this->reposurl.($version ? '?seeddms_version='.$version : ''), false, $this->getStreamContext())) { if(is_array($http_response_header)) { $parts=explode(' ',$http_response_header[0]); if(count($parts)>1) //HTTP/1.0 @@ -559,6 +585,18 @@ class SeedDMS_Extension_Mgr { } } /* }}} */ + /** + * Download an extension from the repository + * + * @param string $file filename of extension + */ + public function getExtensionFromRepository($file) { /* {{{ */ + $content = file_get_contents($this->reposurl."/".$file, false, $this->getStreamContext()); + $tmpfile = tempnam(sys_get_temp_dir(), ''); + file_put_contents($tmpfile, $content); + return $tmpfile; + } /* }}} */ + /** * Return last error message * From 3b3ada2ff50e666ec9bc549c3ef64bc9d0ad9bd2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:17:30 +0100 Subject: [PATCH 426/467] fix import of extension in list of extension versions --- views/bootstrap/class.ExtensionMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index a7a79a062..c67ab8ae4 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -77,7 +77,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { }); }); - $('a.import').click(function(ev){ + $('body').on('click', 'a.import', function(ev){ var element = $(this); $('#'+element.data('extname')+'-import').submit(); }); From d508ef93db1f4a9740467600f94c115ff814a95c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:18:16 +0100 Subject: [PATCH 427/467] use new method ExtensionMgr::getExtensionFromRepository() --- op/op.ExtensionMgr.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php index 68537a146..e2f15f9a6 100644 --- a/op/op.ExtensionMgr.php +++ b/op/op.ExtensionMgr.php @@ -95,10 +95,13 @@ elseif ($action == "import") { /* {{{ */ if(!$_POST['url']) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } + $file = $extMgr->getExtensionFromRepository($_POST['url']); + /* $reposurl = $settings->_repositoryUrl; $content = file_get_contents($reposurl."/".$_POST['url']); $file = tempnam(sys_get_temp_dir(), ''); file_put_contents($file, $content); + */ // $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir); $controller->setParam('extmgr', $extMgr); From e83799d25db6467e04b8483316a962d9bfd94dee Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:18:55 +0100 Subject: [PATCH 428/467] add entry for 5.1.15 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index aeba5ca4e..68c3d0831 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ - Do not use unzip in ExtensionMgr anymore - fix version compare on info page - allow one page mode on search page +- fix import of older extension versions from repository -------------------------------------------------------------------------------- Changes in version 5.1.14 From 0e7b23ff4c52a978a90ab7554b2f934b9e018b05 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Mar 2020 09:29:53 +0100 Subject: [PATCH 429/467] fix error when getting version of document --- views/bootstrap/class.RevisionSummary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php index 7fa86ebc5..30557151f 100644 --- a/views/bootstrap/class.RevisionSummary.php +++ b/views/bootstrap/class.RevisionSummary.php @@ -98,7 +98,7 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style { print "
          "; + $content .= ""; if($onepage) - $content .= "".htmlspecialchars($document->getName()) . ""; + $content .= "".htmlspecialchars($document->getName()) . ""; else $content .= "" . htmlspecialchars($document->getName()) . ""; if(isset($extracontent['below_title'])) @@ -2977,4 +2977,3 @@ $("body").on("click", "span.openpopupbox", function(e) { From 91f61aad877ac5b7bf3eaed38c24493835e21bb3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 22:26:05 +0100 Subject: [PATCH 445/467] support for onepage mode --- views/bootstrap/class.Calendar.php | 1 + views/bootstrap/class.Categories.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php index 381a904f7..9410c3f02 100644 --- a/views/bootstrap/class.Calendar.php +++ b/views/bootstrap/class.Calendar.php @@ -374,6 +374,7 @@ $(document).ready(function() { }); */ printClickDocumentJs(); } /* }}} */ function show() { /* {{{ */ diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php index ceb8b2ed3..c563fa74f 100644 --- a/views/bootstrap/class.Categories.php +++ b/views/bootstrap/class.Categories.php @@ -48,6 +48,7 @@ $(document).ready( function() { printDeleteFolderButtonJs(); $this->printDeleteDocumentButtonJs(); + $this->printClickDocumentJs(); } /* }}} */ function info() { /* {{{ */ @@ -178,4 +179,3 @@ $(document).ready( function() { $this->htmlEndPage(); } /* }}} */ } -?> From 0acc08178fbae3e03f19933af7f76875ed284d44 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 22:26:28 +0100 Subject: [PATCH 446/467] support for onepage mode --- out/out.AttributeMgr.php | 2 +- views/bootstrap/class.AttributeMgr.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php index 445a69d60..1a613d247 100644 --- a/out/out.AttributeMgr.php +++ b/out/out.AttributeMgr.php @@ -48,7 +48,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { if($view) { $view->setParam('accessobject', $accessop); - $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view->setParam('attrdefs', $attrdefs); $view->setParam('selattrdef', $selattrdef); $view->setParam('showtree', showtree()); diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php index 2a9f6d05a..4bc4de3e2 100644 --- a/views/bootstrap/class.AttributeMgr.php +++ b/views/bootstrap/class.AttributeMgr.php @@ -55,6 +55,7 @@ $(document).ready( function() { $this->printDeleteFolderButtonJs(); $this->printDeleteDocumentButtonJs(); $this->printDeleteAttributeValueButtonJs(); + $this->printClickDocumentJs(); } /* }}} */ function info() { /* {{{ */ @@ -376,4 +377,3 @@ $(document).ready( function() { $this->htmlEndPage(); } /* }}} */ } -?> From 92216112a47806aeb758ceff012f05ba4265202e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Mar 2020 22:30:42 +0100 Subject: [PATCH 447/467] set title and cursor of folder row in onepage mode --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index f20243e9d..f02c47688 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2493,7 +2493,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) $content .= $this->folderListRowStart($subFolder); $content .= "getID()."&showtree=".$showtree."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>" . "".htmlspecialchars($subFolder->getName()).""; + $content .= "" . "getId()."\">".htmlspecialchars($subFolder->getName()).""; else $content .= "getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; $content .= "
          ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; From d5ce0f8fe9d334d4f90e7e2d3debb1a9482282d2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Mar 2020 09:11:15 +0100 Subject: [PATCH 448/467] hook folderListItem has new parameter --- views/bootstrap/class.ViewFolder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 669d73ba9..61492e27c 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -359,7 +359,7 @@ $('body').on('click', '.order-btn', function(ev) { foreach($subFolders as $subFolder) { if(!$maxItemsPerPage || $i < $maxItemsPerPage) { - $txt = $this->callHook('folderListItem', $subFolder, 'viewfolder'); + $txt = $this->callHook('folderListItem', $subFolder, false, 'viewfolder'); if(is_string($txt)) echo $txt; else { @@ -467,7 +467,7 @@ $('body').on('click', '.order-btn', function(ev) { $j = 0; // counts only returned entries foreach($subFolders as $subFolder) { if($i >= $offset && $j < $limit) { - $txt = $this->callHook('folderListItem', $subFolder, 'viewfolder'); + $txt = $this->callHook('folderListItem', $subFolder, false, 'viewfolder'); if(is_string($txt)) $content .= $txt; else { From 3e98a18babfbfca34d77ff44de5c0e0a51d213bb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Mar 2020 09:11:45 +0100 Subject: [PATCH 449/467] add new optional parameter skipcont to folderListRow() --- views/bootstrap/class.Bootstrap.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index f02c47688..3152517b5 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2475,7 +2475,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) return "
          getID()."&showtree=".$showtree."\">getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0>" . "getId()."\">".htmlspecialchars($subFolder->getName()).""; @@ -2551,7 +2552,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) } $content .= ""; $content .= "
          \n"; From 49bebebdae0132c36d5b481e8fa9211486c22b67 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Mar 2020 09:12:45 +0100 Subject: [PATCH 451/467] overhaul ManageNotify, support onepage mode, use standard output for documents and folders --- out/out.ManageNotify.php | 1 + views/bootstrap/class.ManageNotify.php | 62 ++++++++++---------------- 2 files changed, 24 insertions(+), 39 deletions(-) diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php index bd204b655..a641d338c 100644 --- a/out/out.ManageNotify.php +++ b/out/out.ManageNotify.php @@ -38,6 +38,7 @@ if($view) { $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view->setParam('xsendfile', $settings->_enableXsendfile); $view($_GET); exit; diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php index a93f0a7ea..2416a1706 100644 --- a/views/bootstrap/class.ManageNotify.php +++ b/views/bootstrap/class.ManageNotify.php @@ -64,7 +64,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { } else { - print ""; + print "
          "; print "\n"; print "\n"; print "\n"; @@ -74,15 +74,18 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { foreach($notifications as $notification) { $fld = $this->dms->getFolder($notification->getTarget()); if (is_object($fld)) { - $owner = $fld->getOwner(); - print ""; - print ""; - print "\n"; - print ""; + echo $this->folderListRowStart($fld); + $txt = $this->callHook('folderListItem', $fld, true, 'viewfolder'); + if(is_string($txt)) + echo $txt; + else { + echo $this->folderListRow($fld, true); + } print ""; + print ""; + echo $this->folderListRowEnd($fld); } } print "
          ".getMLText("name")."
          getID()."\">" . htmlspecialchars($fld->getName()) . "".htmlspecialchars($owner->getFullName()).""; if ($deleteaction) print " ".getMLText("delete").""; else print "".getMLText("edit").""; - print "
          "; @@ -97,42 +100,30 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { else { $previewer = new SeedDMS_Preview_Previewer($this->cachedir, $this->previewwidth, $this->timeout, $this->xsendfile); - print ""; + print "
          "; print "\n\n"; print "\n"; print "\n"; print "\n"; print "\n"; + print "\n"; print "\n\n"; foreach ($notifications as $notification) { $doc = $this->dms->getDocument($notification->getTarget()); if (is_object($doc)) { - $owner = $doc->getOwner(); - $latest = $doc->getLatestContent(); - $status = $latest->getStatus(); - $previewer->createPreview($latest); - print "\n"; - print ""; - - print "\n"; - - print ""; print "\n"; + print "\n"; + echo $this->documentListRowEnd($doc); } } print "
          ".getMLText("name")."".getMLText("status")."".getMLText("action")."
          "; - if($previewer->hasPreview($latest)) { - print "previewwidth."\" src=\"../op/op.Preview.php?documentid=".$doc->getID()."&version=".$latest->getVersion()."&width=".$this->previewwidth."\" title=\"".htmlspecialchars($latest->getMimeType())."\">"; - } else { - print "previewwidth."\" src=\"".$this->getMimeIcon($latest->getFileType())."\" title=\"".htmlspecialchars($latest->getMimeType())."\">"; + $doc->verifyLastestContentExpriry(); + echo $this->documentListRowStart($doc); + $txt = $this->callHook('documentListItem', $doc, $previewer, true, 'managenotify'); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($doc, $previewer, true); } - print "getID()."\">" . htmlspecialchars($doc->getName()) . ""; - print "
          ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $doc->getDate()).", ".getMLText('version')." ".$latest->getVersion()." - ".date('Y-m-d', $latest->getDate()).""; - $comment = $latest->getComment(); - if($comment) { - print "
          ".htmlspecialchars($comment).""; - } - print "          		".getOverallStatusText($status["status"]).""; if ($deleteaction) print " ".getMLText("delete").""; else print "".getMLText("edit").""; - print "
          "; @@ -144,6 +135,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { $this->printFolderChooserJs("form1"); $this->printDocumentChooserJs("form2"); + $this->printClickDocumentJs(); + $this->printClickFolderJs(); } /* }}} */ function show() { /* {{{ */ @@ -211,28 +204,20 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { echo "
          "; echo "
          "; $this->contentHeading(getMLText("user")); - $this->contentContainerStart(); $ret=$this->getNotificationList(false,true); $this->printFolderNotificationList($ret); - $this->contentContainerEnd(); $this->contentHeading(getMLText("group")); - $this->contentContainerStart(); $ret=$this->getNotificationList(true,true); $this->printFolderNotificationList($ret,false); - $this->contentContainerEnd(); echo "
          "; echo "
          "; $this->contentHeading(getMLText("user")); - $this->contentContainerStart(); $ret=$this->getNotificationList(false,false); $this->printDocumentNotificationList($ret); - $this->contentContainerEnd(); $this->contentHeading(getMLText("group")); - $this->contentContainerStart(); $ret=$this->getNotificationList(true,false); $this->printDocumentNotificationList($ret,false); - $this->contentContainerEnd(); echo "
          "; echo "
          "; @@ -240,4 +225,3 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { $this->htmlEndPage(); } /* }}} */ } -?> From db3f38060465a448f99659694ba7cd9a4166a770 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Mar 2020 09:13:30 +0100 Subject: [PATCH 452/467] add changes for 5.1.16 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cd62b667f..227aad6c9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes in version 5.1.16 -------------------------------------------------------------------------------- - initialize categories to empty array. Closes #458 +- add new parameter $skipcont to hook folderListitem() +- use standard output format for documents and folders on ManageNotify page -------------------------------------------------------------------------------- Changes in version 5.1.15 From c021e4b4cb3aacbcc4496eb5170a192d2ac18501 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Mar 2020 22:26:53 +0100 Subject: [PATCH 453/467] make printPopupBox() public --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 3152517b5..b343d35cc 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2935,7 +2935,7 @@ $(document).ready(function() { $this->printTimelineHtml($height); } /* }}} */ - protected function printPopupBox($title, $content, $ret=false) { /* {{{ */ + public function printPopupBox($title, $content, $ret=false) { /* {{{ */ $id = md5(uniqid()); /* $this->addFooterJS(' From ee8081b3c1c59e3dfbeaf3e676c5f8d4eb6b39a5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Mar 2020 22:27:11 +0100 Subject: [PATCH 454/467] set z-index of popupbox --- styles/bootstrap/application.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index 8ae479df4..63b7e5651 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -213,6 +213,7 @@ div.popupbox { display: none; position: absolute; min-width: 230px; + z-index: 10; } div.popupbox span.closepopupbox { From 30112e4b21935c986ca1d9cd23677a04978fd95a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Mar 2020 09:43:04 +0100 Subject: [PATCH 455/467] use __construct for constructors instead of class name --- SeedDMS_Core/Core/inc.ClassTransmittal.php | 4 ++-- SeedDMS_Core/Core/inc.ClassUser.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php index cd63cfbe0..719f25131 100644 --- a/SeedDMS_Core/Core/inc.ClassTransmittal.php +++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php @@ -79,7 +79,7 @@ class SeedDMS_Core_Transmittal { */ var $_dms; - function SeedDMS_Core_Transmittal($id, $user, $name, $comment, $isPublic=0, $date='') { + function __construct($id, $user, $name, $comment, $isPublic=0, $date='') { $this->_id = $id; $this->_name = $name; $this->_comment = $comment; @@ -312,7 +312,7 @@ class SeedDMS_Core_TransmittalItem { */ var $_date; - function SeedDMS_Core_TransmittalItem($id, $transmittal, $content, $date='') { + function __construct($id, $transmittal, $content, $date='') { $this->_id = $id; $this->_transmittal = $transmittal; $this->_content = $content; diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index d5ef069e5..201bfcfa9 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -62,7 +62,7 @@ class SeedDMS_Core_Role { /* {{{ */ const role_admin = '1'; const role_guest = '2'; - function SeedDMS_Core_Role($id, $name, $role, $noaccess=array()) { /* {{{ */ + function __construct($id, $name, $role, $noaccess=array()) { /* {{{ */ $this->_id = $id; $this->_name = $name; $this->_role = $role; From 061ab4509b9bf74a917c038b5076940205d595ce Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Mar 2020 17:10:02 +0100 Subject: [PATCH 456/467] update to jquery 0.12.4 --- styles/bootstrap/jquery/jquery.min.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/styles/bootstrap/jquery/jquery.min.js b/styles/bootstrap/jquery/jquery.min.js index f65cf1dc4..e83647587 100644 --- a/styles/bootstrap/jquery/jquery.min.js +++ b/styles/bootstrap/jquery/jquery.min.js @@ -1,2 +1,5 @@ -/*! jQuery v1.8.2 jquery.com | jquery.org/license */ -(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b
          a",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="
          t
          ",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="
          ",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;be.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),$=X(function(a){a.innerHTML="";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),_=X(function(a){return a.innerHTML="",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="
          ",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d",a.querySelectorAll("[selected]").length||e.push("\\["+E+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),X(function(a){a.innerHTML="

          ",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=new RegExp(e.join("|")),bp=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a))){var i,j,k=!0,l=o,m=d,n=d.nodeType===9&&a;if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){i=bh(a),(k=d.getAttribute("id"))?l=k.replace(c,"\\$&"):d.setAttribute("id",l),l="[id='"+l+"'] ",j=i.length;while(j--)i[j]=l+i[j].join("");m=R.test(a)&&d.parentNode||d,n=i.join(",")}if(n)try{return w.apply(f,x.call(m.querySelectorAll(n),0)),f}catch(p){}finally{k||d.removeAttribute("id")}}return b(a,d,f,g,h)},h&&(X(function(b){a=h.call(b,"div");try{h.call(b,"[test!='']:sizzle"),f.push("!=",J)}catch(c){}}),f=new RegExp(f.join("|")),bc.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!g(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=h.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return bc(c,null,null,[b]).length>0})}(),e.pseudos.nth=e.pseudos.eq,e.filters=bq.prototype=e.pseudos,e.setFilters=new bq,bc.attr=p.attr,p.find=bc,p.expr=bc.selectors,p.expr[":"]=p.expr.pseudos,p.unique=bc.uniqueSort,p.text=bc.getText,p.isXMLDoc=bc.isXML,p.contains=bc.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*\s*$/g,bz={option:[1,""],legend:[1,"
          ","
          "],thead:[1,"","
          "],tr:[2,"","
          "],td:[3,"","
          "],col:[2,"","
          "],area:[1,"",""],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X
          ","
          "]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("
          ").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window); \ No newline at end of file +/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0; +}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
          a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"
          ","
          "],area:[1,"",""],param:[1,"",""],thead:[1,"","
          "],tr:[2,"","
          "],col:[2,"","
          "],td:[3,"","
          "],_default:l.htmlSerialize?[0,"",""]:[1,"X
          ","
          "]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("