Peter M. Groen / knowledgetree

Commit 659d7a98c67dd4206519ab57aa42394fe65b9466

Authored by Michael Joseph
1 parent f22e4c31

removed owl prefix from table aliases 

corrected email call


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2552 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php
  View file @659d7a9
@@ -83,7 +83,7 @@ if (checkSession()) { @@ -83,7 +83,7 @@ if (checkSession()) {
83 $oUser = User::get($fUserID); 83 $oUser = User::get($fUserID);
84 84
85 $sBody = "You have been assigned the role of '" . $oRole->getName() . "' in the collaboration process for the document entitled '" . $oDocument->getName() . "'. You will be informed when your role becomes active"; 85 $sBody = "You have been assigned the role of '" . $oRole->getName() . "' in the collaboration process for the document entitled '" . $oDocument->getName() . "'. You will be informed when your role becomes active";
86 - $oEmail->send($oUser->getEmail(), "Assigment of role in document collaboration process", $sBody, $default->owl_email_from, $default->owl_email_fromname); 86 + $oEmail->send($oUser->getEmail(), "Assigment of role in document collaboration process", $sBody);
87 87
88 //go back to the document view page 88 //go back to the document view page
89 controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting"); 89 controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting");
@@ -131,7 +131,7 @@ if (checkSession()) { @@ -131,7 +131,7 @@ if (checkSession()) {
131 function getFolderCollaborationArray($fFolderCollaborationID, $fDocumentID) { 131 function getFolderCollaborationArray($fFolderCollaborationID, $fDocumentID) {
132 global $default; 132 global $default;
133 $sQuery = "SELECT GFL.group_id AS group_id, GFL.folder_id AS folder_id, GFL.precedence AS precedence, GFL.role_id, COALESCE(U.id, U2.id) AS user_id " . 133 $sQuery = "SELECT GFL.group_id AS group_id, GFL.folder_id AS folder_id, GFL.precedence AS precedence, GFL.role_id, COALESCE(U.id, U2.id) AS user_id " .
134 - "FROM $default->owl_groups_folders_approval_table AS GFL LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFL.id AND FURL.document_id = $fDocumentID " . 134 + "FROM $default->groups_folders_approval_table AS GFL LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFL.id AND FURL.document_id = $fDocumentID " .
135 "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " . 135 "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " .
136 "LEFT OUTER JOIN users AS U2 ON GFL.user_id = U2.id " . 136 "LEFT OUTER JOIN users AS U2 ON GFL.user_id = U2.id " .
137 "WHERE GFL.id = $fFolderCollaborationID"; 137 "WHERE GFL.id = $fFolderCollaborationID";