Merge branch 'master' of git@github.com:ktgit/knowledgetree

donaldjackson
2 parents d0bf5746 711a0eca
Showing 6 changed files with 313 additions and 43 deletions
lib/email/Email.inc
lib/subscriptions/subscriptions.inc.php
plugins/ktstandard/KTEmail.php
resources/css/kt-framing.css
resources/graphics/ktlogo-topbar-right-transparent.png
templates/kt3/notifications/subscriptions.DownloadDocument.smarty
@@ -8,31 +8,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  */
@@ -49,7 +49,7 @@ class Email {
      * with default system information
      *
      * @param string the sender's email address (optional)
-     * @param string the sender's name (optional)     
+     * @param string the sender's name (optional)
      */
     function Email($sFromEmail = "", $sFromName = "") {
         global $default;
@@ -66,8 +66,8 @@ class Email {
         $this->oMailer->IsHTML(true);
         $this->oMailer->SetLanguage('en', KT_DIR .  '/thirdparty/phpmailer/language/');
         $this->bEmailDisabled = false;
-        
-	$oConfig =& KTConfig::getSingleton();        
+
+	$oConfig =& KTConfig::getSingleton();
 	$sEmailServer = $oConfig->get('email/emailServer');
 	if ($sEmailServer == 'none') {
             $this->bEmailDisabled = true;
@@ -90,7 +90,7 @@ class Email {
 	    $this->oMailer->Password = $sEmailPass;
 	}
     }
-	
+
     /**
      * Sends an email to a specified recipient.
      *
@@ -98,7 +98,7 @@ class Email {
      * @param string the subject of the email
      * @param string the body of the email
      * @param string the sender's email address (optional)
-     * @param string the sender's name (optional)     
+     * @param string the sender's name (optional)
      * @return boolean true on email successfully sent, false otherwise and set $_SESSION["errorMessage"]
      */
     function send($mToEmail, $sSubject, $sBody) {
@@ -106,9 +106,9 @@ class Email {
         	return PEAR::raiseError(_kt("Email is not configured."));
         }
         global $default;
-        
-        if ( (is_string($mToEmail) && (strlen($mToEmail) > 0)) || 
-        	 (is_array($mToEmail) && (count($mToEmail) > 0)) ) {        
+
+        if ( (is_string($mToEmail) && (strlen($mToEmail) > 0)) ||
+        	 (is_array($mToEmail) && (count($mToEmail) > 0)) ) {
 	        $aEmailAddresses = array();
 	        // just one email address, add it
@@ -118,7 +118,7 @@ class Email {
 	        	// if we're passed an array, then use it
 	        	if (is_array($mToEmail)) {
 	        		$aEmailAddresses = $mToEmail;
-	        	// if there are multiple addresses (; separated), explode it	        	
+	        	// if there are multiple addresses (; separated), explode it
 	        	} elseif (strpos($mToEmail, ";") > 0) {
 		            $aEmailAddresses = explode(";", $mToEmail);
 	        	}
@@ -128,9 +128,11 @@ class Email {
 	            }
 	        }
+	        $body = $this->makeEmailTemplate(stripslashes($sBody));
 	        $this->oMailer->Subject = stripslashes($sSubject);
-	        $this->oMailer->Body = stripslashes($sBody);
-	
+//	        $this->oMailer->Body = stripslashes($sBody);
+	        $this->oMailer->Body = $body;
+
 	        //send the email
 	        if(!$this->oMailer->Send()) {
 	            $default->log->error("Error sending mail to $mToEmail; mailer error code=" . $this->oMailer->ErrorInfo);
@@ -160,9 +162,9 @@ class Email {
         	return PEAR::raiseError(_kt("Email is not configured."));
         }
         global $default;
-        
-        if ( (is_string($mToEmail) && (strlen($mToEmail) > 0)) || 
-        	 (is_array($mToEmail) && (count($mToEmail) > 0)) ) {        
+
+        if ( (is_string($mToEmail) && (strlen($mToEmail) > 0)) ||
+        	 (is_array($mToEmail) && (count($mToEmail) > 0)) ) {
 	        // just one email address, add it
 	        if (is_string($mToEmail) && (strpos($mToEmail, ";") === false)) {
@@ -172,7 +174,7 @@ class Email {
 	        	// if we're passed an array, then use it
 	        	if (is_array($mToEmail)) {
 	        		$aEmailAddresses = $mToEmail;
-	        	// if there are multiple addresses (; separated), explode it	        	
+	        	// if there are multiple addresses (; separated), explode it
 	        	} elseif (strpos($mToEmail, ";") > 0) {
 		            $aEmailAddresses = explode(";", $mToEmail);
 	        	}
@@ -182,10 +184,12 @@ class Email {
 	            }
 	        }
+	        $body = $this->makeEmailTemplate(stripslashes($sBody));
 	        $this->oMailer->Subject = stripslashes($sSubject);
-	        $this->oMailer->Body = stripslashes($sBody);
+//	        $this->oMailer->Body = stripslashes($sBody);
+	        $this->oMailer->Body = $body;
 	        $this->oMailer->AddAttachment($sDocumentPath, $sDocumentName);
-	
+
 	        //send the email
 	        if(!$this->oMailer->Send()) {
 	            $default->log->error("Error sending mail to $mToEmail; mailer error code=" . $this->oMailer->ErrorInfo);
@@ -211,7 +215,7 @@ class Email {
     * @param  The hyperlink that should be sent
     *
     * @return boolean true on email successfully sent, false otherwise and set $_SESSION["errorMessage"]
-    * 
+    *
     * @todo check for special characters (including encoding the link correctly???)
     * @todo need to test this on multiple mail clients, not just Outlook
     */
@@ -221,12 +225,15 @@ class Email {
         }
         global $default;
+        $body = $this->makeEmailTemplate(stripslashes($EmailBody).'<br /><br />'.$hyperlink);
+
         //get info from relevant fields.
         $this->oMailer->From = $FromEmail;
         $this->oMailer->FromName = $FromName;
         $this->oMailer->AddAddress($ToEmail);
         $this->oMailer->Subject = stripslashes($Subj);
-        $this->oMailer->Body = stripslashes($EmailBody) . ' ' . $hyperlink;
+//        $this->oMailer->Body = stripslashes($EmailBody) . ' ' . $hyperlink;
+        $this->oMailer->Body = $body;
         //send the email
         if(!$this->oMailer->Send()) {
@@ -236,7 +243,7 @@ class Email {
         return true;
     }
     /**
-    * Sends an email ment for administration, 
+    * Sends an email ment for administration,
     *
     * @param  The sender's email address
     * @param  The sender's Name
@@ -246,7 +253,7 @@ class Email {
     * @param  The hyperlink that should be sent
     *
     * @return boolean true on email successfully sent, false otherwise and set $_SESSION["errorMessage"]
-    * 
+    *
     * @todo check for special characters (including encoding the link correctly???)
     * @todo need to test this on multiple mail clients, not just Outlook
     */
@@ -256,12 +263,15 @@ class Email {
         }
         global $default;
+        $body = $this->makeEmailTemplate(stripslashes($EmailBody) . " <br />" . _kt("This bug can be found on this page") . ": " . "<a href = ". $hyperlink .">". $hyperlink ."</a>");
+
         //get info from relevant fields.
         $this->oMailer->From = $FromEmail;
         $this->oMailer->FromName = $FromName;
         $this->oMailer->AddAddress($ToEmail);
         $this->oMailer->Subject = stripslashes($Subj)  . ' ' . $hyperlink; //only difference from above
-        $this->oMailer->Body = stripslashes($EmailBody) . " <br>" . _kt("This bug can be found on this page") . ": " . "<a href = ". $hyperlink .">". $hyperlink ."</a>";
+//        $this->oMailer->Body = stripslashes($EmailBody) . " <br>" . _kt("This bug can be found on this page") . ": " . "<a href = ". $hyperlink .">". $hyperlink ."</a>";
+        $this->oMailer->Body = $body;
         //send the email
         if(!$this->oMailer->Send()) {
@@ -277,12 +287,14 @@ class Email {
         }
         global $default;
+        $body = $this->makeEmailTemplate(stripslashes($EmailBody));
+
         //get info from relevant fields.
         $this->oMailer->From = $FromEmail;
         $this->oMailer->FromName = $FromName;
         $this->oMailer->AddAddress($ToEmail);
         $this->oMailer->Subject = stripslashes($Subj);
-        $this->oMailer->Body = stripslashes($EmailBody);
+        $this->oMailer->Body = $body;
         //send the email
         if(!$this->oMailer->Send()) {
@@ -291,6 +303,48 @@ class Email {
         }
         return true;
     }
-}
-?>
+    /*
+    * This method builds the email template
+    *
+ 	* @author KnowledgeTree Team
+	* @access public
+	* @param string $email The email to be sent
+	* @return string $str The html string that will be sent via email
+	*/
+    public function makeEmailTemplate($email)
+    {
+        $rootUrl = KTUtil::kt_url();
+
+        $oKTConfig =& KTConfig::getSingleton();
+	    $mainLogo = $oKTConfig->get('mainLogo');
+	    $appName = $oKTConfig->get('appName');
+	    $companyLogoTitle = $oKTConfig->get('companyLogoTitle');
+	    $mainLogoTitle = $oKTConfig->get('mainLogoTitle');
+
+	    if($mainLogo != ''){
+            $logo = '<img src="'.$mainLogo.'" class="primary" alt="'.$companyLogoTitle.'" title="'.$mainLogoTitle.'"/>';
+	    }else{
+            $logo = '<img src="'.$rootUrl.'/resources/graphics/ktlogo-topbar-right-transparent.png" class="primary" title="'.$appName.'" height="44" width="252"/>';
+	    }
+
+        $str = '<html>
+                    <body>
+                        <table border="1" cellpadding="5" width="100%" height="100">
+                            <tr style="background-color:LightGrey">
+                                <td>
+                                    '.$logo.'
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    '.$email.'
+                                </td>
+                            </tr>
+                        </table>
+                    </body>
+                </html>';
+        return $str;
+    }
+}
+?>
 \ No newline at end of file
@@ -431,10 +431,171 @@ class SubscriptionContent {
         );
 	}
+	/**
+	* This function generates the email that will be sent for subscription notifications
+	*
+ 	* @author KnowledgeTree Team
+	* @access public
+	* @param object $oKTNotification: The notification object
+	* @return string $str: The html string that will be sent via email
+	*/
 	function getEmailAlertContent($oKTNotification) {
-	    // we can re-use the normal template.
+        // set up logo and title
+        $rootUrl = KTUtil::kt_url();
+
+        $info = $this->_getSubscriptionData($oKTNotification);
+
+        // set up email text
+        $addFolderText = _kt('The folder "').$info['object_name']._kt('" was added');
+        $removeSubscribedFolderText = _kt('The folder "').$info['object_name']._kt('" to which you were subscribed, has been removed');
+        $removeChildFolderText = _kt('The folder "').$info['object_name']._kt('" has been removed');
+        $addDocumentText = _kt('The document "').$info['object_name']._kt('" was added');
+        $removeSubscribedDocumentText = _kt('The document "').$info['object_name']._kt('" to which you were subscribed, has been removed');
+        $removeChildDocumentText = _kt('The document "').$info['object_name']._kt('" has been removed');
+        $modifyDocumentText = _kt('The document "').$info['object_name']._kt('" has been changed');
+        $checkInDocumentText = _kt('The document "').$info['object_name']._kt('" has been checked in');
+        $checkOutDocumentText = _kt('The document "').$info['object_name']._kt('" has been checked out');
+        $moveDocumentText = _kt('The document "').$info['object_name']._kt('" has been moved');
+        $copiedDocumentText = _kt('The document "').$info['object_name']._kt('" has been copied');
+        $archivedDocumentText = _kt('The document "').$info['object_name']._kt('"');
+        $restoreArchivedDocumentText = _kt('The document "').$info['object_name']._kt('" has been restored by an administrator');
+        $downloadDocumentText = _kt('The document "').$info['object_name']._kt('"');
+        $documentAlertText = _kt('An alert on the document "').$info['object_name']._kt('" has been added or modified');
+
+        if($info['location_name'] !== NULL){
+            $addFolderText .= _kt(' to "').$info['location_name']._kt('"');
+            $removeChildFolderText .= _kt(' from the folder "').$info['location_name']._kt('"');
+            $addDocumentText .= _kt(' to "').$info['location_name']._kt('"');
+            $removeChildDocumentText .= _kt(' from the folder "').$info['location_name']._kt('" to which you are subscribed');
+            $modifyDocumentText .= _kt(' in the folder "').$info['location_name']._kt('"');
+            $checkInDocumentText .= _kt(', in the folder "').$info['location_name']._kt('"');
+            $checkOutDocumentText .= _kt(', from the folder "').$info['location_name']._kt('"');
+            $moveDocumentText .= _kt(' to the folder "').$info['location_name']._kt('"');
+            $copiedDocumentText .= _kt(' to the folder "').$info['location_name']._kt('"');
+            $archivedDocumentText .= _kt(' in the folder "').$info['location_name']._kt('" has been archived');
+            $downloadDocumentText .= _kt(' in the folder "').$info['location_name']._kt('" has been downloaded');
+            $documentAlertText .= _kt(' in the folder "').$info['location_name']._kt('"');
+        }
+
+        // set up links
+        switch($info['event_type']){
+            case 'AddFolder':
+                $text = $addFolderText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View New Folder').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'RemoveSubscribedFolder':
+                $text = $removeSubscribedFolderText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links = '<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'RemoveChildFolder':
+                $text = $removeChildFolderText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Folder').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'AddDocument':
+                $text = $addDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'RemoveSubscribedDocument':
+                $text = $removeSubscribedDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links = '<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'RemoveChildDocument':
+                $text = $removeChildDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links = '<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'ModifyDocument':
+                $text = $modifyDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'CheckInDocument':
+                $text = $checkInDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'CheckOutDocument':
+                $text = $checkOutDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'MovedDocument':
+                $text = $modifyDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View New Location').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'CopiedDocument':
+                $text = $copiedDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'ArchivedDocument':
+                $text = $archivedDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links = '<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'RestoreArchivedDocument':
+                $text = $restoreArchivedDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'DownloadDocument':
+                $text = $downloadDocumentText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                break;
+            case 'ModifyDocumentAlert':
+                $text = $documentAlertText;
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'];
+                $links = '<a href="'.$url.'">'._kt('View Document').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=clear';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('Clear Alert').'</a>';
+                $url = $rootUrl.'/notify.php?id='.$info['notify_id'].'&notify_action=viewall';
+                $links .= '&#160;|&#160;<a href="'.$url.'">'._kt('View all alerts on this document').'</a>';
+        }
+
+        if($info['actor_name'] !== NULL && $info['event_type'] != 'RestoredArchivedDocument'){
+            $text .= _kt(', by ').$info['actor_name'];
+        }
+
+        // we can re-use the normal template.
 		// however, we need to wrap it - no need for a second template here.
-		$str = '<html><body>' . $this->getNotificationAlertContent($oKTNotification) . '</body></html>';
+		//$str = '<html><body>' . $this->getNotificationAlertContent($oKTNotification) . '</body></html>';
+		$str = '<br />
+		          &#160;&#160;&#160;&#160;<b>'._kt('Subscription notification').': '.$this->_eventTypeNames[$info['event_type']].'</b>
+		          <br />
+		          <br />
+		          &#160;&#160;&#160;&#160;'.$text.'
+		          <br />
+		          <br />
+		          &#160;&#160;&#160;&#160;'.$links.'
+		          <br />
+		          <br />';
 		return $str;
 	}
@@ -450,7 +611,7 @@ class SubscriptionContent {
 	    $oTemplate = $oTemplating->loadTemplate("kt3/notifications/subscriptions." . $info['event_type']);
 	    // if, for some reason, this doesn't actually work, use the "generic" title.
 	    if (PEAR::isError($oTemplate)) {
-		$oTemplate = $oTemplating->loadTemplate("kt3/notifications/subscriptions.generic");
+            $oTemplate = $oTemplating->loadTemplate("kt3/notifications/subscriptions.generic");
 	    }
 	    // FIXME we need to specify the i18n by user.
@@ -487,7 +648,9 @@ class SubscriptionContent {
 	function _getSubscriptionData($oKTNotification) {
-		$info = array(
+        $appName = APP_NAME;
+
+        $info = array(
 			'object_name' => $oKTNotification->getLabel(),
 			'event_type' => $oKTNotification->getStrData1(),
 			'location_name' => $oKTNotification->getStrData2(),
@@ -497,7 +660,9 @@ class SubscriptionContent {
 			'notify_id' => $oKTNotification->getId(),
 		);
-		$info['title'] = KTUtil::arrayGet($this->_eventTypeNames, $info['event_type'], 'Subscription alert:') .': ' . $info['object_name'];
+//		$info['title'] = KTUtil::arrayGet($this->_eventTypeNames, $info['event_type'], 'Subscription alert:') .': ' . $info['object_name'];
+        $info['title'] = $appName.': '._kt('Subscription notification for').' "'.$info['object_name'].'" - '.$this->_eventTypeNames[$info['event_type']];
+
 		if ($info['actor_id'] !== null) {
 			$oTempUser = User::get($info['actor_id']);
@@ -140,6 +140,7 @@ function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sCo
     $oSendingUser = User::get($_SESSION['userID']);
     // Create email content
+/*
     $sMessage = '<font face="arial" size="2">';
 	$sMessage .= sprintf(_kt("Your colleague, %s, wishes you to view the document entitled '%s'."), $oSendingUser->getName(), $sDocumentName);
 	$sMessage .= " \n";
@@ -148,6 +149,25 @@ function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sCo
 	$sMsgEnd .= '</font>';
 	$sTitle = sprintf(_kt("Link (ID %s): %s from %s"), $iDocumentID, $sDocumentName, $oSendingUser->getName());
+*/
+	$sTitle = sprintf(_kt("%s wants to share a document using KnowledgeTree"), $oSendingUser->getName());
+
+	$sMessage = '<br>
+	               &#160;&#160;&#160;&#160;'._kt('Hello').',
+	               <br />
+	               <br />
+	               &#160;&#160;&#160;&#160;'.sprintf(_kt('A KnowledgeTree user, %s, wants to share a document with you entitled "%s".'), $oSendingUser->getName(), $sDocumentName).'
+	               <br />
+	               <br />
+	               &#160;&#160;&#160;&#160;<b>'._kt('Message').':</b>
+	               <br />
+	               <br />
+	               &#160;&#160;&#160;&#160;'.$sComment.'
+	               <br />
+	               <br />
+	               &#160;&#160;&#160;&#160;'._kt('<b>KnowledgeTree is easy to use open source document management software</b><br />&#160;&#160;&#160;&#160;that helps businesses collaborate, securely store all critical documents, address<br />&#160;&#160;&#160;&#160;compliance challenges, and improve business processes.').'
+	               <br />
+	               <br />';
 	$sEmail = null;
     $sEmailFrom = null;
@@ -172,9 +192,13 @@ function sendExternalEmails($aEmailAddresses, $iDocumentID, $sDocumentName, $sCo
             $oDownloadManager->set_session($session);
             $link = $oDownloadManager->allow_download($iDocumentID);
-            $link = "<a href=\"{$link}\">{$link}</a>";
+//            $link = "<a href=\"{$link}\">{$link}</a>";
+            $links = '&#160;&#160;&#160;&#160;<a href="http://www.knowledgetree.com/products">'._kt('Learn More').'</a>';
+            $links.= "&#160;|&#160;<a href=\"{$link}\">"._kt('View Document')."</a>";
+            $links .= '&#160;|&#160;<a href="http://www.knowledgetree.com/node/39">'._kt('Download Free Trial').'</a><br /><br />';
-            $sMsg = $sMessage.$link.$sMsgEnd;
+//            $sMsg = $sMessage.$link.$sMsgEnd;
+            $sMsg = $sMessage.$links;
             $res = $oEmail->send(array($sAddress), $sTitle, $sMsg);
             if (PEAR::isError($res)) {
@@ -52,8 +52,8 @@ body
     min-height: 800px;
     min-width: 600px;
     height: auto;
-    background-image: url(../../resources/graphics/page_bg.png);
-    background-repeat: repeat-x;
+/*    background-image: url(../../resources/graphics/page_bg.png);*/
+/*    background-repeat: repeat-x;*/
     z-index: 1;
 }
+<dt class="actionitem subscription">{$info.title|sanitize}</dt>
+<dd class="actionmessage">
+
+<!-- could break this up. -->
+    {i18n arg_object_name=$info.object_name|sanitize}The document "#object_name#" {/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}in the folder "#location_name#" has been downloaded {/i18n}{/if}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
+    <div class="actionoptions">
+        <div style="float:left; position: relative;">
+            {if !$is_broken}
+            <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
+            {else}
+            <span class="descriptiveText">{i18n}Document is no longer available{/i18n}</span>
+            {/if}
+
+            &nbsp;|&nbsp;
+
+        </div>
+        <div>
+
+            <a href="{ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}"
+                 kt:deleteMessage="{i18n}Are you sure you wish to clear the notification?{/i18n}">
+            <span class="ktAction ktInline ktDelete"></span>{i18n}Clear Alert{/i18n}
+
+            </a>
+
+        </div>
+    </div>
+</dd>