[Vtigercrm-commits] [vtiger-commits] r5031 - in /vtigercrm/trunk: Smarty/templates/salesEditView.tpl modules/Webmails/Save.php modules/Webmails/sendmail.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Sat Apr  8 04:09:56 2006
New Revision: 5031

Log:
re-enabled reply functionality


Modified:
    vtigercrm/trunk/Smarty/templates/salesEditView.tpl
    vtigercrm/trunk/modules/Webmails/Save.php
    vtigercrm/trunk/modules/Webmails/sendmail.php

Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Sat Apr  8 04:09:56 2006
@@ -150,7 +150,11 @@
 							<tr>
 								<td  colspan=4 style="padding:5px">
 								<div align="center">
-								<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small" onclick="this.form.action.value='Save'; displaydeleted(); return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+								{if $MODULE eq 'Webmails'}
+									<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small" onclick="this.form.action.value='Save';this.form.module.value='Webmails';this.form.send_mail.value='true';this.form.record.value='{$ID}'" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+								{else}
+									<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small" onclick="this.form.action.value='Save'; displaydeleted(); return formValidate()" type="submit" name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " style="width:70px" >
+								{/if}
                                 <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}  " style="width:70px">
 								</div>
 								</td>

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Sat Apr  8 04:09:56 2006
@@ -65,7 +65,7 @@
 $focus->save("Emails");
 $return_id = $_REQUEST["mailid"];
 $return_module='Webmails';
-$return_action='DetailView';
+$return_action='ListView';
 
 
 // check for relationships
@@ -98,6 +98,7 @@
 	$emailaddr = $adb->query_result($res,0,'email1');
 	$who = $adb->query_result($res,0,'first_name')." ".$adb->query_result($res,0,'last_name');
 	sendmail($to_address,$cc_address,$bcc_address,$emailaddr,$who,$subject,$msgData);
+	header("Location: index.php?action=$return_action&module=$return_module");
 } else
 	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id");
 

Modified: vtigercrm/trunk/modules/Webmails/sendmail.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/sendmail.php (original)
+++ vtigercrm/trunk/modules/Webmails/sendmail.php Sat Apr  8 04:09:56 2006
@@ -66,30 +66,24 @@
 	$mail->AltBody = strip_tags($tmpBody);
 
 	//header("Location: index.php?action=index&module=Webmails");
-	echo '<table>';
 	for($i=0;$i<count($to_list);$i++) {
 		if($to_list[$i] != ""){
 			$mail->AddAddress($to_list[$i]);
-			echo '<tr><td><font color="red">Added TO: '.$to_list[$i].'</font></td></tr>';
 		}
 	}
 	for($i=0;$i<count($cc_list);$i++) {
 		if($cc_list[$i] != ""){
 			$mail->AddCC($cc_list[$i]);
-			echo '<tr><td><font color="red">Added CC: '.$cc_list[$i].'</font></td></tr>';
 		}
 	}
 	for($i=0;$i<count($bcc_list);$i++) {
 		if($bcc_list[$i] != ""){
 			$mail->AddBCC($bcc_list[$i]);
-			echo '<tr><td><font color="red">Added BCC: '.$bcc_list[$i].'</font></td></tr>';
 		}
 	}
 	$mail->AddBCC = $from;
 	if(!$mail->Send())
 		echo $mail->ErrorInfo;
 
-	echo '</table>';
-	echo "<br><a href='index.php?module=Webmails&action=index'>Back to webmails</a>";
 }
 ?>