[Vtigercrm-commits] [vtiger-commits] r6612 - in /vtigercrm/trunk: Smarty/templates/AddMailAccount.tpl modules/Settings/AddMailAccount.php modules/Settings/SaveMailAccount.php schema/DatabaseSchema.xml

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Sun May 28 06:11:53 2006
New Revision: 6612

Log:
new "Internal Mailer" feature

Modified:
    vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
    vtigercrm/trunk/modules/Settings/AddMailAccount.php
    vtigercrm/trunk/modules/Settings/SaveMailAccount.php
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Sun May 28 06:11:53 2006
@@ -124,6 +124,13 @@
            <td class="dvtCellInfo">&nbsp;</td>
        </tr>
        <tr>
+           <td class="dvtCellLabel" align="right">{$MOD.LBL_INT_MAILER}</td>
+           <td class="dvtCellInfo">
+		<input type="radio" name="int_mailer" value="1" {$INT_MAILER} />&nbsp;{$MOD.LBL_INT_MAILER_USE}
+	   </td>	
+           <td class="dvtCellInfo">&nbsp;</td>
+       </tr>
+       <tr>
            <td class="dvtCellLabel" align="right">{$MOD.LBL_REFRESH_TIMEOUT}</td>
            <td class="dvtCellInfo">
 		<select value="{$BOX_REFRESH}" name="box_refresh">

Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/AddMailAccount.php Sun May 28 06:11:53 2006
@@ -16,11 +16,6 @@
 global $app_strings;
 global $app_list_strings;
 global $current_user;
-
-/*
-echo '<br>';
-echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : '.$mod_strings['LBL_ADD_MAIL_ACCOUNT'], true);
-echo '<br><br>';*/
 
 global $adb;
 global $theme;
@@ -77,6 +72,9 @@
 			if(strtolower($temprow['sslmeth']) == "novalidate-cert")
 				$smarty->assign("NOVALIDATECERT", "CHECKED");
 
+			if($temprow['int_mailer'] == "1")
+				$smarty->assign("INT_MAILER", "CHECKED");
+
 		}
 	}
 }	

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Sun May 28 06:11:53 2006
@@ -33,12 +33,12 @@
 
 if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='')
 {
-	$sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', showbody='no' where user_id = '".$id."'";
+	$sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
 }
 else
 {
 	$account_id = $adb->getUniqueID("mail_accounts");
-	$sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', 'no','1','0')";
+	$sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
 }
 
 $adb->query($sql);

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Sun May 28 06:11:53 2006
@@ -3277,7 +3277,9 @@
 		<field name="mails_per_page" type="I" size="10" />
 		<field name="ssltype" type="C" size="50" />
 		<field name="sslmeth" type="C" size="50" />
-		<field name="showbody" type="C" size="10" />
+		<field name="int_mailer" type="I" size="1">
+			<default value="0" />
+		</field>
 		<field name="status" type="C" size="10" />
 		<field name="set_default" type="I" size="2" />
 	</table>