gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 13:06:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2015-09-21 18:10:07 +02:00
commit 272d9a43ee
6 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -1545,7 +1545,7 @@ class SeedDMS_Core_DMS {
*/ */
function createPasswordRequest($user) { /* {{{ */ function createPasswordRequest($user) { /* {{{ */
$hash = md5(uniqid(time())); $hash = md5(uniqid(time()));
$queryStr = "INSERT INTO tblUserPasswordRequest (userID, hash, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", CURRENT_TIMESTAMP)"; $queryStr = "INSERT INTO tblUserPasswordRequest (userID, hash, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", ".$db->getCurrentTimestamp().")";
$resArr = $this->db->getResult($queryStr); $resArr = $this->db->getResult($queryStr);
if (is_bool($resArr) && !$resArr) return false; if (is_bool($resArr) && !$resArr) return false;
return $hash; return $hash;

34
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -1317,7 +1317,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$comment = ""; $comment = "";
} }
$queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $statusID ."', '". $status."', 'New document content submitted". $comment ."', CURRENT_TIMESTAMP, '". $user->getID() ."')"; "VALUES ('". $statusID ."', '". $status."', 'New document content submitted". $comment ."', ".$db->getCurrentTimestamp().", '". $user->getID() ."')";
if (!$db->getResult($queryStr)) { if (!$db->getResult($queryStr)) {
$db->rollbackTransaction(); $db->rollbackTransaction();
return false; return false;
@ -2539,7 +2539,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
if($date) if($date)
$ddate = $db->qstr($date); $ddate = $db->qstr($date);
else else
$ddate = 'CURRENT_TIMESTAMP'; $ddate = $db->getCurrentTimestamp();
$queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $this->_status["statusID"] ."', '". (int) $status ."', ".$db->qstr($comment).", ".$ddate.", '". $updateUser->getID() ."')"; "VALUES ('". $this->_status["statusID"] ."', '". (int) $status ."', ".$db->qstr($comment).", ".$ddate.", '". $updateUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
@ -2935,7 +2935,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $reviewID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $reviewID ."', '0', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -2993,7 +2993,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $reviewID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $reviewID ."', '0', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -3050,7 +3050,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`,
`comment`, `date`, `userID`) ". `comment`, `date`, `userID`) ".
"VALUES ('". $indstatus["reviewID"] ."', '". "VALUES ('". $indstatus["reviewID"] ."', '".
(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '". (int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentTimestamp().", '".
$requestUser->getID() ."')"; $requestUser->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if (is_bool($res) && !$res) if (is_bool($res) && !$res)
@ -3102,7 +3102,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`,
`comment`, `date`, `userID`) ". `comment`, `date`, `userID`) ".
"VALUES ('". $reviewStatus[0]["reviewID"] ."', '". "VALUES ('". $reviewStatus[0]["reviewID"] ."', '".
(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '". (int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentTimestamp().", '".
$requestUser->getID() ."')"; $requestUser->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if (is_bool($res) && !$res) if (is_bool($res) && !$res)
@ -3168,7 +3168,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $approveID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $approveID ."', '0', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -3224,7 +3224,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $approveID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $approveID ."', '0', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -3285,7 +3285,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`,
`comment`, `date`, `userID`) ". `comment`, `date`, `userID`) ".
"VALUES ('". $indstatus["approveID"] ."', '". "VALUES ('". $indstatus["approveID"] ."', '".
(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '". (int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentTimestamp().", '".
$requestUser->getID() ."')"; $requestUser->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if (is_bool($res) && !$res) if (is_bool($res) && !$res)
@ -3329,7 +3329,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`,
`comment`, `date`, `userID`) ". `comment`, `date`, `userID`) ".
"VALUES ('". $approvalStatus[0]["approveID"] ."', '". "VALUES ('". $approvalStatus[0]["approveID"] ."', '".
(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '". (int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentTimestamp().", '".
$requestUser->getID() ."')"; $requestUser->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if (is_bool($res) && !$res) if (is_bool($res) && !$res)
@ -3365,7 +3365,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $indstatus["reviewID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $indstatus["reviewID"] ."', '-2', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -3396,7 +3396,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $reviewStatus[0]["reviewID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $reviewStatus[0]["reviewID"] ."', '-2', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -3428,7 +3428,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $indstatus["approveID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $indstatus["approveID"] ."', '-2', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -3459,7 +3459,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $approvalStatus[0]["approveID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')"; "VALUES ('". $approvalStatus[0]["approveID"] ."', '-2', '', ".$db->getCurrentTimestamp().", '". $requestUser->getID() ."')";
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
return -1; return -1;
@ -3528,7 +3528,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
if($workflow && is_object($workflow)) { if($workflow && is_object($workflow)) {
$db->startTransaction(); $db->startTransaction();
$initstate = $workflow->getInitState(); $initstate = $workflow->getInitState();
$queryStr = "INSERT INTO tblWorkflowDocumentContent (workflow, document, version, state, date) VALUES (". $workflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", CURRENT_TIMESTAMP)"; $queryStr = "INSERT INTO tblWorkflowDocumentContent (workflow, document, version, state, date) VALUES (". $workflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentTimestamp().")";
if (!$db->getResult($queryStr)) { if (!$db->getResult($queryStr)) {
$db->rollbackTransaction(); $db->rollbackTransaction();
return false; return false;
@ -3709,7 +3709,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
if($subworkflow) { if($subworkflow) {
$initstate = $subworkflow->getInitState(); $initstate = $subworkflow->getInitState();
$queryStr = "INSERT INTO tblWorkflowDocumentContent (parentworkflow, workflow, document, version, state, date) VALUES (". $this->_workflow->getID(). ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", CURRENT_TIMESTAMP)"; $queryStr = "INSERT INTO tblWorkflowDocumentContent (parentworkflow, workflow, document, version, state, date) VALUES (". $this->_workflow->getID(). ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentTimestamp().")";
if (!$db->getResult($queryStr)) { if (!$db->getResult($queryStr)) {
return false; return false;
} }
@ -3949,7 +3949,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
return false; return false;
$state = $this->_workflowState; $state = $this->_workflowState;
$queryStr = "INSERT INTO tblWorkflowLog (document, version, workflow, userid, transition, date, comment) VALUES (".$this->_document->getID().", ".$this->_version.", " . (int) $this->_workflow->getID() . ", " .(int) $user->getID(). ", ".(int) $transition->getID().", CURRENT_TIMESTAMP, ".$db->qstr($comment).")"; $queryStr = "INSERT INTO tblWorkflowLog (document, version, workflow, userid, transition, date, comment) VALUES (".$this->_document->getID().", ".$this->_version.", " . (int) $this->_workflow->getID() . ", " .(int) $user->getID(). ", ".(int) $transition->getID().", ".$db->getCurrentTimestamp().", ".$db->qstr($comment).")";
if (!$db->getResult($queryStr)) if (!$db->getResult($queryStr))
return false; return false;

4
SeedDMS_Core/Core/inc.ClassGroup.php
View File

@ -293,7 +293,7 @@ class SeedDMS_Core_Group {
$reviewStatus = $this->getReviewStatus(); $reviewStatus = $this->getReviewStatus();
foreach ($reviewStatus as $r) { foreach ($reviewStatus as $r) {
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $r["reviewID"] ."', '-2', 'Review group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')"; "VALUES ('". $r["reviewID"] ."', '-2', 'Review group removed from process', ".$db->getCurrentTimestamp().", '". $user->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if(!$res) { if(!$res) {
$db->rollbackTransaction(); $db->rollbackTransaction();
@ -304,7 +304,7 @@ class SeedDMS_Core_Group {
$approvalStatus = $this->getApprovalStatus(); $approvalStatus = $this->getApprovalStatus();
foreach ($approvalStatus as $a) { foreach ($approvalStatus as $a) {
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $a["approveID"] ."', '-2', 'Approval group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')"; "VALUES ('". $a["approveID"] ."', '-2', 'Approval group removed from process', ".$db->getCurrentTimestamp().", '". $user->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if(!$res) { if(!$res) {
$db->rollbackTransaction(); $db->rollbackTransaction();

4
SeedDMS_Core/Core/inc.ClassUser.php
View File

@ -665,7 +665,7 @@ class SeedDMS_Core_User { /* {{{ */
$reviewStatus = $this->getReviewStatus(); $reviewStatus = $this->getReviewStatus();
foreach ($reviewStatus["indstatus"] as $ri) { foreach ($reviewStatus["indstatus"] as $ri) {
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')"; "VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentTimestamp().", '". $user->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if(!$res) { if(!$res) {
$db->rollbackTransaction(); $db->rollbackTransaction();
@ -676,7 +676,7 @@ class SeedDMS_Core_User { /* {{{ */
$approvalStatus = $this->getApprovalStatus(); $approvalStatus = $this->getApprovalStatus();
foreach ($approvalStatus["indstatus"] as $ai) { foreach ($approvalStatus["indstatus"] as $ai) {
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ". $queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')"; "VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentTimestamp().", '". $user->getID() ."')";
$res=$db->getResult($queryStr); $res=$db->getResult($queryStr);
if(!$res) { if(!$res) {
$db->rollbackTransaction(); $db->rollbackTransaction();

17
SeedDMS_Core/Core/inc.DBAccessPDO.php
View File

@ -454,6 +454,23 @@ class SeedDMS_Core_DatabaseAccess {
return ''; return '';
} /* }}} */ } /* }}} */
/**
* Return sql statement for returning the current timestamp
*
* @return string sql code
*/
function getCurrentTimestamp() { /* {{{ */
switch($this->_driver) {
case 'mysql':
return "CURRENT_TIMESTAMP";
break;
case 'sqlite':
return "datetime('now', 'localtime')";
break;
}
return '';
} /* }}} */
} }
?> ?>

6
views/bootstrap/class.ViewDocument.php
View File

@ -1186,13 +1186,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
foreach($timeline as &$item) { foreach($timeline as &$item) {
switch($item['type']) { switch($item['type']) {
case 'add_version': case 'add_version':
$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document'], 'version'=> $item['version'])); $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
break; break;
case 'add_file': case 'add_file':
$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document'])); $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
break; break;
case 'status_change': case 'status_change':
$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document'], 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status']))); $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
break; break;
default: default:
$msg = '???'; $msg = '???';