Peter M. Groen / knowledgetree

Commit 1d1d52465b137daf6749944d3e6d53d531892a6a

Authored by michael
1 parent 55a2991a

added optional comment, username and document title in email title (fixes #2593) 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2284 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 11 additions and 7 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php
  View file @1d1d524
@@ -42,9 +42,16 @@ if (checkSession()) { @@ -42,9 +42,16 @@ if (checkSession()) {
42 // add the link to the document to the mail 42 // add the link to the document to the mail
43 $sMessage .= ' ' . generateControllerLink("viewDocument", "fDocumentID=$fDocumentID", $oDocument->getName()); 43 $sMessage .= ' ' . generateControllerLink("viewDocument", "fDocumentID=$fDocumentID", $oDocument->getName());
44 44
  45 + // add optional comment
  46 + if (strlen($fComment) > 0) {
  47 + $sMessage .= "<br><br>$fComment";
  48 + }
  49 +
  50 + $sTitle = "Link: " . $oDocument->getName() . " from " . $oUser->getName();
  51 +
45 //email the hyperlink 52 //email the hyperlink
46 - $oEmail = new Email();  
47 - $oEmail->send($fToEmail, "Document link", $sMessage); 53 + $oEmail = new Email();
  54 + $oEmail->send($fToEmail, $sTitle, $sMessage);
48 55
49 //go back to the document view page 56 //go back to the document view page
50 redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID"); 57 redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID");
presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
  View file @1d1d524
@@ -44,7 +44,7 @@ function getDocumentEmailPage($oDocument,$oUserArray) { @@ -44,7 +44,7 @@ function getDocumentEmailPage($oDocument,$oUserArray) {
44 $sToRender .= "<OPTION value=\"1\">\n"; 44 $sToRender .= "<OPTION value=\"1\">\n";
45 $sToRender .= "Select Recipient</OPTION>\n"; 45 $sToRender .= "Select Recipient</OPTION>\n";
46 for ($i = 0; $i < count($oUserArray); $i++) { 46 for ($i = 0; $i < count($oUserArray); $i++) {
47 - if(strlen($oUserArray[$i]->getEmail())>0){ // if an amil address exists 47 + if(strlen($oUserArray[$i]->getEmail())>0){ // if an email address exists
48 $sToRender .= "<OPTION value=\"" . $oUserArray[$i]->getEmail() . "\" onclick=\"javascript: getObject(\"fToEmail\").value=getObject(\"fToEmail\").value + ';'\" >\n"; 48 $sToRender .= "<OPTION value=\"" . $oUserArray[$i]->getEmail() . "\" onclick=\"javascript: getObject(\"fToEmail\").value=getObject(\"fToEmail\").value + ';'\" >\n";
49 $sToRender .= $oUserArray[$i]->getName(); 49 $sToRender .= $oUserArray[$i]->getName();
50 $sToRender .= "</OPTION>\n"; 50 $sToRender .= "</OPTION>\n";
@@ -54,6 +54,7 @@ function getDocumentEmailPage($oDocument,$oUserArray) { @@ -54,6 +54,7 @@ function getDocumentEmailPage($oDocument,$oUserArray) {
54 $sToRender .= "<tr><td>Email Addresses:</td><td><input type=\"text\" name=\"fToEmail\" style=\"width:270\"/></td><td><img src=\"$default->graphicsUrl/widgets/clear.gif\" onMouseDown=\"var oTemp = getObject('fToEmail'); oTemp.value=''; oTemp = getObject('UserSelect'); oTemp.selectedIndex=0;\" onmouseover=\"this.style.cursor='hand'\"></td></tr>\n"; 54 $sToRender .= "<tr><td>Email Addresses:</td><td><input type=\"text\" name=\"fToEmail\" style=\"width:270\"/></td><td><img src=\"$default->graphicsUrl/widgets/clear.gif\" onMouseDown=\"var oTemp = getObject('fToEmail'); oTemp.value=''; oTemp = getObject('UserSelect'); oTemp.selectedIndex=0;\" onmouseover=\"this.style.cursor='hand'\"></td></tr>\n";
55 55
56 $sToRender .= "<tr><td></td><td>(separate multiple addresses with a semicolon)</td></tr>"; 56 $sToRender .= "<tr><td></td><td>(separate multiple addresses with a semicolon)</td></tr>";
  57 + $sToRender .= "<tr><td>Comment</td><td><textarea rows=\"5\" cols=\"30\" name=\"fComment\"></textarea></td></tr>\n";
57 $sToRender .= "<tr><td>&nbsp</td><td>&nbsp</td></tr>\n"; 58 $sToRender .= "<tr><td>&nbsp</td><td>&nbsp</td></tr>\n";
58 $sToRender .= "<tr><td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/email.gif\" border=\"0\"/></td><td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/></a></td></tr></table></td>\n"; 59 $sToRender .= "<tr><td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/email.gif\" border=\"0\"/></td><td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/></a></td></tr></table></td>\n";
59 $sToRender .= "</table>\n"; 60 $sToRender .= "</table>\n";
@@ -61,12 +62,8 @@ function getDocumentEmailPage($oDocument,$oUserArray) { @@ -61,12 +62,8 @@ function getDocumentEmailPage($oDocument,$oUserArray) {
61 $sToRender .= "function getObject(sObjName){\n"; //Function to return an html object(Netscape 4.7 compatable) 62 $sToRender .= "function getObject(sObjName){\n"; //Function to return an html object(Netscape 4.7 compatable)
62 $sToRender .= " var oSelect;\n"; 63 $sToRender .= " var oSelect;\n";
63 $sToRender .= " oSelect = document.forms[0].elements[sObjName];"; 64 $sToRender .= " oSelect = document.forms[0].elements[sObjName];";
64 - $sToRender .= " //alert(document.forms[0].elements[sObjName].value);\n";  
65 $sToRender .= " return oSelect;\n"; 65 $sToRender .= " return oSelect;\n";
66 $sToRender .= "}\n"; 66 $sToRender .= "}\n";
67 - $sToRender .= "function ftest(){\n";  
68 - $sToRender .= " alert('Wsup!');";  
69 - $sToRender .= "}\n";  
70 $sToRender .= "</script >\n"; 67 $sToRender .= "</script >\n";
71 return $sToRender; 68 return $sToRender;
72 } 69 }