[Vtigercrm-commits] [vtiger-commits] r7950 - in /branches/VTIGERCRM-5.0.2-MMBRICH: Smarty/templates/ modules/Campaigns/ modules/CommSystem/ modules/ListManager/ themes/blue/images/

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Tue Jul 11 02:27:34 2006
New Revision: 7950

Log:
begining of list management and bulk mailing system

Added:
    branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions.tpl   (with props)
    branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActionsContent.tpl
    branches/VTIGERCRM-5.0.2-MMBRICH/Smarty/templates/CampaignActions_Emails_Step1.tpl
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/CampaignListActions.php
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/CampaignListManager.php
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/ListManager/
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/ListManager/index.php
    branches/VTIGERCRM-5.0.2-MMBRICH/themes/blue/images/Logout.gif   (with props)
Modified:
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/LoadList.php
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/updateRelations.php
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php

Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/LoadList.php
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/LoadList.php (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/LoadList.php Tue Jul 11 02:27:34 2006
@@ -6,13 +6,16 @@
 $listquery = getListQuery($_REQUEST["list_type"]);
 $rs = $adb->query($cvObj->getModifiedCvListQuery($_REQUEST["cvid"],$listquery,$_REQUEST["list_type"]));
 
-if($_REQUEST["list_type"] == "Leads")
+if($_REQUEST["list_type"] == "Leads") {
 		$reltable = "vtiger_campaignleadrel";
-elseif($_REQUEST["list_type"] == "Contacts")
+		$excludetable = "vtiger_leaddetails";
+} elseif($_REQUEST["list_type"] == "Contacts") {
 		$reltable = "vtiger_campaigncontrel";
+		$excludetable = "vtiger_contactdetails";
+}
 
 while($row=$adb->fetch_array($rs)) {
-	$adb->query("INSERT INTO ".$reltable." VALUES('".$_REQUEST["return_id"]."','".$row["crmid"]."')");
+	$adb->query("INSERT INTO ".$reltable." VALUES('".$_REQUEST["return_id"]."','".$row["crmid"]."','0')");
 }
 
 ?>

Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/updateRelations.php
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/updateRelations.php (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Campaigns/updateRelations.php Tue Jul 11 02:27:34 2006
@@ -33,9 +33,9 @@
 	{
 		if($id != '')
 		{
-		    $sql = "insert into  ".$rel_table." values(".$_REQUEST["parentid"]." , ".$id.")";
+		    $sql = "insert into  ".$rel_table." values('".$_REQUEST["parentid"]."' , '".$id."','0')";
 	            $adb->query($sql);
-		    $sql = "update ".$mod_table." set campaignid = ".$_REQUEST["parentid"]." where ".$mod_field." = ".$id;
+		    $sql = "update ".$mod_table." set campaignid = '".$_REQUEST["parentid"]."' where '".$mod_field."' = '".$id."'";
                     $adb->query($sql);
 		}
 	}
@@ -43,7 +43,7 @@
 }
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {	
-		$sql = "insert into ".$rel_table." values(".$_REQUEST["parid"].",".$_REQUEST["entityid"].")";
+		$sql = "insert into ".$rel_table." values('".$_REQUEST["parid"]."','".$_REQUEST["entityid"]."','0')";
 		$adb->query($sql);
 		$sql = "update ".$mod_table." set campaignid = ".$_REQUEST["parid"]." where ".$mod_field." = ".$_REQUEST["entityid"];
                 $adb->query($sql);

Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/CommSystem/CommSystem.php Tue Jul 11 02:27:34 2006
@@ -125,9 +125,9 @@
 
 			// get the last 5 minutes worth of messages
 			if($m <= 04)
-				$m=(($m-05)+60);
+				$m=(($m-5)+60);
 			else
-				$m=($m-05);
+				$m=($m-5);
 
 			$pastdate = $ymd." ".$h.":".$m.":".$s;
 		}