adamjakab / SuiteCRM

modules/Campaigns/GenerateWebToLeadForm.php

Spacing +184 added lines, -184 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,7 +55,7 @@ 
 
 
 
-global $app_list_strings, $app_strings,$mod_strings;
+global $app_list_strings, $app_strings, $mod_strings;
 
 $site_url = $sugar_config['site_url'];
 $web_form_header = $mod_strings['LBL_LEAD_DEFAULT_HEADER'];
@@ -72,47 +72,47 @@ 
 $web_form_footer = '';
 $regex = "/^\w+(['\.\-\+]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,})+\$/";
 //_ppd($web_required_symbol);
-if(!empty($_REQUEST['web_header'])){
-    $web_form_header= $_REQUEST['web_header'];
+if (!empty($_REQUEST['web_header'])) {
+    $web_form_header = $_REQUEST['web_header'];
 }
-if(!empty($_REQUEST['web_description'])){
-    $web_form_description= $_REQUEST['web_description'];
+if (!empty($_REQUEST['web_description'])) {
+    $web_form_description = $_REQUEST['web_description'];
 }
-if(!empty($_REQUEST['web_submit'])){
-    $web_form_submit_label=to_html($_REQUEST['web_submit']);
+if (!empty($_REQUEST['web_submit'])) {
+    $web_form_submit_label = to_html($_REQUEST['web_submit']);
 }
-if(!empty($_REQUEST['post_url'])){
-    $web_post_url= $_REQUEST['post_url'];
+if (!empty($_REQUEST['post_url'])) {
+    $web_post_url = $_REQUEST['post_url'];
 }
-if(!empty($_REQUEST['redirect_url']) && $_REQUEST['redirect_url'] !="http://"){
-    $web_redirect_url= $_REQUEST['redirect_url'];
+if (!empty($_REQUEST['redirect_url']) && $_REQUEST['redirect_url'] != "http://") {
+    $web_redirect_url = $_REQUEST['redirect_url'];
 }
-if(!empty($_REQUEST['notify_campaign'])){
+if (!empty($_REQUEST['notify_campaign'])) {
     $web_notify_campaign = $_REQUEST['notify_campaign'];
 }
-if(!empty($_REQUEST['web_footer'])){
-    $web_form_footer= $_REQUEST['web_footer'];
+if (!empty($_REQUEST['web_footer'])) {
+    $web_form_footer = $_REQUEST['web_footer'];
 }
-if(!empty($_REQUEST['campaign_id'])){
-    $web_form_campaign= $_REQUEST['campaign_id'];
+if (!empty($_REQUEST['campaign_id'])) {
+    $web_form_campaign = $_REQUEST['campaign_id'];
 }
-if(!empty($_REQUEST['assigned_user_id'])){
+if (!empty($_REQUEST['assigned_user_id'])) {
     $web_assigned_user = $_REQUEST['assigned_user_id'];
 }
 
 
  $lead = new Lead();
  $fieldsMetaData = new FieldsMetaData();
- $xtpl=new XTemplate ('modules/Campaigns/WebToLeadForm.html');
+ $xtpl = new XTemplate('modules/Campaigns/WebToLeadForm.html');
  $xtpl->assign("MOD", $mod_strings);
  $xtpl->assign("APP", $app_strings);
  $Web_To_Lead_Form_html = '';
- $Web_To_Lead_Form_html .='<link rel="stylesheet" type="text/css" media="all" href="' . getJSPath(SugarThemeRegistry::current()->getCSSURL('calendar-win2k-cold-1.css')) . '">';
+ $Web_To_Lead_Form_html .= '<link rel="stylesheet" type="text/css" media="all" href="'.getJSPath(SugarThemeRegistry::current()->getCSSURL('calendar-win2k-cold-1.css')).'">';
 
- $Web_To_Lead_Form_html .= "<script type=\"text/javascript\" src='" . getJSPath($site_url.'/cache/include/javascript/sugar_grp1.js') . "'></script>";
- $Web_To_Lead_Form_html .= '<script type="text/javascript" src="' . getJSPath($site_url.'/cache/include/javascript/calendar.js') . '"></script>';
+ $Web_To_Lead_Form_html .= "<script type=\"text/javascript\" src='".getJSPath($site_url.'/cache/include/javascript/sugar_grp1.js')."'></script>";
+ $Web_To_Lead_Form_html .= '<script type="text/javascript" src="'.getJSPath($site_url.'/cache/include/javascript/calendar.js').'"></script>';
 
- $Web_To_Lead_Form_html .="<form action='$web_post_url' name='WebToLeadForm' method='POST' id='WebToLeadForm'>";
+ $Web_To_Lead_Form_html .= "<form action='$web_post_url' name='WebToLeadForm' method='POST' id='WebToLeadForm'>";
  $Web_To_Lead_Form_html .= "<table width='100%' style='border-top: 1px solid;
 border-bottom: 1px solid;
 padding: 10px 6px 12px 10px;
@@ -128,161 +128,161 @@ 
 
  //$Web_To_Lead_Form_html .= "\n<p>\n";
 
-if(!empty($_REQUEST['colsFirst']) && !empty($_REQUEST['colsSecond'])){
- if(count($_REQUEST['colsFirst']) < count($_REQUEST['colsSecond'])){
-   $columns= count($_REQUEST['colsSecond']);
+if (!empty($_REQUEST['colsFirst']) && !empty($_REQUEST['colsSecond'])) {
+ if (count($_REQUEST['colsFirst']) < count($_REQUEST['colsSecond'])) {
+   $columns = count($_REQUEST['colsSecond']);
  }
- if(count($_REQUEST['colsFirst']) > count($_REQUEST['colsSecond']) || count($_REQUEST['colsFirst']) == count($_REQUEST['colsSecond'])){
-   $columns= count($_REQUEST['colsFirst']);
+ if (count($_REQUEST['colsFirst']) > count($_REQUEST['colsSecond']) || count($_REQUEST['colsFirst']) == count($_REQUEST['colsSecond'])) {
+   $columns = count($_REQUEST['colsFirst']);
  }
 }
-else if(!empty($_REQUEST['colsFirst'])){
- $columns= count($_REQUEST['colsFirst']);
+else if (!empty($_REQUEST['colsFirst'])) {
+ $columns = count($_REQUEST['colsFirst']);
 }
-else if(!empty($_REQUEST['colsSecond'])){
- $columns= count($_REQUEST['colsSecond']);
+else if (!empty($_REQUEST['colsSecond'])) {
+ $columns = count($_REQUEST['colsSecond']);
 }
 
 
 $required_fields = array();
 $bool_fields = array();
-for($i= 0; $i<$columns;$i++){
+for ($i = 0; $i < $columns; $i++) {
     $colsFirstField = '';
     $colsSecondField = '';
 
-    if(!empty($_REQUEST['colsFirst'][$i])){
+    if (!empty($_REQUEST['colsFirst'][$i])) {
         $colsFirstField = $_REQUEST['colsFirst'][$i];
         //_pp($_REQUEST['colsFirst']);
      }
-    if(!empty($_REQUEST['colsSecond'][$i])){
+    if (!empty($_REQUEST['colsSecond'][$i])) {
         $colsSecondField = $_REQUEST['colsSecond'][$i];
         //_pp($_REQUEST['colsSecond']);
      }
 
-    if(isset($lead->field_defs[$colsFirstField]) && $lead->field_defs[$colsFirstField] != null)
+    if (isset($lead->field_defs[$colsFirstField]) && $lead->field_defs[$colsFirstField] != null)
     {
-         $field_vname = preg_replace('/:$/','',translate($lead->field_defs[$colsFirstField]['vname'],'Leads'));
+         $field_vname = preg_replace('/:$/', '', translate($lead->field_defs[$colsFirstField]['vname'], 'Leads'));
          $field_name  = $colsFirstField;
-         $field_label = $field_vname .": ";
-         if(isset($lead->field_defs[$colsFirstField]['custom_type']) && $lead->field_defs[$colsFirstField]['custom_type'] != null){
-            $field_type= $lead->field_defs[$colsFirstField]['custom_type'];
+         $field_label = $field_vname.": ";
+         if (isset($lead->field_defs[$colsFirstField]['custom_type']) && $lead->field_defs[$colsFirstField]['custom_type'] != null) {
+            $field_type = $lead->field_defs[$colsFirstField]['custom_type'];
          }
-         else{
-            $field_type= $lead->field_defs[$colsFirstField]['type'];
+         else {
+            $field_type = $lead->field_defs[$colsFirstField]['type'];
          }
          
          //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-         if($colsFirstField == 'webtolead_email1' && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])){
+         if ($colsFirstField == 'webtolead_email1' && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])) {
              $lead->field_defs['webtolead_email1']['required'] = $lead->field_defs['email1']['required'];
          }
          
          $field_required = '';
-         if(isset($lead->field_defs[$colsFirstField]['required']) && $lead->field_defs[$colsFirstField]['required'] != null
+         if (isset($lead->field_defs[$colsFirstField]['required']) && $lead->field_defs[$colsFirstField]['required'] != null
              && $lead->field_defs[$colsFirstField]['required'] != 0)
           {
             $field_required = $lead->field_defs[$colsFirstField]['required'];
-            if (! in_array($lead->field_defs[$colsFirstField]['name'], $required_fields)){
-              array_push($required_fields,$lead->field_defs[$colsFirstField]['name']);
+            if (!in_array($lead->field_defs[$colsFirstField]['name'], $required_fields)) {
+              array_push($required_fields, $lead->field_defs[$colsFirstField]['name']);
              }
           }
-          if($lead->field_defs[$colsFirstField]['name']=='last_name'){
-            if (! in_array($lead->field_defs[$colsFirstField]['name'], $required_fields)){
-              array_push($required_fields,$lead->field_defs[$colsFirstField]['name']);
+          if ($lead->field_defs[$colsFirstField]['name'] == 'last_name') {
+            if (!in_array($lead->field_defs[$colsFirstField]['name'], $required_fields)) {
+              array_push($required_fields, $lead->field_defs[$colsFirstField]['name']);
             }
           }
-         if($field_type=='multienum' || $field_type=='enum' || $field_type=='radioenum')  $field_options= $lead->field_defs[$colsFirstField]['options'];
+         if ($field_type == 'multienum' || $field_type == 'enum' || $field_type == 'radioenum')  $field_options = $lead->field_defs[$colsFirstField]['options'];
     }
     //preg_replace('/:$/','',translate($field_def['vname'],'Leads')
-    if(isset($lead->field_defs[$colsSecondField]) && $lead->field_defs[$colsSecondField] != null)
+    if (isset($lead->field_defs[$colsSecondField]) && $lead->field_defs[$colsSecondField] != null)
     {
-         $field1_vname= preg_replace('/:$/','',translate($lead->field_defs[$colsSecondField]['vname'],'Leads'));
-         $field1_name= $colsSecondField;
-         $field1_label = $field1_vname .": ";
-         if(isset($lead->field_defs[$colsSecondField]['custom_type']) && $lead->field_defs[$colsSecondField]['custom_type'] != null){
-            $field1_type= $lead->field_defs[$colsSecondField]['custom_type'];
+         $field1_vname = preg_replace('/:$/', '', translate($lead->field_defs[$colsSecondField]['vname'], 'Leads'));
+         $field1_name = $colsSecondField;
+         $field1_label = $field1_vname.": ";
+         if (isset($lead->field_defs[$colsSecondField]['custom_type']) && $lead->field_defs[$colsSecondField]['custom_type'] != null) {
+            $field1_type = $lead->field_defs[$colsSecondField]['custom_type'];
          }
-         else{
-            $field1_type= $lead->field_defs[$colsSecondField]['type'];
+         else {
+            $field1_type = $lead->field_defs[$colsSecondField]['type'];
          }
          
          //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-         if($colsSecondField == 'webtolead_email1' && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])){
+         if ($colsSecondField == 'webtolead_email1' && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])) {
              $lead->field_defs['webtolead_email1']['required'] = $lead->field_defs['email1']['required'];
          }
          
          $field1_required = '';
-         if(isset($lead->field_defs[$colsSecondField]['required']) && $lead->field_defs[$colsSecondField]['required'] != null
-             && $lead->field_defs[$colsSecondField]['required'] != 0){
+         if (isset($lead->field_defs[$colsSecondField]['required']) && $lead->field_defs[$colsSecondField]['required'] != null
+             && $lead->field_defs[$colsSecondField]['required'] != 0) {
           $field1_required = $lead->field_defs[$colsSecondField]['required'];
-           if (! in_array($lead->field_defs[$colsSecondField]['name'], $required_fields)){
-              array_push($required_fields,$lead->field_defs[$colsSecondField]['name']);
+           if (!in_array($lead->field_defs[$colsSecondField]['name'], $required_fields)) {
+              array_push($required_fields, $lead->field_defs[$colsSecondField]['name']);
             }
          }
-         if($lead->field_defs[$colsSecondField]['name']=='last_name'){
-            if (! in_array($lead->field_defs[$colsSecondField]['name'], $required_fields)){
-              array_push($required_fields,$lead->field_defs[$colsSecondField]['name']);
+         if ($lead->field_defs[$colsSecondField]['name'] == 'last_name') {
+            if (!in_array($lead->field_defs[$colsSecondField]['name'], $required_fields)) {
+              array_push($required_fields, $lead->field_defs[$colsSecondField]['name']);
             }
          }
-         if($field1_type=='multienum' || $field1_type=='enum' || $field1_type=='radioenum')  $field1_options= $lead->field_defs[$colsSecondField]['options'];
+         if ($field1_type == 'multienum' || $field1_type == 'enum' || $field1_type == 'radioenum')  $field1_options = $lead->field_defs[$colsSecondField]['options'];
     }
 
      $Web_To_Lead_Form_html .= "<tr>";
 
-    if(isset($lead->field_defs[$colsFirstField]) && $lead->field_defs[$colsFirstField] != null){
-        if($field_type=='multienum' || $field_type=='enum' || $field_type=='radioenum'){
+    if (isset($lead->field_defs[$colsFirstField]) && $lead->field_defs[$colsFirstField] != null) {
+        if ($field_type == 'multienum' || $field_type == 'enum' || $field_type == 'radioenum') {
           $lead_options = '';
-          if(!empty($lead->$field_name)){
-            $lead_options= get_select_options_with_id($app_list_strings[$field_options], unencodeMultienum($lead->$field_name));
+          if (!empty($lead->$field_name)) {
+            $lead_options = get_select_options_with_id($app_list_strings[$field_options], unencodeMultienum($lead->$field_name));
           }
-          else{
-            $lead_options= get_select_options_with_id($app_list_strings[$field_options], '');
+          else {
+            $lead_options = get_select_options_with_id($app_list_strings[$field_options], '');
           }
-          if($field_required){
+          if ($field_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
             }
-         else{
+         else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
              }
-          if(isset($lead->field_defs[$colsFirstField]['isMultiSelect']) && $lead->field_defs[$colsFirstField]['isMultiSelect'] ==1){
+          if (isset($lead->field_defs[$colsFirstField]['isMultiSelect']) && $lead->field_defs[$colsFirstField]['isMultiSelect'] == 1) {
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id='{$field_name}' multiple='true' name='{$field_name}[]' tabindex='1'>$lead_options</select></span sugar='slot'></td>";
-          }elseif(ifRadioButton($lead->field_defs[$colsFirstField]['name'])){
-            $Web_To_Lead_Form_html .="<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>";
-            foreach($app_list_strings[$field_options] as $field_option_key => $field_option){
-                if($field_option != null){
-                	if(!empty($lead->$field_name) && in_array($field_option_key,unencodeMultienum($lead->$field_name))){
-                		$Web_To_Lead_Form_html .="<input id='$colsFirstField"."_$field_option_key' checked name='$colsFirstField' value='$field_option_key' type='radio'>";
-                	} else{
-                		$Web_To_Lead_Form_html .="<input id='$colsFirstField"."_$field_option_key' name='$colsFirstField' value='$field_option_key' type='radio'>";
+          }elseif (ifRadioButton($lead->field_defs[$colsFirstField]['name'])) {
+            $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>";
+            foreach ($app_list_strings[$field_options] as $field_option_key => $field_option) {
+                if ($field_option != null) {
+                	if (!empty($lead->$field_name) && in_array($field_option_key, unencodeMultienum($lead->$field_name))) {
+                		$Web_To_Lead_Form_html .= "<input id='$colsFirstField"."_$field_option_key' checked name='$colsFirstField' value='$field_option_key' type='radio'>";
+                	} else {
+                		$Web_To_Lead_Form_html .= "<input id='$colsFirstField"."_$field_option_key' name='$colsFirstField' value='$field_option_key' type='radio'>";
                 	}
-	                $Web_To_Lead_Form_html .="<span ='document.getElementById('".$lead->field_defs[$colsFirstField]."_$field_option_key').checked =true style='cursor:default'; onmousedown='return false;'>$field_option</span><br>";
+	                $Web_To_Lead_Form_html .= "<span ='document.getElementById('".$lead->field_defs[$colsFirstField]."_$field_option_key').checked =true style='cursor:default'; onmousedown='return false;'>$field_option</span><br>";
                 }
             }
-            $Web_To_Lead_Form_html .="</span sugar='slot'></td>";
-          }else{
+            $Web_To_Lead_Form_html .= "</span sugar='slot'></td>";
+          } else {
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id=$field_name name=$field_name tabindex='1'>$lead_options</select></span sugar='slot'></td>";
           }
          }
-         if($field_type=='bool'){
-          if($field_required){
+         if ($field_type == 'bool') {
+          if ($field_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
           }
-          else{
+          else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
           }
           $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input type='checkbox' id=$field_name name=$field_name></span sugar='slot'></td>";
-          if (! in_array($lead->field_defs[$colsFirstField]['name'], $bool_fields)){
-              array_push($bool_fields,$lead->field_defs[$colsFirstField]['name']);
+          if (!in_array($lead->field_defs[$colsFirstField]['name'], $bool_fields)) {
+              array_push($bool_fields, $lead->field_defs[$colsFirstField]['name']);
              }
          }
-         if($field_type=='date') {
+         if ($field_type == 'date') {
 
           global $timedate;
           $cal_dateformat = $timedate->get_cal_date_format();
 	      $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
-          if($field_required){
+          if ($field_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
           }
-          else{
+          else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
           }
 
@@ -302,117 +302,117 @@ 
 				</script>
 				<span sugar='slot'><input type='hidden' id='{$field_name}' name='{$field_name}'/>";
           	$order = explode("%", $cal_dateformat);
-          	foreach($order as $part)
+          	foreach ($order as $part)
           	{
           		if (!isset($part[0]))
           			continue;
-          		if (strToUpper($part[0]) == "M" )
-          			$Web_To_Lead_Form_html .= translate("LBL_MONTH") . ":<input class=\"text\"
+          		if (strToUpper($part[0]) == "M")
+          			$Web_To_Lead_Form_html .= translate("LBL_MONTH").":<input class=\"text\"
 					name=\"{$field_name}_month\" size='2' maxlength='2' id='{$field_name}_month' value=''
 					onblur=\"update{$field_name}Value()\">";
-				else if (strToUpper($part[0]) == "D" )
-					$Web_To_Lead_Form_html .=  translate("LBL_DAY") . ":<input class=\"text\"
+				else if (strToUpper($part[0]) == "D")
+					$Web_To_Lead_Form_html .= translate("LBL_DAY").":<input class=\"text\"
 					name=\"{$field_name}_day\" size='2' maxlength='2' id='{$field_name}_day' value=''
 					onblur=\"update{$field_name}Value()\">";
-				else if (strToUpper($part[0]) == "Y" )
-					$Web_To_Lead_Form_html .= translate("LBL_YEAR") . ":<input class=\"text\"
+				else if (strToUpper($part[0]) == "Y")
+					$Web_To_Lead_Form_html .= translate("LBL_YEAR").":<input class=\"text\"
 					name=\"{$field_name}_year\" size='4' maxlength='4' id='{$field_name}_year' value=''
 					onblur=\"update{$field_name}Value()\">";
           	}
           	$Web_To_Lead_Form_html .= "</span></td>";
 	     } // if
 
-         if( $field_type=='varchar' ||  $field_type=='name'
-          ||  $field_type=='phone' || $field_type=='currency' || $field_type=='url' || $field_type=='int'){
-           if($field_name=='last_name' ||   $field_required){
+         if ($field_type == 'varchar' || $field_type == 'name'
+          ||  $field_type == 'phone' || $field_type == 'currency' || $field_type == 'url' || $field_type == 'int') {
+           if ($field_name == 'last_name' || $field_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
               }
-            else{
+            else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
              }
-             if ( $field_name=='email1'||$field_name=='email2' ){
+             if ($field_name == 'email1' || $field_name == 'email2') {
                  $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field_name name=$field_name type='text' onchange='validateEmailAdd();'></span sugar='slot'></td>";
              } else {
                 $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field_name name=$field_name type='text'></span sugar='slot'></td>";
              }
             }
-          if ( $field_type == 'text' ) {
+          if ($field_type == 'text') {
                $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
 			   $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span id='ta_replace' sugar='slot'><input id=$field_name name=$field_name type='text'></span sugar='slot'></td>";
            }
-           if($field_type=='relate' &&  $field_name=='account_name'){
+           if ($field_type == 'relate' && $field_name == 'account_name') {
 	            $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
 	            $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field_name name=$field_name type='text'></span sugar='slot'></td>";
            }
-          if($field_type=='email'){
-            if($field_required){
+          if ($field_type == 'email') {
+            if ($field_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
               }
-           else{
+           else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
              }
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field_name name=$field_name type='text' onchange='validateEmailAdd();'></span sugar='slot'></td>";
            }
        }
-      else{
+      else {
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
         }
 
-     if(isset($lead->field_defs[$colsSecondField]) && $lead->field_defs[$colsSecondField] != null){
-         if($field1_type=='multienum' || $field1_type=='enum' || $field1_type=='radioenum'){
+     if (isset($lead->field_defs[$colsSecondField]) && $lead->field_defs[$colsSecondField] != null) {
+         if ($field1_type == 'multienum' || $field1_type == 'enum' || $field1_type == 'radioenum') {
           $lead1_options = '';
-          if(!empty($lead->$field1_name)){
-            $lead1_options= get_select_options_with_id($app_list_strings[$field1_options], unencodeMultienum($lead->$field1_name));
+          if (!empty($lead->$field1_name)) {
+            $lead1_options = get_select_options_with_id($app_list_strings[$field1_options], unencodeMultienum($lead->$field1_name));
           }
-          else{
-            $lead1_options= get_select_options_with_id($app_list_strings[$field1_options], '');
+          else {
+            $lead1_options = get_select_options_with_id($app_list_strings[$field1_options], '');
           }
-            if($field1_required){
+            if ($field1_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
             }
-            else{
+            else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
              }
-            if(isset($lead->field_defs[$colsSecondField]['isMultiSelect']) && $lead->field_defs[$colsSecondField]['isMultiSelect'] ==1){
+            if (isset($lead->field_defs[$colsSecondField]['isMultiSelect']) && $lead->field_defs[$colsSecondField]['isMultiSelect'] == 1) {
                 $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id='{$field1_name}' name='{$field1_name}[]' multiple='true' tabindex='1'>$lead1_options</select></span sugar='slot'></td>";
-            }elseif(ifRadioButton($lead->field_defs[$colsSecondField]['name'])){
-                $Web_To_Lead_Form_html .="<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>";
-                foreach($app_list_strings[$field1_options] as $field_option_key => $field_option){
-                    if($field_option != null){
-                    	if(!empty($lead->$field1_name) && in_array($field_option_key,unencodeMultienum($lead->$field1_name))){
-                    		$Web_To_Lead_Form_html .="<input id='$colsSecondField"."_$field_option_key' checked name='$colsSecondField' value='$field_option_key' type='radio'>";
-                    	}else{
-	                    	$Web_To_Lead_Form_html .="<input id='$colsSecondField"."_$field_option_key' name='$colsSecondField' value='$field_option_key' type='radio'>";
+            }elseif (ifRadioButton($lead->field_defs[$colsSecondField]['name'])) {
+                $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>";
+                foreach ($app_list_strings[$field1_options] as $field_option_key => $field_option) {
+                    if ($field_option != null) {
+                    	if (!empty($lead->$field1_name) && in_array($field_option_key, unencodeMultienum($lead->$field1_name))) {
+                    		$Web_To_Lead_Form_html .= "<input id='$colsSecondField"."_$field_option_key' checked name='$colsSecondField' value='$field_option_key' type='radio'>";
+                    	} else {
+	                    	$Web_To_Lead_Form_html .= "<input id='$colsSecondField"."_$field_option_key' name='$colsSecondField' value='$field_option_key' type='radio'>";
 	                    }
-	                    $Web_To_Lead_Form_html .="<span ='document.getElementById('".$lead->field_defs[$colsSecondField]."_$field_option_key').checked =true style='cursor:default'; onmousedown='return false;'>$field_option</span><br>";
+	                    $Web_To_Lead_Form_html .= "<span ='document.getElementById('".$lead->field_defs[$colsSecondField]."_$field_option_key').checked =true style='cursor:default'; onmousedown='return false;'>$field_option</span><br>";
                     }
                 }
-                $Web_To_Lead_Form_html .="</span sugar='slot'></td>";
-            }else{
+                $Web_To_Lead_Form_html .= "</span sugar='slot'></td>";
+            } else {
                 $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id=$field1_name name=$field1_name tabindex='1'>$lead1_options</select></span sugar='slot'></td>";
             }
          }
-         if($field1_type=='bool'){
-          if($field1_required){
+         if ($field1_type == 'bool') {
+          if ($field1_required) {
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
           }
-          else{
+          else {
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
           }
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field1_name name=$field1_name type='checkbox'></span sugar='slot'></td>";
-            if (! in_array($lead->field_defs[$colsSecondField]['name'], $bool_fields)){
-              array_push($bool_fields,$lead->field_defs[$colsSecondField]['name']);
+            if (!in_array($lead->field_defs[$colsSecondField]['name'], $bool_fields)) {
+              array_push($bool_fields, $lead->field_defs[$colsSecondField]['name']);
              }
          }
-         if($field1_type=='date') {
+         if ($field1_type == 'date') {
 	        global $timedate;
 			$cal_dateformat = $timedate->get_cal_date_format();
 	        $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
-          if($field1_required){
+          if ($field1_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
           }
-          else{
+          else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
           }
 			$Web_To_Lead_Form_html .= " 
@@ -431,59 +431,59 @@ 
 				</script>
 				<span sugar='slot'><input type='hidden' id='{$field1_name}' name='{$field1_name}'/>";
           	$order = explode("%", $cal_dateformat);
-          	foreach($order as $part)
+          	foreach ($order as $part)
           	{
           		if (!isset($part[0]))
           			continue;
-          		if (strToUpper($part[0]) == "M" )
-          			$Web_To_Lead_Form_html .= translate("LBL_MONTH") . ":<input class=\"text\"
+          		if (strToUpper($part[0]) == "M")
+          			$Web_To_Lead_Form_html .= translate("LBL_MONTH").":<input class=\"text\"
 					name=\"{$field1_name}_month\" size='2' maxlength='2' id='{$field1_name}_month' value='' 
 					onblur=\"update{$field1_name}Value()\">";
-				else if (strToUpper($part[0]) == "D" ) 
-					$Web_To_Lead_Form_html .=  translate("LBL_DAY") . ":<input class=\"text\"
+				else if (strToUpper($part[0]) == "D") 
+					$Web_To_Lead_Form_html .= translate("LBL_DAY").":<input class=\"text\"
 					name=\"{$field1_name}_day\" size='2' maxlength='2' id='{$field1_name}_day' value='' 
 					onblur=\"update{$field1_name}Value()\">";
-				else if (strToUpper($part[0]) == "Y" ) 
-					$Web_To_Lead_Form_html .= translate("LBL_YEAR") . ":<input class=\"text\"
+				else if (strToUpper($part[0]) == "Y") 
+					$Web_To_Lead_Form_html .= translate("LBL_YEAR").":<input class=\"text\"
 					name=\"{$field1_name}_year\" size='4' maxlength='4' id='{$field1_name}_year' value='' 
 					onblur=\"update{$field1_name}Value()\">";
           	}
           	$Web_To_Lead_Form_html .= "</span></td>";
          } // if
-         if( $field1_type=='varchar' ||  $field1_type=='name'
-          ||  $field1_type=='phone' || $field1_type=='currency' || $field1_type=='url' || $field1_type=='int'){
-            if($field1_name=='last_name' ||  $field1_required){
+         if ($field1_type == 'varchar' || $field1_type == 'name'
+          ||  $field1_type == 'phone' || $field1_type == 'currency' || $field1_type == 'url' || $field1_type == 'int') {
+            if ($field1_name == 'last_name' || $field1_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
               }
-            else{
+            else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
              }
-             if ( $field1_name=='email1'||$field1_name=='email2' ){
+             if ($field1_name == 'email1' || $field1_name == 'email2') {
                  $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field1_name name=$field1_name type='text' onchange='validateEmailAdd();'></span sugar='slot'></td>";
              } else {
                 $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field1_name name=$field1_name type='text'></span sugar='slot'></td>";
              }
 
            }
-           if ( $field1_type == 'text' ) {
+           if ($field1_type == 'text') {
                $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
 				$Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span id='ta_replace' sugar='slot'><input id=$field1_name name=$field1_name type='text'></span sugar='slot'></td>";
            }
-           if($field1_type=='relate' &&  $field1_name=='account_name'){
+           if ($field1_type == 'relate' && $field1_name == 'account_name') {
 	            $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
 	            $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field1_name name=$field1_name type='text'></span sugar='slot'></td>";
            }
-           if($field1_type=='email'){
-           	if($field1_required){
+           if ($field1_type == 'email') {
+           	if ($field1_required) {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
               }
-            else{
+            else {
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
              }
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field1_name name=$field1_name type='text' onchange='validateEmailAdd();'></span sugar='slot'></td>";
            }
       }
-      else{
+      else {
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
        }
@@ -492,46 +492,46 @@ 
 
 $Web_To_Lead_Form_html .= "<tr align='center' style='color: rgb(0, 105, 225); font-family: Arial,Verdana,Helvetica,sans-serif; font-size: 18px; font-weight: bold; margin-bottom: 0px; margin-top: 0px;'><TD COLSPAN='4'>&nbsp</TD></tr>";
 
-if(!empty($web_form_footer)){
+if (!empty($web_form_footer)) {
     $Web_To_Lead_Form_html .= "<tr align='center' style='color: rgb(0, 105, 225); font-family: Arial,Verdana,Helvetica,sans-serif; font-size: 18px; font-weight: bold; margin-bottom: 0px; margin-top: 0px;'><TD COLSPAN='4'>&nbsp</TD></tr>";
     $Web_To_Lead_Form_html .= "<tr align='left' style='color: rgb(0, 105, 225); font-family: Arial,Verdana,Helvetica,sans-serif; font-size: 12px; font-weight: normal; margin-bottom: 0px; margin-top: 0px;'><TD COLSPAN='4'>$web_form_footer</TD></tr>";
 }
 
 $Web_To_Lead_Form_html .= "<tr align='center'><td colspan='10'><input type='button' onclick='submit_form();' class='button' name='Submit' value='$web_form_submit_label'/></td></tr>";
 
-if(!empty($web_form_campaign)){
+if (!empty($web_form_campaign)) {
    $Web_To_Lead_Form_html .= "<tr><td style='display: none'><input type='hidden' id='campaign_id' name='campaign_id' value='$web_form_campaign'></td></tr>";
 }
-if(!empty($web_redirect_url)){
+if (!empty($web_redirect_url)) {
     $Web_To_Lead_Form_html .= "<tr><td style='display: none'><input type='hidden' id='redirect_url' name='redirect_url' value='$web_redirect_url'></td></tr>";
 }
-if(!empty($web_assigned_user)){
+if (!empty($web_assigned_user)) {
     $Web_To_Lead_Form_html .= "<tr><td style='display: none'><input type='hidden' id='assigned_user_id' name='assigned_user_id' value='$web_assigned_user'></td></tr>";
 }
-$req_fields='';
-if(isset($required_fields) && $required_fields != null ){
-    foreach($required_fields as $req){
-        $req_fields=$req_fields.$req.';';
+$req_fields = '';
+if (isset($required_fields) && $required_fields != null) {
+    foreach ($required_fields as $req) {
+        $req_fields = $req_fields.$req.';';
     }
 }
-$boolean_fields='';
-if(isset($bool_fields) && $bool_fields != null ){
-    foreach($bool_fields as $boo){
-        $boolean_fields=$boolean_fields.$boo.';';
+$boolean_fields = '';
+if (isset($bool_fields) && $bool_fields != null) {
+    foreach ($bool_fields as $boo) {
+        $boolean_fields = $boolean_fields.$boo.';';
     }
 }
-if(!empty($req_fields)){
+if (!empty($req_fields)) {
     $Web_To_Lead_Form_html .= "<tr><td style='display: none'><input type='hidden' id='req_id' name='req_id' value='$req_fields'></td></tr>";
 }
-if(!empty($boolean_fields)){
+if (!empty($boolean_fields)) {
     $Web_To_Lead_Form_html .= "<tr><td style='display: none'><input type='hidden' id='bool_id' name='bool_id' value='$boolean_fields'></td></tr>";
 }
 
 
 $Web_To_Lead_Form_html .= "</table >";
-$Web_To_Lead_Form_html .="</form>";
+$Web_To_Lead_Form_html .= "</form>";
 
-$Web_To_Lead_Form_html .="<script type='text/javascript'>
+$Web_To_Lead_Form_html .= "<script type='text/javascript'>
  function submit_form(){
  	if(typeof(validateCaptchaAndSubmit)!='undefined'){
  		validateCaptchaAndSubmit();
@@ -596,15 +596,15 @@ 
 }
 </script>";
 
-if(isset($Web_To_Lead_Form_html)) $xtpl->assign("BODY", $Web_To_Lead_Form_html); else $xtpl->assign("BODY", "");
-if(isset($Web_To_Lead_Form_html)) $xtpl->assign("BODY_HTML", $Web_To_Lead_Form_html); else $xtpl->assign("BODY_HTML", "");
+if (isset($Web_To_Lead_Form_html)) $xtpl->assign("BODY", $Web_To_Lead_Form_html); else $xtpl->assign("BODY", "");
+if (isset($Web_To_Lead_Form_html)) $xtpl->assign("BODY_HTML", $Web_To_Lead_Form_html); else $xtpl->assign("BODY_HTML", "");
 
 
 require_once('include/SugarTinyMCE.php');
 $tiny = new SugarTinyMCE();
-$tiny->defaultConfig['height']=400;
-$tiny->defaultConfig['apply_source_formatting']=true;
-$tiny->defaultConfig['cleanup']=false;
+$tiny->defaultConfig['height'] = 400;
+$tiny->defaultConfig['apply_source_formatting'] = true;
+$tiny->defaultConfig['cleanup'] = false;
 $ed = $tiny->getInstance('body_html');
 $xtpl->assign("tiny", $ed);
 
@@ -619,12 +619,12 @@ 
 $xtpl->parse("main");
 $xtpl->out("main");
 
-function ifRadioButton($customFieldName){
+function ifRadioButton($customFieldName) {
     $custRow = null;
-    $query="select id,type from fields_meta_data where deleted = 0 and name = '$customFieldName'";
-    $result=$GLOBALS['db']->query($query);
+    $query = "select id,type from fields_meta_data where deleted = 0 and name = '$customFieldName'";
+    $result = $GLOBALS['db']->query($query);
     $row = $GLOBALS['db']->fetchByAssoc($result);
-    if($row != null && $row['type'] == 'radioenum'){
+    if ($row != null && $row['type'] == 'radioenum') {
         return $custRow = $row;
     }
     return $custRow;

modules/Campaigns/WizardEmailSetupSave.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -60,22 +60,22 @@ 
     //name is used as key in post, it is also used in creation of summary page for wizard,
     //so let's clean up the posting so we can reuse the save functionality for inbound emails and
     //from existing save.php's  
-    foreach($camp_steps as $step){
+    foreach ($camp_steps as $step) {
         clean_up_post($step);
     }
 /**************************** Save general Email Setup  *****************************/
 
 //we do not need to track location if location type is not set
-if(isset($_POST['tracking_entities_location_type'])) {
+if (isset($_POST['tracking_entities_location_type'])) {
     if ($_POST['tracking_entities_location_type'] != '2') {
         unset($_POST['tracking_entities_location']);
         unset($_POST['tracking_entities_location_type']);
     }
 }
 //if the check box is empty, then set it to 0
-if(!isset($_POST['mail_smtpauth_req'])) { $_POST['mail_smtpauth_req'] = 0; }
+if (!isset($_POST['mail_smtpauth_req'])) { $_POST['mail_smtpauth_req'] = 0; }
 //default ssl use to false
-if(!isset($_POST['mail_smtpssl'])) { $_POST['mail_smtpssl'] = 0; }
+if (!isset($_POST['mail_smtpssl'])) { $_POST['mail_smtpssl'] = 0; }
 //reuse existing saveconfig functionality
 $focus->saveConfig();
 
@@ -83,7 +83,7 @@ 
 
 /**************************** Add New Monitored Box  *****************************/
 //perform this if the option to create new mail box has been checked
-if(isset($_REQUEST['wiz_new_mbox']) && ($_REQUEST['wiz_new_mbox']=='1')){
+if (isset($_REQUEST['wiz_new_mbox']) && ($_REQUEST['wiz_new_mbox'] == '1')) {
     
    //Populate the Request variables that inboundemail expects
     $_REQUEST['mark_read'] = 1;
@@ -96,11 +96,11 @@ 
     require_once('modules/InboundEmail/Save.php');    
 
 }
-    if (!empty($_REQUEST['error'])){
+    if (!empty($_REQUEST['error'])) {
             //an error was found during inbound save.  This means the save was allowed but the inbound box had problems, return user to wizard
             //and display error message
             header("Location: index.php?action=WizardEmailSetup&module=Campaigns&error=true");
-    }else{
+    } else {
         //set navigation details
         header("Location: index.php?action=index&module=Campaigns");
     }
@@ -111,18 +111,18 @@ 
  * which does not expect the prefix, and still use the generic create summary functionality in wizard, which
  * does expect the prefix.  
  */
-function clean_up_post($prefix){
+function clean_up_post($prefix) {
 
     foreach ($_REQUEST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
+              if ((strstr($key, $prefix)) && (strpos($key, $prefix) == 0)) {
+              $newkey = substr($key, strlen($prefix));
               $_REQUEST[$newkey] = $val;
          }               
     }
 
     foreach ($_POST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
+              if ((strstr($key, $prefix)) && (strpos($key, $prefix) == 0)) {
+              $newkey = substr($key, strlen($prefix));
               $_POST[$newkey] = $val;
               
          }               

modules/Campaigns/WizardNewsletterSave.php

Spacing +55 added lines, -55 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -51,7 +51,7 @@ 
 
     //create new campaign bean and populate
     $campaign_focus = new Campaign();
-    if(isset($_REQUEST['record'])) {
+    if (isset($_REQUEST['record'])) {
         $campaign_focus->retrieve($_REQUEST['record']);
     }
 
@@ -60,8 +60,8 @@ 
 
     $campaign_focus = populateFromPost('', $campaign_focus);
 
-    foreach($camp_steps as $step){
-       $campaign_focus =  populate_wizard_bean_from_request($campaign_focus,$step);
+    foreach ($camp_steps as $step) {
+       $campaign_focus = populate_wizard_bean_from_request($campaign_focus, $step);
     }
 
     //save here so we can link relationships
@@ -71,7 +71,7 @@ 
     //process prospect lists
 
         //process subscription lists if this is a newsletter
-        if($campaign_focus->campaign_type =='NewsLetter'){
+        if ($campaign_focus->campaign_type == 'NewsLetter') {
             $pl_list = process_subscriptions_from_request($campaign_focus->name);
 
             $campaign_focus->load_relationship('prospectlists');
@@ -79,7 +79,7 @@ 
             $ui_ids = array();
 
             //for each list returned, add the list to the relationship
-            foreach($pl_list as $pl){
+            foreach ($pl_list as $pl) {
                 $campaign_focus->prospectlists->add($pl->id);
                 //populate array with id's from UI'
                 $ui_ids[] = $pl->id;
@@ -87,36 +87,36 @@ 
 
             //now remove the lists that may have existed before, but were not specified in UI.
             //this will enforce that Newsletters only have 3 available target lists.
-            foreach($existing_pls as $pl_del){
-                if (!in_array($pl_del, $ui_ids)){
+            foreach ($existing_pls as $pl_del) {
+                if (!in_array($pl_del, $ui_ids)) {
                     $campaign_focus->prospectlists->delete($campaign_focus->id, $pl_del);
                 }
             }
-        }else{
+        } else {
             //process target lists if this is not a newsletter
             //remove Target Lists if defined
 
-            if(isset($_REQUEST['wiz_remove_target_list'])){
+            if (isset($_REQUEST['wiz_remove_target_list'])) {
 
                 $remove_target_strings = explode(",", $_REQUEST['wiz_remove_target_list']);
-                foreach($remove_target_strings as $remove_trgt_string){
-                        if(!empty($remove_trgt_string)){
+                foreach ($remove_target_strings as $remove_trgt_string) {
+                        if (!empty($remove_trgt_string)) {
                         //load relationship and add to the list
                             $campaign_focus->load_relationship('prospectlists');
-                            $campaign_focus->prospectlists->delete($campaign_focus->id,$remove_trgt_string);
+                            $campaign_focus->prospectlists->delete($campaign_focus->id, $remove_trgt_string);
                         }
                 }
             }
 
 
     //create new campaign tracker and save if defined
-    if(isset($_REQUEST['wiz_list_of_targets'])){
+    if (isset($_REQUEST['wiz_list_of_targets'])) {
         $target_strings = explode(",", $_REQUEST['wiz_list_of_targets']);
-        foreach($target_strings as $trgt_string){
+        foreach ($target_strings as $trgt_string) {
             $target_values = explode("@@", $trgt_string);
-            if(count($target_values)==3){
+            if (count($target_values) == 3) {
 
-                if(!empty($target_values[0])){
+                if (!empty($target_values[0])) {
                     //this is a selected target, as the id is already populated, retrieve and link
                     $trgt_focus = new ProspectList();
                     $trgt_focus->retrieve($target_values[0]);
@@ -124,7 +124,7 @@ 
                     //load relationship and add to the list
                     $campaign_focus->load_relationship('prospectlists');
                     $campaign_focus->prospectlists->add($trgt_focus ->id);
-                }else{
+                } else {
 
                     //this is a new target, as the id is not populated, need to create and link
                     $trgt_focus = new ProspectList();
@@ -149,27 +149,27 @@ 
 
 
     //remove campaign trackers if defined
-    if(isset($_REQUEST['wiz_remove_tracker_list'])){
+    if (isset($_REQUEST['wiz_remove_tracker_list'])) {
 
         $remove_tracker_strings = explode(",", $_REQUEST['wiz_remove_tracker_list']);
-        foreach($remove_tracker_strings as $remove_trkr_string){
-                if(!empty($remove_trkr_string)){
+        foreach ($remove_tracker_strings as $remove_trkr_string) {
+                if (!empty($remove_trkr_string)) {
                 //load relationship and add to the list
                     $campaign_focus->load_relationship('tracked_urls');
-                    $campaign_focus->tracked_urls->delete($campaign_focus->id,$remove_trkr_string);
+                    $campaign_focus->tracked_urls->delete($campaign_focus->id, $remove_trkr_string);
                 }
         }
     }
 
 
     //save  campaign trackers and save if defined
-    if(isset($_REQUEST['wiz_list_of_existing_trackers'])){
+    if (isset($_REQUEST['wiz_list_of_existing_trackers'])) {
         $tracker_strings = explode(",", $_REQUEST['wiz_list_of_existing_trackers']);
-        foreach($tracker_strings as $trkr_string){
+        foreach ($tracker_strings as $trkr_string) {
             $tracker_values = explode("@@", $trkr_string);
             $ct_focus = new CampaignTracker();
             $ct_focus->retrieve($tracker_values[0]);
-            if(!empty($ct_focus->tracker_name)){
+            if (!empty($ct_focus->tracker_name)) {
                 $ct_focus->tracker_name = $tracker_values[1];
                 $ct_focus->is_optout = $tracker_values[2];
                 $ct_focus->tracker_url = $tracker_values[3];
@@ -184,11 +184,11 @@ 
 
 
     //create new campaign tracker and save if defined
-    if(isset($_REQUEST['wiz_list_of_trackers'])){
+    if (isset($_REQUEST['wiz_list_of_trackers'])) {
         $tracker_strings = explode(",", $_REQUEST['wiz_list_of_trackers']);
-        foreach($tracker_strings as $trkr_string){
+        foreach ($tracker_strings as $trkr_string) {
             $tracker_values = explode("@@", $trkr_string);
-            if(count($tracker_values)==3){
+            if (count($tracker_values) == 3) {
                 $ct_focus = new CampaignTracker();
                 $ct_focus->tracker_name = $tracker_values[0];
                 $ct_focus->is_optout = $tracker_values[1];
@@ -209,12 +209,12 @@ 
 $_REQUEST['return_module'] = $campaign_focus->module_dir;
 $_REQUEST['return_action'] = "WizardNewsLetter";
 $_REQUEST['action'] = "WizardMarketing";
-$_REQUEST['record'] = $campaign_focus->id;;
+$_REQUEST['record'] = $campaign_focus->id; ;
 
 $action = '';
-if(isset($_REQUEST['wiz_direction'])  &&  $_REQUEST['wiz_direction']== 'continue'){
+if (isset($_REQUEST['wiz_direction']) && $_REQUEST['wiz_direction'] == 'continue') {
     $action = 'WizardMarketing';
-}else{
+} else {
     $action = 'WizardHome&record='.$campaign_focus->id;
 }
 //require_once('modules/Campaigns/WizardMarketing.php');
@@ -228,12 +228,12 @@ 
  * This function will populate the passed in bean with the post variables
  * that contain the specified prefix
  */
-function populate_wizard_bean_from_request($bean,$prefix){
-    foreach($_REQUEST as $key=> $val){
+function populate_wizard_bean_from_request($bean, $prefix) {
+    foreach ($_REQUEST as $key=> $val) {
      $key = trim($key);
-     if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-          $field  =substr($key, strlen($prefix)) ;
-          if(isset($_REQUEST[$key]) && !empty($_REQUEST[$key])){
+     if ((strstr($key, $prefix)) && (strpos($key, $prefix) == 0)) {
+          $field = substr($key, strlen($prefix));
+          if (isset($_REQUEST[$key]) && !empty($_REQUEST[$key])) {
               //echo "prefix is $prefix, field is $field,    key is $key,   and value is $val<br>";
               $value = $_REQUEST[$key];
               $bean->$field = $value;
@@ -250,34 +250,34 @@ 
  * If no prospect lists have been specified, then it will create one for you.  A total of 3 prospect lists
  * will be created for you (Subscription, Unsubscription, and test)
  */
-function process_subscriptions_from_request($campaign_name){
+function process_subscriptions_from_request($campaign_name) {
     global $mod_strings;
     $pl_list = array();
 
     //process default target list
     $create_new = true;
     $pl_subs = new ProspectList($campaign_name);
-    if(!empty($_REQUEST['wiz_step3_subscription_list_id'])){
+    if (!empty($_REQUEST['wiz_step3_subscription_list_id'])) {
         //if subscription list is specified then attach
         $pl_subs->retrieve($_REQUEST['wiz_step3_subscription_list_id']);
         //check to see name matches the bean, if not, then the user has chosen to create new bean
-        if($pl_subs->name == $_REQUEST['wiz_step3_subscription_name']){
+        if ($pl_subs->name == $_REQUEST['wiz_step3_subscription_name']) {
             $pl_list[] = $pl_subs;
             $create_new = false;
        }
 
     }
     //create new bio if one was not retrieved successfully
-    if($create_new){
+    if ($create_new) {
         //use default name if one has not been specified
-        $name = $campaign_name . " ".$mod_strings['LBL_SUBSCRIPTION_LIST'];
-        if(isset($_REQUEST['wiz_step3_subscription_name']) && !empty($_REQUEST['wiz_step3_subscription_name'])){
+        $name = $campaign_name." ".$mod_strings['LBL_SUBSCRIPTION_LIST'];
+        if (isset($_REQUEST['wiz_step3_subscription_name']) && !empty($_REQUEST['wiz_step3_subscription_name'])) {
             $name = $_REQUEST['wiz_step3_subscription_name'];
         }
         //if subscription list is not specified then create and attach default one
         $pl_subs->name = $name;
         $pl_subs->list_type = 'default';
-        $pl_subs->assigned_user_id= $GLOBALS['current_user']->id;
+        $pl_subs->assigned_user_id = $GLOBALS['current_user']->id;
         $pl_subs->save();
         $pl_list[] = $pl_subs;
     }
@@ -285,27 +285,27 @@ 
     //process exempt target list
     $create_new = true;
     $pl_un_subs = new ProspectList();
-    if(!empty($_REQUEST['wiz_step3_unsubscription_list_id'])){
+    if (!empty($_REQUEST['wiz_step3_unsubscription_list_id'])) {
         //if unsubscription list is specified then attach
         $pl_un_subs->retrieve($_REQUEST['wiz_step3_unsubscription_list_id']);
         //check to see name matches the bean, if not, then the user has chosen to create new bean
-        if($pl_un_subs->name == $_REQUEST['wiz_step3_unsubscription_name']){
+        if ($pl_un_subs->name == $_REQUEST['wiz_step3_unsubscription_name']) {
             $pl_list[] = $pl_un_subs;
             $create_new = false;
        }
 
     }
     //create new bean if one was not retrieved successfully
-    if($create_new){
+    if ($create_new) {
         //use default name if one has not been specified
-        $name = $campaign_name . " ".$mod_strings['LBL_UNSUBSCRIPTION_LIST'];
-        if(isset($_REQUEST['wiz_step3_unsubscription_name']) && !empty($_REQUEST['wiz_step3_unsubscription_name'])){
+        $name = $campaign_name." ".$mod_strings['LBL_UNSUBSCRIPTION_LIST'];
+        if (isset($_REQUEST['wiz_step3_unsubscription_name']) && !empty($_REQUEST['wiz_step3_unsubscription_name'])) {
             $name = $_REQUEST['wiz_step3_unsubscription_name'];
         }
         //if unsubscription list is not specified then create and attach default one
         $pl_un_subs->name = $name;
         $pl_un_subs->list_type = 'exempt';
-        $pl_un_subs->assigned_user_id= $GLOBALS['current_user']->id;
+        $pl_un_subs->assigned_user_id = $GLOBALS['current_user']->id;
         $pl_un_subs->save();
         $pl_list[] = $pl_un_subs;
     }
@@ -313,26 +313,26 @@ 
     //process test target list
     $pl_test = new ProspectList();
     $create_new = true;
-    if(!empty($_REQUEST['wiz_step3_test_list_id'])){
+    if (!empty($_REQUEST['wiz_step3_test_list_id'])) {
         //if test list is specified then attach
         $pl_test->retrieve($_REQUEST['wiz_step3_test_list_id']);
         //check to see name matches the bean, if not, then the user has chosen to create new bean
-        if($pl_test->name == $_REQUEST['wiz_step3_test_name']){
+        if ($pl_test->name == $_REQUEST['wiz_step3_test_name']) {
             $pl_list[] = $pl_test;
             $create_new = false;
         }
     }
     //create new bio if one was not retrieved successfully
-    if($create_new){
+    if ($create_new) {
         //use default name if one has not been specified
-        $name = $campaign_name . " ".$mod_strings['LBL_TEST_LIST'];
-        if(isset($_REQUEST['wiz_step3_test_name']) && !empty($_REQUEST['wiz_step3_test_name'])){
+        $name = $campaign_name." ".$mod_strings['LBL_TEST_LIST'];
+        if (isset($_REQUEST['wiz_step3_test_name']) && !empty($_REQUEST['wiz_step3_test_name'])) {
             $name = $_REQUEST['wiz_step3_test_name'];
         }
         //if test list is not specified then create and attach default one
         $pl_test->name = $name;
         $pl_test->list_type = 'test';
-        $pl_test->assigned_user_id= $GLOBALS['current_user']->id;
+        $pl_test->assigned_user_id = $GLOBALS['current_user']->id;
         $pl_test->save();
         $pl_list[] = $pl_test;
     }

modules/Campaigns/WebToLeadCapture.php

Spacing +41 added lines, -41 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +47,7 @@ 
 
 $mod_strings = return_module_language($sugar_config['default_language'], 'Leads');
 
-$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads','Bug'=>'Bugs',
+$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads', 'Bug'=>'Bugs',
 
 );
 
@@ -61,18 +61,18 @@ 
 if (isset($_POST['campaign_id']) && !empty($_POST['campaign_id'])) {
 	    //adding the client ip address
 	    $_POST['client_id_address'] = query_client_ip();
-		$campaign_id=$_POST['campaign_id'];
+		$campaign_id = $_POST['campaign_id'];
 		$campaign = new Campaign();
 		$camp_query  = "select name,id from campaigns where id='$campaign_id'";
 		$camp_query .= " and deleted=0";
-        $camp_result=$campaign->db->query($camp_query);
+        $camp_result = $campaign->db->query($camp_query);
         $camp_data = $campaign->db->fetchByAssoc($camp_result);
         // Bug 41292 - have to select marketing_id for new lead
         $db = DBManagerFactory::getInstance();
         $marketing = new EmailMarketing();
         $marketing_query = $marketing->create_new_list_query(
                 'date_start desc, date_modified desc',
-                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < " . $db->convert('', 'today'),
+                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < ".$db->convert('', 'today'),
                 array('id')
         );
         $marketing_result = $db->limitQuery($marketing_query, 0, 1, true);
@@ -83,22 +83,22 @@ 
 			$current_user->retrieve($_REQUEST['assigned_user_id']);
 		} 
 
-	    if(isset($camp_data) && $camp_data != null ){
+	    if (isset($camp_data) && $camp_data != null) {
 			$leadForm = new LeadFormBase();
             $lead = new Lead();
 			$prefix = '';
-			if(!empty($_POST['prefix'])){
+			if (!empty($_POST['prefix'])) {
 				$prefix = $_POST['prefix'];
 			}
 
-			if(empty($lead->id)) {
+			if (empty($lead->id)) {
                 $lead->id = create_guid();
                 $lead->new_with_id = true;
             }
             $GLOBALS['check_notify'] = true;
 
             //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-            if(isset($lead->required_fields['email1'])){
+            if (isset($lead->required_fields['email1'])) {
                 $lead->required_fields['webtolead_email1'] = $lead->required_fields['email1'];
             }
             
@@ -114,7 +114,7 @@ 
             // checkRequired needs a major overhaul before it works for web to lead forms.
             $lead = $leadForm->handleSave($prefix, false, false, false, $lead);
             
-			if(!empty($lead)){
+			if (!empty($lead)) {
 				
 	            //create campaign log
 	            $camplog = new CampaignLog();
@@ -123,9 +123,9 @@ 
 	            $camplog->related_type = $lead->module_dir;
 	            $camplog->activity_type = "lead";
 	            $camplog->target_type = $lead->module_dir;
-	            $campaign_log->activity_date=$timedate->now();
-	            $camplog->target_id    = $lead->id;
-                if(isset($marketing_data['id']))
+	            $campaign_log->activity_date = $timedate->now();
+	            $camplog->target_id = $lead->id;
+                if (isset($marketing_data['id']))
                 {
                     $camplog->marketing_id = $marketing_data['id'];
                 }
@@ -155,7 +155,7 @@ 
                 
 		        $lead->load_relationship('campaigns');
 		        $lead->campaigns->add($camplog->id);
-                if(!empty($GLOBALS['check_notify'])) {
+                if (!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
                 }
                 else {
@@ -164,47 +164,47 @@ 
             }
 
             //in case there are forms out there still using email_opt_out
-            if(isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])){
+            if (isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])) {
                     
-                if(isset ($lead->email1) && !empty($lead->email1)){
+                if (isset ($lead->email1) && !empty($lead->email1)) {
                     $sea = new SugarEmailAddress();
-                    $sea->AddUpdateEmailAddress($lead->email1,0,1);
+                    $sea->AddUpdateEmailAddress($lead->email1, 0, 1);
                 }   
-                if(isset ($lead->email2) && !empty($lead->email2)){
+                if (isset ($lead->email2) && !empty($lead->email2)) {
                     $sea = new SugarEmailAddress();
-                    $sea->AddUpdateEmailAddress($lead->email2,0,1);
+                    $sea->AddUpdateEmailAddress($lead->email2, 0, 1);
                     
                 }
             }              
-			if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
+			if (isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])) {
 			    // Get the redirect url, and make sure the query string is not too long
 		        $redirect_url = $_POST['redirect_url'];
 		        $query_string = '';
 				$first_char = '&';
-				if(strpos($redirect_url, '?') === FALSE){
+				if (strpos($redirect_url, '?') === FALSE) {
 					$first_char = '?';
 				}
 				$first_iteration = true;
 				$get_and_post = array_merge($_GET, $_POST);
-				foreach($get_and_post as $param => $value) {
+				foreach ($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
+					if ($param == 'redirect_url' && $param == 'submit')
 						continue;
 					
-					if($first_iteration){
+					if ($first_iteration) {
 						$first_iteration = false;
 						$query_string .= $first_char;
 					}
-					else{
+					else {
 						$query_string .= "&";
 					}
 					$query_string .= "{$param}=".urlencode($value);
 				}
-				if(empty($lead)) {
-					if($first_iteration){
+				if (empty($lead)) {
+					if ($first_iteration) {
 						$query_string .= $first_char;
 					}
-					else{
+					else {
 						$query_string .= "&";
 					}
 					$query_string .= "error=1";
@@ -215,46 +215,46 @@ 
 
 				// Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
 				//   and use a javascript form submission if that is the case.
-			    if(headers_sent() || strlen($redirect_url) > 2083){
-    				echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    				echo '<form name="redirect" action="' .$_POST['redirect_url']. '" method="GET">';
+			    if (headers_sent() || strlen($redirect_url) > 2083) {
+    				echo '<html '.get_language_header().'><head><title>SugarCRM</title></head><body>';
+    				echo '<form name="redirect" action="'.$_POST['redirect_url'].'" method="GET">';
     
-    				foreach($_POST as $param => $value) {
-    					if($param != 'redirect_url' ||$param != 'submit') {
+    				foreach ($_POST as $param => $value) {
+    					if ($param != 'redirect_url' || $param != 'submit') {
     						echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
     					}
     				}
-    				if(empty($lead)) {
+    				if (empty($lead)) {
     					echo '<input type="hidden" name="error" value="1">';
     				}
     				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     				echo '</body></html>';
     			}
-				else{
+				else {
     				header("Location: {$redirect_url}");
     				die();
 			    }
 			}
-			else{
+			else {
 				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING_LEAD'];
 			}
 			sugar_cleanup();
 			// die to keep code from running into redirect case below
 			die();
 	    }
-	   else{
+	   else {
 	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
 	  }
 }
 
 if (!empty($_POST['redirect'])) {
-    if(headers_sent()){
-    	echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    	echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
+    if (headers_sent()) {
+    	echo '<html '.get_language_header().'><head><title>SugarCRM</title></head><body>';
+    	echo '<form name="redirect" action="'.$_POST['redirect'].'" method="GET">';
     	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     	echo '</body></html>';
     }
-    else{
+    else {
     	header("Location: {$_POST['redirect']}");
     	die();
     }

modules/Campaigns/DeleteTestCampaigns.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,7 +55,7 @@ 
  */
 function deleteTestRecords($focus)
 {
-    if(empty($focus) || empty($focus->id))
+    if (empty($focus) || empty($focus->id))
     {
         return;
     }
@@ -65,17 +65,17 @@ 
             WHERE campaign_log.campaign_id = '{$focus->id}' AND prospect_lists.list_type='test'");
     $test_ids = array();
     $test_list_ids = array();
-    while($row = $focus->db->fetchByAssoc($res)) {
+    while ($row = $focus->db->fetchByAssoc($res)) {
        $test_ids[] = $row['emailid'];
        $test_list_ids[$row['listid']] = true;
     }
     $test_list_ids = array_keys($test_list_ids);
     unset($res);
-    if(!empty($test_ids)) {
+    if (!empty($test_ids)) {
         $focus->db->query("UPDATE emails SET deleted=1 WHERE id IN ('".join("','", $test_ids)."')");
     }
 
-    if(!empty($test_list_ids)) {
+    if (!empty($test_list_ids)) {
         $query = "DELETE FROM emailman WHERE campaign_id = '{$focus->id}' AND list_id IN ('".join("','", $test_list_ids)."')";
         $focus->db->query($query);
 

modules/Campaigns/WebToLeadCreation.php

Spacing +53 added lines, -53 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,30 +55,30 @@ 
 require_once('modules/Campaigns/utils.php');
 
 global $mod_strings, $app_list_strings, $app_strings, $current_user, $import_bean_map;
-global $import_file_name, $theme;$app_list_strings;
+global $import_file_name, $theme; $app_list_strings;
 $lead = new Lead();
 $fields = array();
 
-$xtpl=new XTemplate ('modules/Campaigns/WebToLeadCreation.html');
+$xtpl = new XTemplate('modules/Campaigns/WebToLeadCreation.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
-if(isset($_REQUEST['module']))
+if (isset($_REQUEST['module']))
 {
     $xtpl->assign("MODULE", $_REQUEST['module']);
 }
-if(isset($_REQUEST['return_module']))
+if (isset($_REQUEST['return_module']))
 {
     $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
 }
-if(isset($_REQUEST['return_id']))
+if (isset($_REQUEST['return_id']))
 {
     $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
 }
-if(isset($_REQUEST['return_id']))
+if (isset($_REQUEST['return_id']))
 {
     $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
 }
-if(isset($_REQUEST['record']))
+if (isset($_REQUEST['record']))
 {
     $xtpl->assign("RECORD", $_REQUEST['record']);
 }
@@ -132,69 +132,69 @@ 
 		),
 );
 $encoded_users_popup_request_data = $json->encode($popup_request_data);
-$xtpl->assign('encoded_campaigns_popup_request_data' , $json->encode($popup_request_data));
+$xtpl->assign('encoded_campaigns_popup_request_data', $json->encode($popup_request_data));
 
 //create the cancel button
 $cancel_buttons_html = "<input class='button' onclick=\"this.form.action.value='".$_REQUEST['return_action']."'; this.form.module.value='".$_REQUEST['return_module']."';\" type='submit' name='cancel' value='".$app_strings['LBL_BACK']."'/>";
-$xtpl->assign("CANCEL_BUTTON", $cancel_buttons_html );
+$xtpl->assign("CANCEL_BUTTON", $cancel_buttons_html);
 
 $field_defs_js = "var field_defs = {'Contacts':[";
 
 //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-if(isset($lead->field_defs['webtolead_email1']) && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])){
+if (isset($lead->field_defs['webtolead_email1']) && isset($lead->field_defs['email1']) && isset($lead->field_defs['email1']['required'])) {
     $lead->field_defs['webtolead_email1']['required'] = $lead->field_defs['email1']['required'];
 }
 
-$count= 0;
-foreach($lead->field_defs as $field_def)
+$count = 0;
+foreach ($lead->field_defs as $field_def)
 {
 	$email_fields = false;
-    if($field_def['name']== 'email1' || $field_def['name']== 'email2')
+    if ($field_def['name'] == 'email1' || $field_def['name'] == 'email2')
     {
     	$email_fields = true;
     }
-	  if($field_def['name']!= 'account_name'){
-	    if( ( $field_def['type'] == 'relate' && empty($field_def['custom_type']) )
-	    	|| $field_def['type'] == 'assigned_user_name' || $field_def['type'] =='link'
-	    	|| (isset($field_def['source'])  && $field_def['source']=='non-db' && !$email_fields) || $field_def['type'] == 'id')
+	  if ($field_def['name'] != 'account_name') {
+	    if (($field_def['type'] == 'relate' && empty($field_def['custom_type']))
+	    	|| $field_def['type'] == 'assigned_user_name' || $field_def['type'] == 'link'
+	    	|| (isset($field_def['source']) && $field_def['source'] == 'non-db' && !$email_fields) || $field_def['type'] == 'id')
 	    {
 	        continue;
 	    }
 	   }
-	    if($field_def['name']== 'deleted' || $field_def['name']=='converted' || $field_def['name']=='date_entered'
-	        || $field_def['name']== 'date_modified' || $field_def['name']=='modified_user_id'
-	        || $field_def['name']=='assigned_user_id' || $field_def['name']=='created_by'
-	        || $field_def['name']=='team_id')
+	    if ($field_def['name'] == 'deleted' || $field_def['name'] == 'converted' || $field_def['name'] == 'date_entered'
+	        || $field_def['name'] == 'date_modified' || $field_def['name'] == 'modified_user_id'
+	        || $field_def['name'] == 'assigned_user_id' || $field_def['name'] == 'created_by'
+	        || $field_def['name'] == 'team_id')
 	    {
 	    	continue;
 	    }
 
 
-    $field_def['vname'] = preg_replace('/:$/','',translate($field_def['vname'],'Leads'));
+    $field_def['vname'] = preg_replace('/:$/', '', translate($field_def['vname'], 'Leads'));
 
      //$cols_name = "{'".$field_def['vname']."'}";
      $col_arr = array();
-     if((isset($field_def['required']) && $field_def['required'] != null && $field_def['required'] != 0)
-     	|| $field_def['name']=='last_name'
-     	){
-        $cols_name=$field_def['vname'].' '.$app_strings['LBL_REQUIRED_SYMBOL'];
-        $col_arr[0]=$cols_name;
-        $col_arr[1]=$field_def['name'];
-        $col_arr[2]=true;
+     if ((isset($field_def['required']) && $field_def['required'] != null && $field_def['required'] != 0)
+     	|| $field_def['name'] == 'last_name'
+     	) {
+        $cols_name = $field_def['vname'].' '.$app_strings['LBL_REQUIRED_SYMBOL'];
+        $col_arr[0] = $cols_name;
+        $col_arr[1] = $field_def['name'];
+        $col_arr[2] = true;
      }
-     else{
-	     $cols_name=$field_def['vname'];
-	     $col_arr[0]=$cols_name;
-	     $col_arr[1]=$field_def['name'];
+     else {
+	     $cols_name = $field_def['vname'];
+	     $col_arr[0] = $cols_name;
+	     $col_arr[1] = $field_def['name'];
      }
-     if (! in_array($cols_name, $fields))
+     if (!in_array($cols_name, $fields))
      {
-         array_push($fields,$col_arr);
+         array_push($fields, $col_arr);
      }
      $count++;
 }
 
-$xtpl->assign("WEB_POST_URL",$web_post_url);
+$xtpl->assign("WEB_POST_URL", $web_post_url);
 //$xtpl->assign("LEAD_SELECT_FIELDS",'MOD.LBL_SELECT_LEAD_FIELDS');
 
 require_once('include/QuickSearchDefaults.php');
@@ -204,7 +204,7 @@ 
 					'campaign_name' => $qsd->getQSCampaigns(),
 
 					);
-$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '</script>';
+$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'</script>';
 $xtpl->assign("JAVASCRIPT", $quicksearch_js);
 
 
@@ -213,30 +213,30 @@ 
 if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
 $xtpl->assign("ASSIGNED_USER_OPTIONS", get_select_options_with_id(get_user_array(TRUE, "Active", $focus->assigned_user_id), $focus->assigned_user_id));
 $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
-$xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
+$xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
 
-$xtpl->assign("REDIRECT_URL_DEFAULT",'http://');
+$xtpl->assign("REDIRECT_URL_DEFAULT", 'http://');
 
 //required fields on Webtolead form
-$campaign= new Campaign();
+$campaign = new Campaign();
 
 $javascript = new javascript();
 $javascript->setFormName('WebToLeadCreation');
 $javascript->setSugarBean($lead);
 $javascript->addAllFields('');
 //$javascript->addFieldGeneric('redirect_url', '', 'LBL_REDIRECT_URL' ,'true');
-$javascript->addFieldGeneric('campaign_name', '', 'LBL_RELATED_CAMPAIGN' ,'true');
-$javascript->addFieldGeneric('assigned_user_name', '', 'LBL_ASSIGNED_TO' ,'true');
-$javascript->addToValidateBinaryDependency('campaign_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'] . $mod_strings['LBL_LEAD_NOTIFY_CAMPAIGN'], 'false', '', 'campaign_id');
-$javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'] . $app_strings['LBL_ASSIGNED_TO'], 'false', '', 'assigned_user_id');
+$javascript->addFieldGeneric('campaign_name', '', 'LBL_RELATED_CAMPAIGN', 'true');
+$javascript->addFieldGeneric('assigned_user_name', '', 'LBL_ASSIGNED_TO', 'true');
+$javascript->addToValidateBinaryDependency('campaign_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'].$mod_strings['LBL_LEAD_NOTIFY_CAMPAIGN'], 'false', '', 'campaign_id');
+$javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'].$app_strings['LBL_ASSIGNED_TO'], 'false', '', 'assigned_user_id');
 echo $javascript->getScript();
 
 $json = getJSONobj();
 $lead_fields = $json->encode($fields);
-$xtpl->assign("LEAD_FIELDS",$lead_fields);
+$xtpl->assign("LEAD_FIELDS", $lead_fields);
 $classname = "SUGAR_GRID";
-$xtpl->assign("CLASSNAME",$classname);
-$xtpl->assign("DRAG_DROP_CHOOSER_WEB_TO_LEAD",constructDDWebToLeadFields($fields,$classname));
+$xtpl->assign("CLASSNAME", $classname);
+$xtpl->assign("DRAG_DROP_CHOOSER_WEB_TO_LEAD", constructDDWebToLeadFields($fields, $classname));
 
 $xtpl->parse("main");
 $xtpl->out("main");
@@ -249,20 +249,20 @@ 
 /*
  *This function constructs Drag and Drop multiselect box of subscriptions for display in manage subscription form
 */
-function constructDDWebToLeadFields($fields,$classname){
+function constructDDWebToLeadFields($fields, $classname) {
 require_once("include/templates/TemplateDragDropChooser.php");
 global $mod_strings;
 $d2 = array();
     //now call function that creates javascript for invoking DDChooser object
     $dd_chooser = new TemplateDragDropChooser();
-    $dd_chooser->args['classname']  = $classname;
+    $dd_chooser->args['classname'] = $classname;
     $dd_chooser->args['left_header']  = $mod_strings['LBL_AVALAIBLE_FIELDS_HEADER'];
     $dd_chooser->args['mid_header']   = $mod_strings['LBL_LEAD_FORM_FIRST_HEADER'];
     $dd_chooser->args['right_header'] = $mod_strings['LBL_LEAD_FORM_SECOND_HEADER'];
     $dd_chooser->args['left_data']    = $fields;
     $dd_chooser->args['mid_data']     = $d2;
     $dd_chooser->args['right_data']   = $d2;
-    $dd_chooser->args['title']        =  ' ';
+    $dd_chooser->args['title']        = ' ';
     $dd_chooser->args['left_div_name']      = 'ddgrid2';
     $dd_chooser->args['mid_div_name']       = 'ddgrid3';
     $dd_chooser->args['right_div_name']     = 'ddgrid4';
@@ -279,11 +279,11 @@ 
 	$str .= "<script>
 		       function displayAddRemoveDragButtons(Add_All_Fields,Remove_All_Fields){
 				    var addRemove = document.getElementById('lead_add_remove_button');
-				    if(" . $dd_chooser->args['classname'] . "_grid0.getDataModel().getTotalRowCount() ==0) {
+				    if(" . $dd_chooser->args['classname']."_grid0.getDataModel().getTotalRowCount() ==0) {
 				     addRemove.setAttribute('value',Remove_All_Fields);
 				     addRemove.setAttribute('title',Remove_All_Fields);
 				    }
-				    else if(" . $dd_chooser->args['classname'] . "_grid1.getDataModel().getTotalRowCount() ==0 && " . $dd_chooser->args['classname'] . "_grid2.getDataModel().getTotalRowCount() ==0){
+				    else if(" . $dd_chooser->args['classname']."_grid1.getDataModel().getTotalRowCount() ==0 && ".$dd_chooser->args['classname']."_grid2.getDataModel().getTotalRowCount() ==0){
 				     addRemove.setAttribute('value',Add_All_Fields);
 				     addRemove.setAttribute('title',Add_All_Fields);
 				    }

modules/Campaigns/WizardEmailSetup.php

Spacing +24 added lines, -24 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -52,10 +52,10 @@ 
 
 
 
-global $mod_strings,$app_list_strings,$app_strings,$current_user;
+global $mod_strings, $app_list_strings, $app_strings, $current_user;
 
 
-if (!is_admin($current_user)&& !is_admin_for_module($GLOBALS['current_user'],'Campaigns')) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user) && !is_admin_for_module($GLOBALS['current_user'], 'Campaigns')) sugar_die("Unauthorized access to administration.");
 
 $params = array();
 $params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
@@ -101,25 +101,25 @@ 
 $ss->assign('PROTOCOL', get_select_options_with_id($protocol, ''));
 if (isset($focus->settings['massemailer_campaign_emails_per_run']) && !empty($focus->settings['massemailer_campaign_emails_per_run'])) {
     $ss->assign("EMAILS_PER_RUN", $focus->settings['massemailer_campaign_emails_per_run']);
-} else  {
+} else {
     $ss->assign("EMAILS_PER_RUN", 500);
 }
 
-if (!isset($focus->settings['massemailer_tracking_entities_location_type']) or empty($focus->settings['massemailer_tracking_entities_location_type']) or $focus->settings['massemailer_tracking_entities_location_type']=='1') {
+if (!isset($focus->settings['massemailer_tracking_entities_location_type']) or empty($focus->settings['massemailer_tracking_entities_location_type']) or $focus->settings['massemailer_tracking_entities_location_type'] == '1') {
     $ss->assign("DEFAULT_CHECKED", "checked");
     $ss->assign("TRACKING_ENTRIES_LOCATION_STATE", "disabled");
-    $ss->assign("TRACKING_ENTRIES_LOCATION",$mod_strings['TRACKING_ENTRIES_LOCATION_DEFAULT_VALUE']);
-} else  {
+    $ss->assign("TRACKING_ENTRIES_LOCATION", $mod_strings['TRACKING_ENTRIES_LOCATION_DEFAULT_VALUE']);
+} else {
     $ss->assign("USERDEFINED_CHECKED", "checked");
-    $ss->assign("TRACKING_ENTRIES_LOCATION",$focus->settings["massemailer_tracking_entities_location"]);
+    $ss->assign("TRACKING_ENTRIES_LOCATION", $focus->settings["massemailer_tracking_entities_location"]);
 }
 
-$ss->assign("SITEURL",$sugar_config['site_url']);
+$ss->assign("SITEURL", $sugar_config['site_url']);
 
 // Change the default campaign to not store a copy of each message.
-if (!empty($focus->settings['massemailer_email_copy']) and $focus->settings['massemailer_email_copy']=='1') {
+if (!empty($focus->settings['massemailer_email_copy']) and $focus->settings['massemailer_email_copy'] == '1') {
     $ss->assign("YES_CHECKED", "checked='checked'");
-} else  {
+} else {
     $ss->assign("NO_CHECKED", "checked='checked'");
 }
 
@@ -129,25 +129,25 @@ 
 /*********** New Mail Box UI DIV Stuff ****************/
 $mbox_qry = "select * from inbound_email where deleted ='0' and mailbox_type = 'bounce'";
 $mbox_res = $focus->db->query($mbox_qry);
-while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)){$mbox[] = $mbox_row;}
+while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)) {$mbox[] = $mbox_row; }
 $mbox_msg = ' ';
 $need_mbox = '';  
 
 $mboxTable = "<table class='list view' width='100%' border='0' cellspacing='1' cellpadding='1'>";
-if(isset($mbox) && count($mbox)>0){
-    $mboxTable .= "<tr><td colspan='5'><b>" .count($mbox) ." ". $mod_strings['LBL_MAILBOX_CHECK_WIZ_GOOD']." </b>.</td></tr>";
+if (isset($mbox) && count($mbox) > 0) {
+    $mboxTable .= "<tr><td colspan='5'><b>".count($mbox)." ".$mod_strings['LBL_MAILBOX_CHECK_WIZ_GOOD']." </b>.</td></tr>";
         $mboxTable .= "<tr class='listViewHRS1'><td width='20%'><b>".$mod_strings['LBL_MAILBOX_NAME']."</b></td>"
                    .  " <td width='20%'><b>".$mod_strings['LBL_LOGIN']."</b></td>"
                    .  " <td width='20%'><b>".$mod_strings['LBL_MAILBOX']."</b></td>" 
                    .  " <td width='20%'><b>".$mod_strings['LBL_SERVER_URL']."</b></td>"
                    .  " <td width='20%'><b>".$mod_strings['LBL_LIST_STATUS']."</b></td></tr>";
-    $colorclass=' ';
-    foreach($mbox as $details){
+    $colorclass = ' ';
+    foreach ($mbox as $details) {
                 
-     if( $colorclass == "class='evenListRowS1'"){
-            $colorclass= "class='oddListRowS1'";
-        }else{ 
-            $colorclass= "class='evenListRowS1'";
+     if ($colorclass == "class='evenListRowS1'") {
+            $colorclass = "class='oddListRowS1'";
+        } else { 
+            $colorclass = "class='evenListRowS1'";
         }           
         
         $mboxTable .= "<tr $colorclass>";
@@ -159,7 +159,7 @@ 
     }
 
 
-}else{
+} else {
 $need_mbox = 'checked';
 $mboxTable .= "<tr><td colspan='5'><b>".$mod_strings['LBL_MAILBOX_CHECK_WIZ_BAD']." </b>.</td></tr>";
 }        
@@ -167,7 +167,7 @@ 
 $ss->assign("MAILBOXES_DETECTED_MESSAGE", $mboxTable);
 $ss->assign("MBOX_NEEDED", $need_mbox);          
 $ss->assign('ROLLOVER', $email->rolloverStyle);
-if(!function_exists('imap_open')) {
+if (!function_exists('imap_open')) {
     $ss->assign('IE_DISABLED', 'DISABLED');   
 }
 /**************************** SUMMARY UI DIV Stuff *******************/
@@ -406,13 +406,13 @@ 
 </script>
 EOQ;
 
-if(isset($_REQUEST['error'])){
+if (isset($_REQUEST['error'])) {
     //if there is an error flagged, then we are coming here after a save where there was an error detected
     //on an inbound email save.  Display error to user so they are aware.
     $errorString = "<div class='error'>".$mod_strings['ERR_NO_OPTS_SAVED']."  <a href='index.php?module=InboundEmail&action=index'>".$mod_strings['ERR_REVIEW_EMAIL_SETTINGS']."</a></div>";
     $ss->assign('ERROR', $errorString);
     //navigate to inbound email page by default
-    $divScript .=" <script>navigate('next');</script>";
+    $divScript .= " <script>navigate('next');</script>";
 }
 
 $ss->assign("DIV_JAVASCRIPT", $divScript);

modules/Campaigns/ProcessBouncedEmails.php

Spacing +34 added lines, -34 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -69,31 +69,31 @@ 
  * @param string $email_description
  * @return string
  */
-function createBouncedCampaignLogEntry($row,$email, $email_description)
+function createBouncedCampaignLogEntry($row, $email, $email_description)
 {
     $GLOBALS['log']->debug("Creating bounced email campaign log");
     $bounce = new CampaignLog();
-    $bounce->campaign_id=$row['campaign_id'];
-    $bounce->target_tracker_key=$row['target_tracker_key'];
-    $bounce->target_id= $row['target_id'];
-    $bounce->target_type=$row['target_type'];
-    $bounce->list_id=$row['list_id'];
-    $bounce->marketing_id=$row['marketing_id'];
+    $bounce->campaign_id = $row['campaign_id'];
+    $bounce->target_tracker_key = $row['target_tracker_key'];
+    $bounce->target_id = $row['target_id'];
+    $bounce->target_type = $row['target_type'];
+    $bounce->list_id = $row['list_id'];
+    $bounce->marketing_id = $row['marketing_id'];
 
-    $bounce->activity_date=$email->date_created;
-    $bounce->related_type='Emails';
-    $bounce->related_id= $email->id;
+    $bounce->activity_date = $email->date_created;
+    $bounce->related_type = 'Emails';
+    $bounce->related_id = $email->id;
 
     //do we have the phrase permanent error in the email body.
-    if (preg_match('/permanent[ ]*error/',$email_description))
+    if (preg_match('/permanent[ ]*error/', $email_description))
     {
-        $bounce->activity_type='invalid email';
+        $bounce->activity_type = 'invalid email';
         markEmailAddressInvalid($email);
     }
     else 
-        $bounce->activity_type='send error';
+        $bounce->activity_type = 'send error';
         
-    $return_id=$bounce->save();
+    $return_id = $bounce->save();
     return $return_id;
 }
 
@@ -104,11 +104,11 @@ 
  */
 function markEmailAddressInvalid($email_address)
 {
-    if(empty($email_address))
+    if (empty($email_address))
         return;
     $sea = new SugarEmailAddress();
-    $rs = $sea->retrieve_by_string_fields( array('email_address_caps' => trim(strtoupper($email_address))) );
-    if($rs != null)
+    $rs = $sea->retrieve_by_string_fields(array('email_address_caps' => trim(strtoupper($email_address))));
+    if ($rs != null)
     {
         $sea->AddUpdateEmailAddress($email_address, 1, 0, $rs->id);
     }
@@ -124,10 +124,10 @@ 
 {
     $row = FALSE;
     $targeted = new CampaignLog();
-    $where="campaign_log.activity_type='targeted' and campaign_log.target_tracker_key='{$identifier}'";
-    $query=$targeted->create_new_list_query('',$where);
-    $result=$targeted->db->query($query);
-    $row=$targeted->db->fetchByAssoc($result);
+    $where = "campaign_log.activity_type='targeted' and campaign_log.target_tracker_key='{$identifier}'";
+    $query = $targeted->create_new_list_query('', $where);
+    $result = $targeted->db->query($query);
+    $row = $targeted->db->fetchByAssoc($result);
     
     return $row;
 }
@@ -144,15 +144,15 @@ 
     $identifiers = array();
     $found = FALSE;
     //Check if the identifier is present in the header.
-    if(preg_match('/X-CampTrackID: [a-z0-9\-]*/',$email_description,$matches)) 
+    if (preg_match('/X-CampTrackID: [a-z0-9\-]*/', $email_description, $matches)) 
     {
-        $identifiers = preg_split('/X-CampTrackID: /',$matches[0],-1,PREG_SPLIT_NO_EMPTY);
+        $identifiers = preg_split('/X-CampTrackID: /', $matches[0], -1, PREG_SPLIT_NO_EMPTY);
         $found = TRUE;
         $GLOBALS['log']->debug("Found campaign identifier in header of email");  
     }
-    else if( preg_match('/index.php\?entryPoint=removeme&identifier=[a-z0-9\-]*/',$email_description, $matches) )
+    else if (preg_match('/index.php\?entryPoint=removeme&identifier=[a-z0-9\-]*/', $email_description, $matches))
     {
-        $identifiers = preg_split('/index.php\?entryPoint=removeme&identifier=/',$matches[0],-1,PREG_SPLIT_NO_EMPTY);
+        $identifiers = preg_split('/index.php\?entryPoint=removeme&identifier=/', $matches[0], -1, PREG_SPLIT_NO_EMPTY);
         $found = TRUE;
         $GLOBALS['log']->debug("Found campaign identifier in body of email");
     }
@@ -167,21 +167,21 @@ 
 	$email_description = $email->raw_source;
     	
 	//if raw_source is empty, try using the description instead
-    	if (empty($email_description)){
+    	if (empty($email_description)) {
         	$email_description = $email->description;
 	}
 
     $email_description .= retrieveErrorReportAttachment($email);
 
-	if (preg_match('/MAILER-DAEMON|POSTMASTER/i',$emailFromAddress)) 
+	if (preg_match('/MAILER-DAEMON|POSTMASTER/i', $emailFromAddress)) 
 	{
-	    $email_description=quoted_printable_decode($email_description);
-		$matches=array();
+	    $email_description = quoted_printable_decode($email_description);
+		$matches = array();
 		
 		//do we have the identifier tag in the email?
 		$identifierScanResults = checkBouncedEmailForIdentifier($email_description);
 		
-		if ( $identifierScanResults['found'] ) 
+		if ($identifierScanResults['found']) 
 		{
 			$matches = $identifierScanResults['matches'];
 			$identifiers = $identifierScanResults['identifiers'];
@@ -198,10 +198,10 @@ 
 					//do not create another campaign_log record is we already have an
 					//invalid email or send error entry for this tracker key.
 					$query_log = "select * from campaign_log where target_tracker_key='{$row['target_tracker_key']}'"; 
-					$query_log .=" and (activity_type='invalid email' or activity_type='send error')";
+					$query_log .= " and (activity_type='invalid email' or activity_type='send error')";
                     $targeted = new CampaignLog();
-					$result_log=$targeted->db->query($query_log);
-					$row_log=$targeted->db->fetchByAssoc($result_log);
+					$result_log = $targeted->db->query($query_log);
+					$row_log = $targeted->db->fetchByAssoc($result_log);
 
 					if (empty($row_log)) 
 					{

modules/Campaigns/WebToLeadFormSave.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,52 +56,52 @@ 
 
 //-----------begin replacing text input tags that have been marked with text area tags
 //get array of text areas strings to process
-$bodyHTML = html_entity_decode($_REQUEST['body_html'],ENT_QUOTES);
+$bodyHTML = html_entity_decode($_REQUEST['body_html'], ENT_QUOTES);
 //Bug53791
 $bodyHTML = str_replace(chr(160), " ", $bodyHTML);
 
-while (strpos($bodyHTML, "ta_replace") !== false){
+while (strpos($bodyHTML, "ta_replace") !== false) {
 
 	//define the marker edges of the sub string to process (opening and closing tag brackets)
 	$marker = strpos($bodyHTML, "ta_replace");
-	$start_border = strpos($bodyHTML, "input", $marker) - 1;// to account for opening '<' char;
+	$start_border = strpos($bodyHTML, "input", $marker) - 1; // to account for opening '<' char;
 	$end_border = strpos($bodyHTML, '>', $start_border); //get the closing tag after marker ">";
 
 	//extract the input tag string
-	$working_str = substr($bodyHTML, $marker-3, $end_border-($marker-3) );
+	$working_str = substr($bodyHTML, $marker - 3, $end_border - ($marker - 3));
 
 	//replace input markup with text areas markups
-	$new_str = str_replace('input','textarea',$working_str);
+	$new_str = str_replace('input', 'textarea', $working_str);
 	$new_str = str_replace("type='text'", ' ', $new_str);
-	$new_str = $new_str . '> </textarea';
+	$new_str = $new_str.'> </textarea';
 
 	//replace the marker with generic term
 	$new_str = str_replace('ta_replace', 'sugarslot', $new_str);
 
 	//merge the processed string back into bodyhtml string
-	$bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
+	$bodyHTML = str_replace($working_str, $new_str, $bodyHTML);
 }
 //<<<----------end replacing marked text inputs with text area tags
 
 $guid = create_guid();
 $form_file = "upload://$guid";
 
-$SugarTiny =  new SugarTinyMCE();
+$SugarTiny = new SugarTinyMCE();
 $html = $SugarTiny->cleanEncodedMCEHtml($bodyHTML);
 
 //Check to ensure we have <html> tags in the form. Without them, IE8 will attempt to display the page as XML.
 if (stripos($html, "<html") === false) {
     $langHeader = get_language_header();
-    $html = "<html {$langHeader}><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>" . $html . "</body></html>";
+    $html = "<html {$langHeader}><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>".$html."</body></html>";
 }
 file_put_contents($form_file, $html);
 
-$xtpl=new XTemplate ('modules/Campaigns/WebToLeadDownloadForm.html');
+$xtpl = new XTemplate('modules/Campaigns/WebToLeadDownloadForm.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
 $webformlink = "<b>$mod_strings[LBL_DOWNLOAD_TEXT_WEB_TO_LEAD_FORM]</b><br/>";
 $webformlink .= "<a href=\"index.php?entryPoint=download&id={$guid}&isTempFile=1&tempName=WebToLeadForm.html&type=temp\">$mod_strings[LBL_DOWNLOAD_WEB_TO_LEAD_FORM]</a>";
-$xtpl->assign("LINK_TO_WEB_FORM",$webformlink);
+$xtpl->assign("LINK_TO_WEB_FORM", $webformlink);
 $xtpl->assign("RAW_SOURCE", htmlspecialchars($html)); 
 $xtpl->parse("main.copy_source");
 $xtpl->parse("main");