[Vtigercrm-commits] [vtiger-commits] r6614 - in /vtigercrm/trunk: Smarty/templates/ListView.tpl modules/Emails/EditView.php modules/Settings/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Sun May 28 06:33:25 2006
New Revision: 6614

Log:
internal mailer complete for list views

Modified:
    vtigercrm/trunk/Smarty/templates/ListView.tpl
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Sun May 28 06:33:25 2006
@@ -424,7 +424,7 @@
         var url;
         switch(type) {
                 case 'record_id':
-			url = 'index.php?module=Emails&action=EmailsAjax&internal_mailer=true&type='+type+'&record='+record_id+'&file=EditView';
+			url = 'index.php?module=Emails&action=EmailsAjax&internal_mailer=true&type='+type+'&record=&rec_id='+record_id+'&file=EditView';
                 break;
         }
 

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Sun May 28 06:33:25 2006
@@ -81,6 +81,32 @@
 	$focus->mode = '';
 }
 
+// INTERNAL MAILER
+if($_REQUEST["internal_mailer"] == "true") {
+	$smarty->assign('INT_MAILER',"true");
+	$rec_type = $_REQUEST["type"];
+	$rec_id = $_REQUEST["rec_id"];
+
+	if($rec_type == "record_id") {
+		$rs = $adb->query("select setype from crmentity where crmid='".$rec_id."'");
+		$type = $adb->query_result($rs,0,'setype');
+
+		if($type == "Leads") 
+			$q = "select email as email1 from leaddetails where leadid='".$rec_id."'";
+		elseif ($type == "Contacts")
+			$q = "select email as email1 from contactdetails where contactid='".$rec_id."'";
+		elseif ($type == "Accounts")
+			$q = "select email1,email2 from account where accountid='".$rec_id."'";
+
+		$email1 = $adb->query_result($adb->query($q),0,"email1");
+	} elseif ($rec_type == "email_addy") {
+		$email1 = $_REQUEST["email_addy"];
+	}
+
+	$smarty->assign('TO_MAIL',$email1);
+	$smarty->assign('BCC_MAIL',$current_user->email1);
+}
+
 // Webmails
 if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != "") {
 	$mailid = $_REQUEST["mailid"];
@@ -245,6 +271,6 @@
 	oFCKeditor.BasePath  = "include/fckeditor/" ;
 	oFCKeditor.Height = 500;
 	oFCKeditor.Width = "100%";
-	oFCKeditor.ReplaceTextarea() ;
+	oFCKeditor.ReplaceTextarea();
 });
 </script>

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Sun May 28 06:33:25 2006
@@ -485,6 +485,8 @@
 'LBL_TLS'=>'TLS',
 'LBL_NO_TLS'=>'No TLS',
 'LBL_CERT_VAL'=>'Certificate Validations',
+'LBL_INT_MAILER'=>'Internal Mailer',
+'LBL_INT_MAILER_USE'=>'Use Internal Mailer',
 'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
 'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
 'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',