adamjakab / SuiteCRM

modules/Campaigns/WizardNewsletter.php

Indentation +27 added lines, -27 removed lines

@@ -294,7 +294,7 @@ 
     foreach($trkr_lists as $trkr_id){
         $ct_focus = new CampaignTracker();
         $ct_focus->retrieve($trkr_id);
-      if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
+        if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
             if($ct_focus->is_optout){$opt = 'checked';}else{$opt = '';}
             $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>" ;
             $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'] . $trkr_count ."' id='existing_is_optout". $trkr_count ."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id". $trkr_count ."'type='hidden''/></td>";
@@ -305,8 +305,8 @@ 
 
 
 
-      }
-      $trkr_count =$trkr_count+1;
+        }
+        $trkr_count =$trkr_count+1;
     }
     
     $trkr_html .= "<div id='no_trackers'></div>";
@@ -391,33 +391,33 @@ 
 $prospect_lists = $focus->prospectlists->get();
 
 if((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] ==1) || ($focus->campaign_type=='NewsLetter')){
- //this is a newsletter type campaign, fill in subscription values   
+    //this is a newsletter type campaign, fill in subscription values   
 
 //if prospect lists are returned, then iterate through and populate form values
 if(count($prospect_lists)>0){
     
     foreach($prospect_lists as $pl_id){
     //retrieve prospect list
-     $pl = new ProspectList();   
-     $pl->retrieve($pl_id);
+        $pl = new ProspectList();   
+        $pl->retrieve($pl_id);
 
-      if(isset($pl->list_type) && !empty($pl->list_type)){
-         //assign values based on type
-         if(($pl->list_type == 'default') || ($pl->list_type == 'seed')){            
+        if(isset($pl->list_type) && !empty($pl->list_type)){
+            //assign values based on type
+            if(($pl->list_type == 'default') || ($pl->list_type == 'seed')){            
             $ss->assign('SUBSCRIPTION_ID', $pl->id);
             $ss->assign('SUBSCRIPTION_NAME', $pl->name);
-         };
-         if($pl->list_type == 'exempt'){
+            };
+            if($pl->list_type == 'exempt'){
             $ss->assign('UNSUBSCRIPTION_ID', $pl->id);
             $ss->assign('UNSUBSCRIPTION_NAME', $pl->name);
          
-         };
-         if($pl->list_type == 'test'){
+            };
+            if($pl->list_type == 'test'){
             $ss->assign('TEST_ID', $pl->id);
             $ss->assign('TEST_NAME', $pl->name);
          
-         };
-      }
+            };
+        }
      
     }
 }
@@ -425,7 +425,7 @@ 
 
 
 }else{
- //this is not a newlsetter campaign, so fill in target list table
+    //this is not a newlsetter campaign, so fill in target list table
     //create array for javascript, this will help to display the option text, not the value
     $dom_txt =' ';
     foreach($app_list_strings['prospect_list_type_dom'] as $key=>$val){
@@ -438,19 +438,19 @@ 
         
         foreach($prospect_lists as $pl_id){
         //retrieve prospect list
-             $pl = new ProspectList();   
-             $pl_focus = $pl->retrieve($pl_id);
-             $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>" ;
-             $trgt_html .= "<td width='25%'> <input id='existing_target_name". $trgt_count ."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name". $trgt_count ."'  value='". $pl_focus->name."' >". $pl_focus->name."</td>";
-             $trgt_html .= "<td width='25%'><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type". $trgt_count ."'   id='existing_tracker_list_type". $trgt_count ."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
-             $trgt_html .= "<input type='hidden' name='added_target_id". $trgt_count ."' id='added_target_id". $trgt_count ."' value='". $pl_focus->id ."' ></td>";
-             $trgt_html .= "<td><a href='#' onclick=\"javascript:remove_existing_target('existing_trgt".$trgt_count."','".$pl_focus->id."'); \" >  ";
-             $trgt_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0' align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
+                $pl = new ProspectList();   
+                $pl_focus = $pl->retrieve($pl_id);
+                $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>" ;
+                $trgt_html .= "<td width='25%'> <input id='existing_target_name". $trgt_count ."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name". $trgt_count ."'  value='". $pl_focus->name."' >". $pl_focus->name."</td>";
+                $trgt_html .= "<td width='25%'><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type". $trgt_count ."'   id='existing_tracker_list_type". $trgt_count ."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
+                $trgt_html .= "<input type='hidden' name='added_target_id". $trgt_count ."' id='added_target_id". $trgt_count ."' value='". $pl_focus->id ."' ></td>";
+                $trgt_html .= "<td><a href='#' onclick=\"javascript:remove_existing_target('existing_trgt".$trgt_count."','".$pl_focus->id."'); \" >  ";
+                $trgt_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0' align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
 
 
     
           
-          $trgt_count =$trgt_count +1;
+            $trgt_count =$trgt_count +1;
         }
         
         $trgt_html  .= "<div id='no_targets'></div>";
@@ -491,7 +491,7 @@ 
 
 
 //  this is the wizard control script that resides in page    
- $divScript = <<<EOQ
+    $divScript = <<<EOQ
 
  <script type="text/javascript" language="javascript">
    
@@ -605,7 +605,7 @@ 
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+3).">".$summ_url."</div></td></tr>";
     }else{
-     $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";   
+        $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";   
     }
        
     $nav_html .= '</table>';

Spacing +120 added lines, -120 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.
@@ -64,10 +64,10 @@ 
 /*************** GENERAL SETUP WORK **********/
 
 $focus = new Campaign();
-if(isset($_REQUEST['record'])) {
+if (isset($_REQUEST['record'])) {
     $focus->retrieve($_REQUEST['record']);
 }
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
+if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
     $focus->id = "";
 }
 global $theme;
@@ -78,9 +78,9 @@ 
 
 $GLOBALS['log']->info("Campaign NewsLetter Wizard");
 
-if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_NEWSLETTER WIZARD_TITLE'].$focus->name), true, false);
-}else{
+} else {
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_CAMPAIGN'].$focus->name), true, false);   
 }
 
@@ -104,26 +104,26 @@ 
 $sqs_objects = array('parent_name' => $qsd->getQSParent(), 
                     'assigned_user_name' => $qsd->getQSUser(),
                     //'prospect_list_name' => getProspectListQSObjects(),
-                    'test_name' => getProspectListQSObjects('prospect_list_type_test', 'test_name','wiz_step3_test_name_id'),
-                    'unsubscription_name' => getProspectListQSObjects('prospect_list_type_exempt', 'unsubscription_name','wiz_step3_unsubscription_name_id'),
-                    'subscription_name' => getProspectListQSObjects('prospect_list_type_default', 'subscription_name','wiz_step3_subscription_name_id'),
+                    'test_name' => getProspectListQSObjects('prospect_list_type_test', 'test_name', 'wiz_step3_test_name_id'),
+                    'unsubscription_name' => getProspectListQSObjects('prospect_list_type_exempt', 'unsubscription_name', 'wiz_step3_unsubscription_name_id'),
+                    'subscription_name' => getProspectListQSObjects('prospect_list_type_default', 'subscription_name', 'wiz_step3_subscription_name_id'),
                     );
                     
 
-$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>';
 
 $ss->assign("JAVASCRIPT", $quicksearch_js);
 
 
 //set the campaign type based on wizardtype value from request object
 $campaign_type = 'newsletter';
-if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
     $campaign_type = 'newsletter';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());    
-}elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
+}elseif ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 2) || ($focus->campaign_type == 'Email')) {
     $campaign_type = 'email';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());
-}else{
+} else {
     $campaign_type = 'general';
 }
 
@@ -143,7 +143,7 @@ 
 
 //set default values
 $ss->assign("CALENDAR_LANG", "en");
-$ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
+$ss->assign("USER_DATEFORMAT", '('.$timedate->get_user_date_format().')');
 $ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
 $ss->assign("CAMP_DATE_ENTERED", $focus->date_entered);
 $ss->assign("CAMP_DATE_MODIFIED", $focus->date_modified);
@@ -166,50 +166,50 @@ 
 if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
 $ss->assign("ASSIGNED_USER_OPTIONS", get_select_options_with_id(get_user_array(TRUE, "Active", $focus->assigned_user_id), $focus->assigned_user_id));
 $ss->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
-$ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
+$ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
 
-if((!isset($focus->status)) && (!isset($focus->id)))
+if ((!isset($focus->status)) && (!isset($focus->id)))
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], 'Planning'));
 else
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], $focus->status));
 
 //hide frequency options if this is not a newsletter
-if($campaign_type == 'newsletter'){
+if ($campaign_type == 'newsletter') {
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "Select");
     $ss->assign("FREQUENCY_LABEL", $mod_strings['LBL_CAMPAIGN_FREQUENCY']);
-    if((!isset($focus->frequency)) && (!isset($focus->id))){
+    if ((!isset($focus->frequency)) && (!isset($focus->id))) {
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], 'Monthly'));
-    }else{
+    } else {
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], $focus->frequency));
     }
-}else{
+} else {
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "input type='hidden'");
     $ss->assign("FREQUENCY_LABEL", '&nbsp;');
 }
 global $current_user;
 require_once('modules/Currencies/ListCurrency.php');
 $currency = new ListCurrency();
-if(isset($focus->currency_id) && !empty($focus->currency_id)){
+if (isset($focus->currency_id) && !empty($focus->currency_id)) {
     $selectCurrency = $currency->getSelectOptions($focus->currency_id);
     $ss->assign("CURRENCY", $selectCurrency);
 }
-else if($current_user->getPreference('currency') && !isset($focus->id))
+else if ($current_user->getPreference('currency') && !isset($focus->id))
 {
     $selectCurrency = $currency->getSelectOptions($current_user->getPreference('currency'));
     $ss->assign("CURRENCY", $selectCurrency);
-}else{
+} else {
 
     $selectCurrency = $currency->getSelectOptions();
     $ss->assign("CURRENCY", $selectCurrency);
 
 }
 global $current_user;
-if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){  
+if (is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])) {  
     $record = '';
-    if(!empty($_REQUEST['record'])){
-        $record =   $_REQUEST['record'];
+    if (!empty($_REQUEST['record'])) {
+        $record = $_REQUEST['record'];
     }
-    $ss->assign("ADMIN_EDIT","<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action'] ."&from_module=".$_REQUEST['module'] ."&record=".$record. "'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDIT_LAYOUT'])."</a>");
+    $ss->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action']."&from_module=".$_REQUEST['module']."&record=".$record."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT'])."</a>");
 
 }
 
@@ -221,54 +221,54 @@ 
 
 
 //fill out the campaign type dropdown based on type of campaign being created
-if($campaign_type == 'general'){
+if ($campaign_type == 'general') {
     //get regular campaign dom object and strip out entries for email and newsletter
     $myTypeOptionsArr = array();
     $OptionsArr = $app_list_strings['campaign_type_dom'];
-    foreach($OptionsArr as $key=>$val){
-        if($val =='Newsletter' || $val =='Email' || $val =='' ){
+    foreach ($OptionsArr as $key=>$val) {
+        if ($val == 'Newsletter' || $val == 'Email' || $val == '') {
             //do not add   
-        }else{
+        } else {
             $myTypeOptionsArr[$key] = $val;
         }
     }
     
     //now create select option html without the newsletter/email, or blank ('') options
-    $type_option_html =' ';
+    $type_option_html = ' ';
     $selected = false;
-    foreach($myTypeOptionsArr as $optionKey=>$optionName){
+    foreach ($myTypeOptionsArr as $optionKey=>$optionName) {
         //if the selected flag is set to true, then just populate
-        if($selected){
-            $type_option_html .="<option value='$optionKey' >$optionName</option>";
-        }else{//if not selected yet, check to see if this option should be selected
+        if ($selected) {
+            $type_option_html .= "<option value='$optionKey' >$optionName</option>";
+        } else {//if not selected yet, check to see if this option should be selected
             //if the campaign type is not empty, then select the retrieved type
-            if(!empty($focus->campaign_type)){
+            if (!empty($focus->campaign_type)) {
                 //check to see if key matches campaign type
-                if($optionKey == $focus->campaign_type){
+                if ($optionKey == $focus->campaign_type) {
                     //mark as selected
-                    $type_option_html .="<option value='$optionKey' selected>$optionName</option>";
+                    $type_option_html .= "<option value='$optionKey' selected>$optionName</option>";
                     //mark as selected for next time
-                    $selected=true;
-                }else{
+                    $selected = true;
+                } else {
                     //key does not match, just populate
-                    $type_option_html .="<option value='$optionKey' >$optionName</option>";
+                    $type_option_html .= "<option value='$optionKey' >$optionName</option>";
                 }
-            }else{
+            } else {
             //since the campaign type is empty, then select first one                
-                $type_option_html .="<option value='$optionKey' selected>$optionName</option>";    
+                $type_option_html .= "<option value='$optionKey' selected>$optionName</option>";    
                 //mark as selected for next time
-                $selected=true;
+                $selected = true;
             }
         }    
     }
     //assign the modified dropdown for general campaign creation
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $type_option_html);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "select");    
-}elseif($campaign_type == 'email'){
+}elseif ($campaign_type == 'email') {
     //Assign Email as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_EMAIL']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='Email'");
-}else{
+} else {
     //Assign NewsLetter as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_NEWSLETTER']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='NewsLetter'");
@@ -284,33 +284,33 @@ 
 $focus->load_relationship('tracked_urls');
 
 $trkr_lists = $focus->tracked_urls->get();
-$trkr_html ='';    
-$ss->assign('TRACKER_COUNT',count($trkr_lists));
-if(count($trkr_lists)>0){
+$trkr_html = '';    
+$ss->assign('TRACKER_COUNT', count($trkr_lists));
+if (count($trkr_lists) > 0) {
 global $odd_bg, $even_bg, $hilite_bg;
     
     $trkr_count = 0;
 //create the html to create tracker table
-    foreach($trkr_lists as $trkr_id){
+    foreach ($trkr_lists as $trkr_id) {
         $ct_focus = new CampaignTracker();
         $ct_focus->retrieve($trkr_id);
-      if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
-            if($ct_focus->is_optout){$opt = 'checked';}else{$opt = '';}
-            $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>" ;
-            $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'] . $trkr_count ."' id='existing_is_optout". $trkr_count ."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id". $trkr_count ."'type='hidden''/></td>";
-            $trkr_html .= "<td width='40%'> <input id='existing_tracker_name". $trkr_count ."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME']. $trkr_count ."' value='".$ct_focus->tracker_name."' ></td>";
-            $trkr_html .= "<td width='40%'><input type='text' size='60' maxlength='255' name='wiz_step3_tracker_url". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_URL']. $trkr_count ."' id='existing_tracker_url". $trkr_count ."' value='".$ct_focus->tracker_url."' ></td>";
+      if (isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)) {
+            if ($ct_focus->is_optout) {$opt = 'checked'; } else {$opt = ''; }
+            $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>";
+            $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'].$trkr_count."' id='existing_is_optout".$trkr_count."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id".$trkr_count."'type='hidden''/></td>";
+            $trkr_html .= "<td width='40%'> <input id='existing_tracker_name".$trkr_count."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name".$trkr_count."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME'].$trkr_count."' value='".$ct_focus->tracker_name."' ></td>";
+            $trkr_html .= "<td width='40%'><input type='text' size='60' maxlength='255' name='wiz_step3_tracker_url".$trkr_count."' title='".$mod_strings['LBL_EDIT_TRACKER_URL'].$trkr_count."' id='existing_tracker_url".$trkr_count."' value='".$ct_focus->tracker_url."' ></td>";
             $trkr_html .= "<td><a href='#' onclick=\"javascript:remove_existing_tracker('existing_trkr".$trkr_count."','".$ct_focus->id."'); \" >  ";
             $trkr_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0'  align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
 
 
 
       }
-      $trkr_count =$trkr_count+1;
+      $trkr_count = $trkr_count + 1;
     }
     
     $trkr_html .= "<div id='no_trackers'></div>";
-    }else{
+    } else {
         $trkr_html .= "<div id='no_trackers'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
     }
     $ss->assign('EXISTING_TRACKERS', $trkr_html);
@@ -390,29 +390,29 @@ 
 
 $prospect_lists = $focus->prospectlists->get();
 
-if((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] ==1) || ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
  //this is a newsletter type campaign, fill in subscription values   
 
 //if prospect lists are returned, then iterate through and populate form values
-if(count($prospect_lists)>0){
+if (count($prospect_lists) > 0) {
     
-    foreach($prospect_lists as $pl_id){
+    foreach ($prospect_lists as $pl_id) {
     //retrieve prospect list
      $pl = new ProspectList();   
      $pl->retrieve($pl_id);
 
-      if(isset($pl->list_type) && !empty($pl->list_type)){
+      if (isset($pl->list_type) && !empty($pl->list_type)) {
          //assign values based on type
-         if(($pl->list_type == 'default') || ($pl->list_type == 'seed')){            
+         if (($pl->list_type == 'default') || ($pl->list_type == 'seed')) {            
             $ss->assign('SUBSCRIPTION_ID', $pl->id);
             $ss->assign('SUBSCRIPTION_NAME', $pl->name);
          };
-         if($pl->list_type == 'exempt'){
+         if ($pl->list_type == 'exempt') {
             $ss->assign('UNSUBSCRIPTION_ID', $pl->id);
             $ss->assign('UNSUBSCRIPTION_NAME', $pl->name);
          
          };
-         if($pl->list_type == 'test'){
+         if ($pl->list_type == 'test') {
             $ss->assign('TEST_ID', $pl->id);
             $ss->assign('TEST_NAME', $pl->name);
          
@@ -424,67 +424,67 @@ 
 
 
 
-}else{
+} else {
  //this is not a newlsetter campaign, so fill in target list table
     //create array for javascript, this will help to display the option text, not the value
-    $dom_txt =' ';
-    foreach($app_list_strings['prospect_list_type_dom'] as $key=>$val){
-        $dom_txt .="if(trgt_type_text =='$key'){trgt_type_text='$val';}";
+    $dom_txt = ' ';
+    foreach ($app_list_strings['prospect_list_type_dom'] as $key=>$val) {
+        $dom_txt .= "if(trgt_type_text =='$key'){trgt_type_text='$val';}";
     }
     $ss->assign("PL_DOM_STMT", $dom_txt); 
     $trgt_count = 0;
     $trgt_html = ' ';
-    if(count($prospect_lists)>0){
+    if (count($prospect_lists) > 0) {
         
-        foreach($prospect_lists as $pl_id){
+        foreach ($prospect_lists as $pl_id) {
         //retrieve prospect list
              $pl = new ProspectList();   
              $pl_focus = $pl->retrieve($pl_id);
-             $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>" ;
-             $trgt_html .= "<td width='25%'> <input id='existing_target_name". $trgt_count ."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name". $trgt_count ."'  value='". $pl_focus->name."' >". $pl_focus->name."</td>";
-             $trgt_html .= "<td width='25%'><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type". $trgt_count ."'   id='existing_tracker_list_type". $trgt_count ."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
-             $trgt_html .= "<input type='hidden' name='added_target_id". $trgt_count ."' id='added_target_id". $trgt_count ."' value='". $pl_focus->id ."' ></td>";
+             $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>";
+             $trgt_html .= "<td width='25%'> <input id='existing_target_name".$trgt_count."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name".$trgt_count."'  value='".$pl_focus->name."' >".$pl_focus->name."</td>";
+             $trgt_html .= "<td width='25%'><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type".$trgt_count."'   id='existing_tracker_list_type".$trgt_count."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
+             $trgt_html .= "<input type='hidden' name='added_target_id".$trgt_count."' id='added_target_id".$trgt_count."' value='".$pl_focus->id."' ></td>";
              $trgt_html .= "<td><a href='#' onclick=\"javascript:remove_existing_target('existing_trgt".$trgt_count."','".$pl_focus->id."'); \" >  ";
              $trgt_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0' align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
 
 
     
           
-          $trgt_count =$trgt_count +1;
+          $trgt_count = $trgt_count + 1;
         }
         
         $trgt_html  .= "<div id='no_targets'></div>";
-    }else{
+    } else {
         $trgt_html  .= "<div id='no_targets'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
         
     }
-    $ss->assign('EXISTING_TARGETS', $trgt_html );
+    $ss->assign('EXISTING_TARGETS', $trgt_html);
 
 }
 
     
 /**************************** WIZARD UI DIV Stuff *******************/
 $mrkt_string = $mod_strings['LBL_NAVIGATION_MENU_MARKETING'];
-if(!empty($focus->id)){
+if (!empty($focus->id)) {
     $mrkt_url = "<a  href='index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome";
     $mrkt_url .= "&return_id=".$focus->id."&campaign_id=".$focus->id;
-    $mrkt_url .= "'>". $mrkt_string."</a>";
+    $mrkt_url .= "'>".$mrkt_string."</a>";
     $mrkt_string = $mrkt_url;
 }
     $summ_url = $mod_strings['LBL_NAVIGATION_MENU_SUMMARY'];
-    if(!empty($focus->id)){
+    if (!empty($focus->id)) {
         $summ_url = "<a  href='index.php?action=WizardHome&module=Campaigns";
         $summ_url .= "&return_id=".$focus->id."&record=".$focus->id;
-        $summ_url .= "'> ". $mod_strings['LBL_NAVIGATION_MENU_SUMMARY']."</a>";
+        $summ_url .= "'> ".$mod_strings['LBL_NAVIGATION_MENU_SUMMARY']."</a>";
     } 
    
 
 
-$script_to_call ='';
-    if (!empty($focus->id)){
+$script_to_call = '';
+    if (!empty($focus->id)) {
         $script_to_call = "link_navs(1,4);";
-        if(isset($_REQUEST['direct_step']) and !empty($_REQUEST['direct_step'])){
-            $script_to_call .='   direct('.$_REQUEST['direct_step'].');';
+        if (isset($_REQUEST['direct_step']) and !empty($_REQUEST['direct_step'])) {
+            $script_to_call .= '   direct('.$_REQUEST['direct_step'].');';
         }
     } 
     $ss->assign("HILITE_ALL", $script_to_call);
@@ -524,24 +524,24 @@ 
 
 //Create the html to fill in the wizard steps
 
-if($campaign_type == 'general'){
+if ($campaign_type == 'general') {
     $steps = create_campaign_steps();    
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'campaign',$mrkt_string,$summ_url));
-    $ss->assign('HIDE_CONTINUE','hidden');
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($steps, 'campaign', $mrkt_string, $summ_url));
+    $ss->assign('HIDE_CONTINUE', 'hidden');
 
-}elseif($campaign_type == 'email'){
+}elseif ($campaign_type == 'email') {
     $steps = create_email_steps();  
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'email',$mrkt_string,$summ_url));
-    $ss->assign('HIDE_CONTINUE','submit');
-}else{
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($steps, 'email', $mrkt_string, $summ_url));
+    $ss->assign('HIDE_CONTINUE', 'submit');
+} else {
     $steps = create_newsletter_steps();  
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'newsletter',$mrkt_string,$summ_url));
-    $ss->assign('HIDE_CONTINUE','submit');
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($steps, 'newsletter', $mrkt_string, $summ_url));
+    $ss->assign('HIDE_CONTINUE', 'submit');
 }
 
 $ss->assign('TOTAL_STEPS', count($steps));
-$sshtml = create_wiz_step_divs($steps,$ss);
-$ss->assign('STEPS',$sshtml);
+$sshtml = create_wiz_step_divs($steps, $ss);
+$ss->assign('STEPS', $sshtml);
      	   	
 
 /**************************** FINAL END OF PAGE UI Stuff *******************/
@@ -549,7 +549,7 @@ 
 $ss->display(file_exists('custom/modules/Campaigns/tpls/WizardNewsletter.tpl') ? 'custom/modules/Campaigns/tpls/WizardNewsletter.tpl' : 'modules/Campaigns/tpls/WizardNewsletter.tpl');
 
 
-function create_newsletter_steps(){
+function create_newsletter_steps() {
     global $mod_strings;
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
@@ -558,54 +558,54 @@ 
     return  $steps;
 }
 
-function create_campaign_steps(){
+function create_campaign_steps() {
     global $mod_strings;
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
-    $steps[$mod_strings['LBL_TARGET_LISTS']]                   = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
+    $steps[$mod_strings['LBL_TARGET_LISTS']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
     return  $steps;
 }
 
-function create_email_steps(){
+function create_email_steps() {
     global $mod_strings;
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
     $steps[$mod_strings['LBL_NAVIGATION_MENU_TRACKERS']]      = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTracker.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTracker.tpl' : 'modules/Campaigns/tpls/WizardCampaignTracker.tpl';
-    $steps[$mod_strings['LBL_TARGET_LISTS']]                   = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
+    $steps[$mod_strings['LBL_TARGET_LISTS']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
     return  $steps;
 }
 
 
-function create_wiz_step_divs($steps,$ss){
+function create_wiz_step_divs($steps, $ss) {
     $step_html = '';
-    if(isset($steps)  && !empty($steps)){
-        $i=1;
-        foreach($steps as $name=>$step){
-            $step_html .="<p><div id='step$i'>";
+    if (isset($steps) && !empty($steps)) {
+        $i = 1;
+        foreach ($steps as $name=>$step) {
+            $step_html .= "<p><div id='step$i'>";
             $step_html .= $ss->fetch($step);
-            $step_html .="</div></p>";
-            $i = $i+1;
+            $step_html .= "</div></p>";
+            $i = $i + 1;
         }    
     }
     return $step_html;
 }
  
-function create_wiz_menu_items($steps,$type,$mrkt_string,$summ_url){
+function create_wiz_menu_items($steps, $type, $mrkt_string, $summ_url) {
     global $mod_strings;
     $nav_html = '<table border="0" cellspacing="0" cellpadding="0" width="100%" >';
-    if(isset($steps)  && !empty($steps)){
-        $i=1;
-        foreach($steps as $name=>$step){
+    if (isset($steps) && !empty($steps)) {
+        $i = 1;
+        foreach ($steps as $name=>$step) {
             $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step$i'>$name</div></td></tr>";
-            $i=$i+1;
+            $i = $i + 1;
         }
     }
-    if($type == 'newsletter'  ||  $type == 'email'){
-        $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">$mrkt_string</div></td></tr>";
-        $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
-        $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+3).">".$summ_url."</div></td></tr>";
-    }else{
-     $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";   
+    if ($type == 'newsletter' || $type == 'email') {
+        $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 1).">$mrkt_string</div></td></tr>";
+        $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
+        $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 3).">".$summ_url."</div></td></tr>";
+    } else {
+     $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 1).">".$summ_url."</div></td></tr>";   
     }
        
     $nav_html .= '</table>';

Braces +41 added lines, -29 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -80,7 +82,7 @@ 
 
 if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_NEWSLETTER WIZARD_TITLE'].$focus->name), true, false);
-}else{
+} else{
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_CAMPAIGN'].$focus->name), true, false);   
 }
 
@@ -89,9 +91,15 @@ 
 $ss->assign("MOD", $mod_strings);
 $ss->assign("APP", $app_strings);
 
-if (isset($_REQUEST['return_module'])) $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
-if (isset($_REQUEST['return_action'])) $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
-if (isset($_REQUEST['return_id'])) $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_module'])) {
+    $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
+if (isset($_REQUEST['return_action'])) {
+    $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
+}
+if (isset($_REQUEST['return_id'])) {
+    $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 // handle Create $module then Cancel
 if (empty($_REQUEST['return_id'])) {
     $ss->assign("RETURN_ACTION", 'index');
@@ -120,10 +128,10 @@ 
 if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
     $campaign_type = 'newsletter';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());    
-}elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
+} elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
     $campaign_type = 'email';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());
-}else{
+} else{
     $campaign_type = 'general';
 }
 
@@ -162,16 +170,21 @@ 
 $ss->assign("CAMP_NAME", $focus->name);
 $ss->assign("CAMP_RECORD", $focus->id);
 $ss->assign("CAMP_IMPRESSIONS", $focus->impressions);
-if (empty($focus->assigned_user_id) && empty($focus->id))  $focus->assigned_user_id = $current_user->id;
-if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
+if (empty($focus->assigned_user_id) && empty($focus->id)) {
+    $focus->assigned_user_id = $current_user->id;
+}
+if (empty($focus->assigned_name) && empty($focus->id)) {
+    $focus->assigned_user_name = $current_user->user_name;
+}
 $ss->assign("ASSIGNED_USER_OPTIONS", get_select_options_with_id(get_user_array(TRUE, "Active", $focus->assigned_user_id), $focus->assigned_user_id));
 $ss->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
 $ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
 
-if((!isset($focus->status)) && (!isset($focus->id)))
+if((!isset($focus->status)) && (!isset($focus->id))) {
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], 'Planning'));
-else
+} else {
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], $focus->status));
+}
 
 //hide frequency options if this is not a newsletter
 if($campaign_type == 'newsletter'){
@@ -179,10 +192,10 @@ 
     $ss->assign("FREQUENCY_LABEL", $mod_strings['LBL_CAMPAIGN_FREQUENCY']);
     if((!isset($focus->frequency)) && (!isset($focus->id))){
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], 'Monthly'));
-    }else{
+    } else{
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], $focus->frequency));
     }
-}else{
+} else{
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "input type='hidden'");
     $ss->assign("FREQUENCY_LABEL", '&nbsp;');
 }
@@ -192,12 +205,11 @@ 
 if(isset($focus->currency_id) && !empty($focus->currency_id)){
     $selectCurrency = $currency->getSelectOptions($focus->currency_id);
     $ss->assign("CURRENCY", $selectCurrency);
-}
-else if($current_user->getPreference('currency') && !isset($focus->id))
+} else if($current_user->getPreference('currency') && !isset($focus->id))
 {
     $selectCurrency = $currency->getSelectOptions($current_user->getPreference('currency'));
     $ss->assign("CURRENCY", $selectCurrency);
-}else{
+} else{
 
     $selectCurrency = $currency->getSelectOptions();
     $ss->assign("CURRENCY", $selectCurrency);
@@ -228,7 +240,7 @@ 
     foreach($OptionsArr as $key=>$val){
         if($val =='Newsletter' || $val =='Email' || $val =='' ){
             //do not add   
-        }else{
+        } else{
             $myTypeOptionsArr[$key] = $val;
         }
     }
@@ -240,7 +252,7 @@ 
         //if the selected flag is set to true, then just populate
         if($selected){
             $type_option_html .="<option value='$optionKey' >$optionName</option>";
-        }else{//if not selected yet, check to see if this option should be selected
+        } else{//if not selected yet, check to see if this option should be selected
             //if the campaign type is not empty, then select the retrieved type
             if(!empty($focus->campaign_type)){
                 //check to see if key matches campaign type
@@ -249,11 +261,11 @@ 
                     $type_option_html .="<option value='$optionKey' selected>$optionName</option>";
                     //mark as selected for next time
                     $selected=true;
-                }else{
+                } else{
                     //key does not match, just populate
                     $type_option_html .="<option value='$optionKey' >$optionName</option>";
                 }
-            }else{
+            } else{
             //since the campaign type is empty, then select first one                
                 $type_option_html .="<option value='$optionKey' selected>$optionName</option>";    
                 //mark as selected for next time
@@ -264,11 +276,11 @@ 
     //assign the modified dropdown for general campaign creation
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $type_option_html);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "select");    
-}elseif($campaign_type == 'email'){
+} elseif($campaign_type == 'email'){
     //Assign Email as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_EMAIL']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='Email'");
-}else{
+} else{
     //Assign NewsLetter as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_NEWSLETTER']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='NewsLetter'");
@@ -295,7 +307,7 @@ 
         $ct_focus = new CampaignTracker();
         $ct_focus->retrieve($trkr_id);
       if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
-            if($ct_focus->is_optout){$opt = 'checked';}else{$opt = '';}
+            if($ct_focus->is_optout){$opt = 'checked';} else{$opt = '';}
             $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>" ;
             $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'] . $trkr_count ."' id='existing_is_optout". $trkr_count ."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id". $trkr_count ."'type='hidden''/></td>";
             $trkr_html .= "<td width='40%'> <input id='existing_tracker_name". $trkr_count ."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME']. $trkr_count ."' value='".$ct_focus->tracker_name."' ></td>";
@@ -310,7 +322,7 @@ 
     }
     
     $trkr_html .= "<div id='no_trackers'></div>";
-    }else{
+    } else{
         $trkr_html .= "<div id='no_trackers'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
     }
     $ss->assign('EXISTING_TRACKERS', $trkr_html);
@@ -424,7 +436,7 @@ 
 
 
 
-}else{
+} else{
  //this is not a newlsetter campaign, so fill in target list table
     //create array for javascript, this will help to display the option text, not the value
     $dom_txt =' ';
@@ -454,7 +466,7 @@ 
         }
         
         $trgt_html  .= "<div id='no_targets'></div>";
-    }else{
+    } else{
         $trgt_html  .= "<div id='no_targets'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
         
     }
@@ -529,11 +541,11 @@ 
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'campaign',$mrkt_string,$summ_url));
     $ss->assign('HIDE_CONTINUE','hidden');
 
-}elseif($campaign_type == 'email'){
+} elseif($campaign_type == 'email'){
     $steps = create_email_steps();  
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'email',$mrkt_string,$summ_url));
     $ss->assign('HIDE_CONTINUE','submit');
-}else{
+} else{
     $steps = create_newsletter_steps();  
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'newsletter',$mrkt_string,$summ_url));
     $ss->assign('HIDE_CONTINUE','submit');
@@ -604,7 +616,7 @@ 
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">$mrkt_string</div></td></tr>";
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+3).">".$summ_url."</div></td></tr>";
-    }else{
+    } else{
      $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";   
     }
        

modules/Campaigns/GenerateWebToLeadForm.php

Indentation +216 added lines, -216 removed lines

@@ -101,19 +101,19 @@ 
 }
 
 
- $lead = new Lead();
- $fieldsMetaData = new FieldsMetaData();
- $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 .= "<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 .= "<table width='100%' style='border-top: 1px solid;
+    $lead = new Lead();
+    $fieldsMetaData = new FieldsMetaData();
+    $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 .= "<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 .= "<table width='100%' style='border-top: 1px solid;
 border-bottom: 1px solid;
 padding: 10px 6px 12px 10px;
 background-color: rgb(233, 243, 255);
@@ -126,21 +126,21 @@ 
 $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_description</TD></tr>";
 $Web_To_Lead_Form_html .= "<tr align='center' style='color: rgb(0, 105, 225); font-family: Arial,Verdana,Helvetica,sans-serif; font-size: 8px; font-weight: normal; margin-bottom: 0px; margin-top: 0px;'><TD COLSPAN='4'>&nbsp</TD></tr>";
 
- //$Web_To_Lead_Form_html .= "\n<p>\n";
+    //$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(count($_REQUEST['colsFirst']) > count($_REQUEST['colsSecond']) || count($_REQUEST['colsFirst']) == count($_REQUEST['colsSecond'])){
-   $columns= count($_REQUEST['colsFirst']);
- }
+    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']);
+    }
 }
 else if(!empty($_REQUEST['colsFirst'])){
- $columns= count($_REQUEST['colsFirst']);
+    $columns= count($_REQUEST['colsFirst']);
 }
 else if(!empty($_REQUEST['colsSecond'])){
- $columns= count($_REQUEST['colsSecond']);
+    $columns= count($_REQUEST['colsSecond']);
 }
 
 
@@ -153,140 +153,140 @@ 
     if(!empty($_REQUEST['colsFirst'][$i])){
         $colsFirstField = $_REQUEST['colsFirst'][$i];
         //_pp($_REQUEST['colsFirst']);
-     }
+        }
     if(!empty($_REQUEST['colsSecond'][$i])){
         $colsSecondField = $_REQUEST['colsSecond'][$i];
         //_pp($_REQUEST['colsSecond']);
-     }
+        }
 
     if(isset($lead->field_defs[$colsFirstField]) && $lead->field_defs[$colsFirstField] != null)
     {
-         $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_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'];
-         }
-         else{
+            }
+            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'])){
-             $lead->field_defs['webtolead_email1']['required'] = $lead->field_defs['email1']['required'];
-         }
+            //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'])){
+                $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
+            $field_required = '';
+            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($lead->field_defs[$colsFirstField]['name']=='last_name'){
+                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']);
+                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)
     {
-         $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_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{
+            }
+            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'])){
-             $lead->field_defs['webtolead_email1']['required'] = $lead->field_defs['email1']['required'];
-         }
+            //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'])){
+                $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
+            $field1_required = '';
+            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']);
+            $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($lead->field_defs[$colsSecondField]['name']=='last_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']);
+                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>";
+        $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'){
-          $lead_options = '';
-          if(!empty($lead->$field_name)){
+            $lead_options = '';
+            if(!empty($lead->$field_name)){
             $lead_options= get_select_options_with_id($app_list_strings[$field_options], unencodeMultienum($lead->$field_name));
-          }
-          else{
+            }
+            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'])){
+            }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>";
+                    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 sugar='slot'></td>";
-          }else{
+            }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($field_type=='date') {
+            }
+            $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($field_type=='date') {
 
-          global $timedate;
-          $cal_dateformat = $timedate->get_cal_date_format();
-	      $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
-          if($field_required){
+            global $timedate;
+            $cal_dateformat = $timedate->get_cal_date_format();
+            $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
+            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 .= "
+            $Web_To_Lead_Form_html .= "
 				<td width='35%' style='font-size: 12px; font-weight: normal;'>
 				<script type='text/javascript'>
 					update{$field_name}Value = function() {
@@ -301,121 +301,121 @@ 
 					}
 				</script>
 				<span sugar='slot'><input type='hidden' id='{$field_name}' name='{$field_name}'/>";
-          	$order = explode("%", $cal_dateformat);
-          	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\"
+                $order = explode("%", $cal_dateformat);
+                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\"
 					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
+                }
+                $Web_To_Lead_Form_html .= "</span></td>";
+            } // if
 
-         if( $field_type=='varchar' ||  $field_type=='name'
+            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_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{
                 $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' ){
-                 $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 {
+                }
+                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' ) {
+                $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'){
+                $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 == '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'){
-	            $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_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'){
-          $lead1_options = '';
-          if(!empty($lead->$field1_name)){
+        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));
-          }
-          else{
+            }
+            else{
             $lead1_options= get_select_options_with_id($app_list_strings[$field1_options], '');
-          }
+            }
             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{
                 $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){
                 $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'>";
-	                    }
-	                    $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>";
+                        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 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($field1_type=='date') {
-	        global $timedate;
-			$cal_dateformat = $timedate->get_cal_date_format();
-	        $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
-          if($field1_required){
+                array_push($bool_fields,$lead->field_defs[$colsSecondField]['name']);
+                }
+            }
+            if($field1_type=='date') {
+            global $timedate;
+            $cal_dateformat = $timedate->get_cal_date_format();
+            $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
+            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 .= " 
+            }
+            $Web_To_Lead_Form_html .= " 
 				<td width='35%' style='font-size: 12px; font-weight: normal;'>
 				<script type='text/javascript'>
 					update{$field1_name}Value = function() {
@@ -430,64 +430,64 @@ 
 					}
 				</script>
 				<span sugar='slot'><input type='hidden' id='{$field1_name}' name='{$field1_name}'/>";
-          	$order = explode("%", $cal_dateformat);
-          	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\"
+                $order = explode("%", $cal_dateformat);
+                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\"
 					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'
+                }
+                $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){
                 $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{
                 $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' ){
-                 $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 {
+                }
+                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' ) {
+                $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'){
+                $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 == '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'){
-	            $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{
                 $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>";
-       }
-       $Web_To_Lead_Form_html .= "</tr>";
+        }
+        $Web_To_Lead_Form_html .= "</tr>";
 }
 
 $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>";
@@ -500,7 +500,7 @@ 
 $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)){
-   $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>";
+    $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)){
     $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>";

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;

Braces +62 added lines, -62 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -135,11 +137,9 @@ 
  if(count($_REQUEST['colsFirst']) > count($_REQUEST['colsSecond']) || count($_REQUEST['colsFirst']) == count($_REQUEST['colsSecond'])){
    $columns= count($_REQUEST['colsFirst']);
  }
-}
-else if(!empty($_REQUEST['colsFirst'])){
+} else if(!empty($_REQUEST['colsFirst'])){
  $columns= count($_REQUEST['colsFirst']);
-}
-else if(!empty($_REQUEST['colsSecond'])){
+} else if(!empty($_REQUEST['colsSecond'])){
  $columns= count($_REQUEST['colsSecond']);
 }
 
@@ -166,8 +166,7 @@ 
          $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{
+         } else{
             $field_type= $lead->field_defs[$colsFirstField]['type'];
          }
          
@@ -190,7 +189,9 @@ 
               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)
@@ -200,8 +201,7 @@ 
          $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{
+         } else{
             $field1_type= $lead->field_defs[$colsSecondField]['type'];
          }
          
@@ -223,7 +223,9 @@ 
               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>";
@@ -233,19 +235,17 @@ 
           $lead_options = '';
           if(!empty($lead->$field_name)){
             $lead_options= get_select_options_with_id($app_list_strings[$field_options], unencodeMultienum($lead->$field_name));
-          }
-          else{
+          } else{
             $lead_options= get_select_options_with_id($app_list_strings[$field_options], '');
           }
           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){
             $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'])){
+          } 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){
@@ -258,15 +258,14 @@ 
                 }
             }
             $Web_To_Lead_Form_html .="</span sugar='slot'></td>";
-          }else{
+          } 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){
                 $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>";
@@ -281,8 +280,7 @@ 
 	      $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
           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>";
           }
 
@@ -304,20 +302,22 @@ 
           	$order = explode("%", $cal_dateformat);
           	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 (!isset($part[0])) {
+          		          			continue;
+          		}
+          		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
@@ -326,8 +326,7 @@ 
           ||  $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' ){
@@ -347,14 +346,12 @@ 
           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>";
         }
@@ -364,40 +361,37 @@ 
           $lead1_options = '';
           if(!empty($lead->$field1_name)){
             $lead1_options= get_select_options_with_id($app_list_strings[$field1_options], unencodeMultienum($lead->$field1_name));
-          }
-          else{
+          } else{
             $lead1_options= get_select_options_with_id($app_list_strings[$field1_options], '');
           }
             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){
                 $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'])){
+            } 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{
+                    	} 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 sugar='slot'></td>";
-            }else{
+            } 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){
             $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>";
@@ -411,8 +405,7 @@ 
 	        $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
           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 .= " 
@@ -433,20 +426,22 @@ 
           	$order = explode("%", $cal_dateformat);
           	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 (!isset($part[0])) {
+          		          			continue;
+          		}
+          		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
@@ -454,8 +449,7 @@ 
           ||  $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' ){
@@ -476,14 +470,12 @@ 
            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>";
        }
@@ -596,8 +588,16 @@ 
 }
 </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');

modules/Campaigns/WizardEmailSetupSave.php

Indentation +9 added lines, -9 removed lines

@@ -85,7 +85,7 @@ 
 //perform this if the option to create new mail box has been checked
 if(isset($_REQUEST['wiz_new_mbox']) && ($_REQUEST['wiz_new_mbox']=='1')){
     
-   //Populate the Request variables that inboundemail expects
+    //Populate the Request variables that inboundemail expects
     $_REQUEST['mark_read'] = 1;
     $_REQUEST['only_since'] = 1;
     $_REQUEST['mailbox_type'] = 'bounce';
@@ -114,18 +114,18 @@ 
 function clean_up_post($prefix){
 
     foreach ($_REQUEST as $key => $val) {
-              if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
-              $newkey  =substr($key, strlen($prefix)) ;
-              $_REQUEST[$newkey] = $val;
-         }               
+                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)) ;
-              $_POST[$newkey] = $val;
+                if((strstr($key, $prefix )) && (strpos($key, $prefix )== 0)){
+                $newkey  =substr($key, strlen($prefix)) ;
+                $_POST[$newkey] = $val;
               
-         }               
+            }               
     }
 }
 

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;
               
          }               

Braces +4 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -100,7 +102,7 @@ 
             //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");
     }

modules/Campaigns/WizardNewsletterSave.php

Indentation +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
     $campaign_focus = populateFromPost('', $campaign_focus);
 
     foreach($camp_steps as $step){
-       $campaign_focus =  populate_wizard_bean_from_request($campaign_focus,$step);
+        $campaign_focus =  populate_wizard_bean_from_request($campaign_focus,$step);
     }
 
     //save here so we can link relationships
@@ -220,7 +220,7 @@ 
 //require_once('modules/Campaigns/WizardMarketing.php');
 $header_URL = "Location: index.php?return_module=Campaigns&module=Campaigns&action=".$action."&campaign_id=".$campaign_focus->id."&return_action=WizardNewsLetter&return_id=".$campaign_focus->id;
 $GLOBALS['log']->debug("about to post header URL of: $header_URL");
- header($header_URL);
+    header($header_URL);
 
 
 
@@ -230,15 +230,15 @@ 
  */
 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])){
-              //echo "prefix is $prefix, field is $field,    key is $key,   and value is $val<br>";
-              $value = $_REQUEST[$key];
-              $bean->$field = $value;
-          }
-     }
+        $key = trim($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;
+            }
+        }
     }
 
     return $bean;
@@ -264,7 +264,7 @@ 
         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
@@ -292,7 +292,7 @@ 
         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

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;
     }

Braces +6 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -92,7 +94,7 @@ 
                     $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
 
@@ -124,7 +126,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();
@@ -214,7 +216,7 @@ 
 $action = '';
 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');

modules/Campaigns/WebToLeadCapture.php

Indentation +105 added lines, -105 removed lines

@@ -55,16 +55,16 @@ 
  * To make your changes upgrade safe create a file called leadCapture_override.php and place the changes there
  */
 $users = array(
-	'PUT A RANDOM KEY FROM THE WEBSITE HERE' => array('name'=>'PUT THE USER_NAME HERE', 'pass'=>'PUT THE USER_HASH FOR THE RESPECTIVE USER HERE'),
+    'PUT A RANDOM KEY FROM THE WEBSITE HERE' => array('name'=>'PUT THE USER_NAME HERE', 'pass'=>'PUT THE USER_HASH FOR THE RESPECTIVE USER HERE'),
 );
 
 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 = new Campaign();
-		$camp_query  = "select name,id from campaigns where id='$campaign_id'";
-		$camp_query .= " and deleted=0";
+        //adding the client ip address
+        $_POST['client_id_address'] = query_client_ip();
+        $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_data = $campaign->db->fetchByAssoc($camp_result);
         // Bug 41292 - have to select marketing_id for new lead
@@ -78,20 +78,20 @@ 
         $marketing_result = $db->limitQuery($marketing_query, 0, 1, true);
         $marketing_data = $db->fetchByAssoc($marketing_result);
         // .Bug 41292
-		if (isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id'])) {
-			$current_user = new User();
-			$current_user->retrieve($_REQUEST['assigned_user_id']);
-		} 
+        if (isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id'])) {
+            $current_user = new User();
+            $current_user->retrieve($_REQUEST['assigned_user_id']);
+        } 
 
-	    if(isset($camp_data) && $camp_data != null ){
-			$leadForm = new LeadFormBase();
+        if(isset($camp_data) && $camp_data != null ){
+            $leadForm = new LeadFormBase();
             $lead = new Lead();
-			$prefix = '';
-			if(!empty($_POST['prefix'])){
-				$prefix = $_POST['prefix'];
-			}
+            $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;
             }
@@ -114,47 +114,47 @@ 
             // 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();
-	            $camplog->campaign_id  = $_POST['campaign_id'];
-	            $camplog->related_id   = $lead->id;
-	            $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;
+                //create campaign log
+                $camplog = new CampaignLog();
+                $camplog->campaign_id  = $_POST['campaign_id'];
+                $camplog->related_id   = $lead->id;
+                $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']))
                 {
                     $camplog->marketing_id = $marketing_data['id'];
                 }
-	            $camplog->save();
+                $camplog->save();
 
-		        //link campaignlog and lead
+                //link campaignlog and lead
 
-		        if (isset($_POST['email1']) && $_POST['email1'] != null)
+                if (isset($_POST['email1']) && $_POST['email1'] != null)
                 {
                     $lead->email1 = $_POST['email1'];
-		        } 
+                } 
                 //in case there are old forms used webtolead_email1
                 elseif (isset($_POST['webtolead_email1']) && $_POST['webtolead_email1'] != null)
                 {
                     $lead->email1 = $_POST['webtolead_email1'];
                 }
                 
-		        if (isset($_POST['email2']) && $_POST['email2'] != null)
+                if (isset($_POST['email2']) && $_POST['email2'] != null)
                 {
                     $lead->email2 = $_POST['email2'];
-		        } 
+                } 
                 //in case there are old forms used webtolead_email2
                 elseif (isset($_POST['webtolead_email2']) && $_POST['webtolead_email2'] != null)
                 {
                     $lead->email2 = $_POST['webtolead_email2'];
                 }
                 
-		        $lead->load_relationship('campaigns');
-		        $lead->campaigns->add($camplog->id);
+                $lead->load_relationship('campaigns');
+                $lead->campaigns->add($camplog->id);
                 if(!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
                 }
@@ -176,87 +176,87 @@ 
                     
                 }
             }              
-			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){
-					$first_char = '?';
-				}
-				$first_iteration = true;
-				$get_and_post = array_merge($_GET, $_POST);
-				foreach($get_and_post as $param => $value) {
+            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){
+                    $first_char = '?';
+                }
+                $first_iteration = true;
+                $get_and_post = array_merge($_GET, $_POST);
+                foreach($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
-						continue;
+                    if($param == 'redirect_url' && $param == 'submit')
+                        continue;
 					
-					if($first_iteration){
-						$first_iteration = false;
-						$query_string .= $first_char;
-					}
-					else{
-						$query_string .= "&";
-					}
-					$query_string .= "{$param}=".urlencode($value);
-				}
-				if(empty($lead)) {
-					if($first_iteration){
-						$query_string .= $first_char;
-					}
-					else{
-						$query_string .= "&";
-					}
-					$query_string .= "error=1";
-				}
+                    if($first_iteration){
+                        $first_iteration = false;
+                        $query_string .= $first_char;
+                    }
+                    else{
+                        $query_string .= "&";
+                    }
+                    $query_string .= "{$param}=".urlencode($value);
+                }
+                if(empty($lead)) {
+                    if($first_iteration){
+                        $query_string .= $first_char;
+                    }
+                    else{
+                        $query_string .= "&";
+                    }
+                    $query_string .= "error=1";
+                }
 				
-				$redirect_url = $redirect_url.$query_string;
+                $redirect_url = $redirect_url.$query_string;
 
 
-				// 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">';
+                // 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">';
     
-    				foreach($_POST as $param => $value) {
-    					if($param != 'redirect_url' ||$param != 'submit') {
-    						echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
-    					}
-    				}
-    				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{
-    				header("Location: {$redirect_url}");
-    				die();
-			    }
-			}
-			else{
-				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING_LEAD'];
-			}
-			sugar_cleanup();
-			// die to keep code from running into redirect case below
-			die();
-	    }
-	   else{
-	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
-	  }
+                    foreach($_POST as $param => $value) {
+                        if($param != 'redirect_url' ||$param != 'submit') {
+                            echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
+                        }
+                    }
+                    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{
+                    header("Location: {$redirect_url}");
+                    die();
+                }
+            }
+            else{
+                echo $mod_strings['LBL_THANKS_FOR_SUBMITTING_LEAD'];
+            }
+            sugar_cleanup();
+            // die to keep code from running into redirect case below
+            die();
+        }
+        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">';
-    	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
-    	echo '</body></html>';
+        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{
-    	header("Location: {$_POST['redirect']}");
-    	die();
+        header("Location: {$_POST['redirect']}");
+        die();
     }
 }
 

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();
     }

Braces +13 added lines, -17 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -157,8 +159,7 @@ 
 		        $lead->campaigns->add($camplog->id);
                 if(!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
-                }
-                else {
+                } else {
                     $lead->save(FALSE);
                 }
             }
@@ -188,14 +189,14 @@ 
 				$get_and_post = array_merge($_GET, $_POST);
 				foreach($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
-						continue;
+					if($param == 'redirect_url' && $param == 'submit') {
+											continue;
+					}
 					
 					if($first_iteration){
 						$first_iteration = false;
 						$query_string .= $first_char;
-					}
-					else{
+					} else{
 						$query_string .= "&";
 					}
 					$query_string .= "{$param}=".urlencode($value);
@@ -203,8 +204,7 @@ 
 				if(empty($lead)) {
 					if($first_iteration){
 						$query_string .= $first_char;
-					}
-					else{
+					} else{
 						$query_string .= "&";
 					}
 					$query_string .= "error=1";
@@ -229,20 +229,17 @@ 
     				}
     				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'];
 	  }
 }
@@ -253,8 +250,7 @@ 
     	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

Indentation +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
     $test_ids = array();
     $test_list_ids = array();
     while($row = $focus->db->fetchByAssoc($res)) {
-       $test_ids[] = $row['emailid'];
-       $test_list_ids[$row['listid']] = true;
+        $test_ids[] = $row['emailid'];
+        $test_list_ids[$row['listid']] = true;
     }
     $test_list_ids = array_keys($test_list_ids);
     unset($res);

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);
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?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.

modules/Campaigns/WebToLeadCreation.php

Indentation +50 added lines, -50 removed lines

@@ -113,23 +113,23 @@ 
 $json = getJSONobj();
 // Users Popup
 $popup_request_data = array(
-	'call_back_function' => 'set_return',
-	'form_name' => 'WebToLeadCreation',
-	'field_to_name_array' => array(
-		'id' => 'assigned_user_id',
-		'user_name' => 'assigned_user_name',
-		),
-	);
+    'call_back_function' => 'set_return',
+    'form_name' => 'WebToLeadCreation',
+    'field_to_name_array' => array(
+        'id' => 'assigned_user_id',
+        'user_name' => 'assigned_user_name',
+        ),
+    );
 $xtpl->assign('encoded_users_popup_request_data', $json->encode($popup_request_data));
 
 //Campaigns popup
 $popup_request_data = array(
-		'call_back_function' => 'set_return',
-		'form_name' => 'WebToLeadCreation',
-		'field_to_name_array' => array(
-			'id' => 'campaign_id',
-			'name' => 'campaign_name',
-		),
+        'call_back_function' => 'set_return',
+        'form_name' => 'WebToLeadCreation',
+        'field_to_name_array' => array(
+            'id' => 'campaign_id',
+            'name' => 'campaign_name',
+        ),
 );
 $encoded_users_popup_request_data = $json->encode($popup_request_data);
 $xtpl->assign('encoded_campaigns_popup_request_data' , $json->encode($popup_request_data));
@@ -148,50 +148,50 @@ 
 $count= 0;
 foreach($lead->field_defs as $field_def)
 {
-	$email_fields = false;
+    $email_fields = false;
     if($field_def['name']== 'email1' || $field_def['name']== 'email2')
     {
-    	$email_fields = true;
+        $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')
-	    {
-	        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')
-	    {
-	    	continue;
-	    }
+        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')
+        {
+            continue;
+        }
 
 
     $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']."'}";
+        $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;
-     }
-     else{
-	     $cols_name=$field_def['vname'];
-	     $col_arr[0]=$cols_name;
-	     $col_arr[1]=$field_def['name'];
-     }
-     if (! in_array($cols_name, $fields))
-     {
-         array_push($fields,$col_arr);
-     }
-     $count++;
+        }
+        else{
+            $cols_name=$field_def['vname'];
+            $col_arr[0]=$cols_name;
+            $col_arr[1]=$field_def['name'];
+        }
+        if (! in_array($cols_name, $fields))
+        {
+            array_push($fields,$col_arr);
+        }
+        $count++;
 }
 
 $xtpl->assign("WEB_POST_URL",$web_post_url);
@@ -200,10 +200,10 @@ 
 require_once('include/QuickSearchDefaults.php');
 $qsd = QuickSearchDefaults::getQuickSearchDefaults();
 $sqs_objects = array('account_name' => $qsd->getQSParent(),
-					'assigned_user_name' => $qsd->getQSUser(),
-					'campaign_name' => $qsd->getQSCampaigns(),
+                    'assigned_user_name' => $qsd->getQSUser(),
+                    'campaign_name' => $qsd->getQSCampaigns(),
 
-					);
+                    );
 $quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '</script>';
 $xtpl->assign("JAVASCRIPT", $quicksearch_js);
 
@@ -276,7 +276,7 @@ 
 			    	//Call other function when this is called
 	           }
 	        </script>";
-	$str .= "<script>
+    $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) {

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);
 				    }

Braces +10 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?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.
@@ -181,8 +183,7 @@ 
         $col_arr[0]=$cols_name;
         $col_arr[1]=$field_def['name'];
         $col_arr[2]=true;
-     }
-     else{
+     } else{
 	     $cols_name=$field_def['vname'];
 	     $col_arr[0]=$cols_name;
 	     $col_arr[1]=$field_def['name'];
@@ -209,8 +210,12 @@ 
 
 
 
-if (empty($focus->assigned_user_id) && empty($focus->id))  $focus->assigned_user_id = $current_user->id;
-if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
+if (empty($focus->assigned_user_id) && empty($focus->id)) {
+    $focus->assigned_user_id = $current_user->id;
+}
+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 );

modules/Campaigns/WizardEmailSetup.php

Indentation +6 added lines, -6 removed lines

@@ -137,14 +137,14 @@ 
 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>";
+                    .  " <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){
                 
-     if( $colorclass == "class='evenListRowS1'"){
+        if( $colorclass == "class='evenListRowS1'"){
             $colorclass= "class='oddListRowS1'";
         }else{ 
             $colorclass= "class='evenListRowS1'";
@@ -175,7 +175,7 @@ 
 /**************************** WIZARD UI DIV Stuff *******************/
   
 //  this is the wizard control script that resides in page    
- $divScript = <<<EOQ
+    $divScript = <<<EOQ
  <script type="text/javascript" language="javascript">  
 
     //this function toggles visibility of fields based on selected options

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);

Braces +17 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?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 +57,9 @@ 
 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>";
@@ -78,9 +82,15 @@ 
 $ss = new Sugar_Smarty();
 $ss->assign("MOD", $mod_strings);
 $ss->assign("APP", $app_strings);
-if (isset($_REQUEST['return_module'])) $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
-if (isset($_REQUEST['return_action'])) $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
-if (isset($_REQUEST['return_id'])) $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_module'])) {
+    $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
+if (isset($_REQUEST['return_action'])) {
+    $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
+}
+if (isset($_REQUEST['return_id'])) {
+    $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 
 
 
@@ -146,7 +156,7 @@ 
                 
      if( $colorclass == "class='evenListRowS1'"){
             $colorclass= "class='oddListRowS1'";
-        }else{ 
+        } else{ 
             $colorclass= "class='evenListRowS1'";
         }           
         
@@ -159,7 +169,7 @@ 
     }
 
 
-}else{
+} else{
 $need_mbox = 'checked';
 $mboxTable .= "<tr><td colspan='5'><b>".$mod_strings['LBL_MAILBOX_CHECK_WIZ_BAD']." </b>.</td></tr>";
 }        

modules/Campaigns/ProcessBouncedEmails.php

Indentation +68 added lines, -68 removed lines

@@ -56,7 +56,7 @@ 
     $query = "SELECT description FROM notes WHERE file_mime_type = 'messsage/rfc822' AND parent_type='Emails' AND parent_id = '".$email->id."' AND deleted=0";
     $rs = $GLOBALS['db']->query($query);
     while ($row = $GLOBALS['db']->fetchByAssoc($rs)) 
-		$contents .= $row['description'];
+        $contents .= $row['description'];
 
     return $contents;
 }
@@ -162,80 +162,80 @@ 
 
 function campaign_process_bounced_emails(&$email, &$email_header) 
 {
-	global $sugar_config;
-	$emailFromAddress = $email_header->fromaddress;
-	$email_description = $email->raw_source;
+    global $sugar_config;
+    $emailFromAddress = $email_header->fromaddress;
+    $email_description = $email->raw_source;
     	
-	//if raw_source is empty, try using the description instead
-    	if (empty($email_description)){
-        	$email_description = $email->description;
-	}
+    //if raw_source is empty, try using the description instead
+        if (empty($email_description)){
+            $email_description = $email->description;
+    }
 
     $email_description .= retrieveErrorReportAttachment($email);
 
-	if (preg_match('/MAILER-DAEMON|POSTMASTER/i',$emailFromAddress)) 
-	{
-	    $email_description=quoted_printable_decode($email_description);
-		$matches=array();
+    if (preg_match('/MAILER-DAEMON|POSTMASTER/i',$emailFromAddress)) 
+    {
+        $email_description=quoted_printable_decode($email_description);
+        $matches=array();
 		
-		//do we have the identifier tag in the email?
-		$identifierScanResults = checkBouncedEmailForIdentifier($email_description);
+        //do we have the identifier tag in the email?
+        $identifierScanResults = checkBouncedEmailForIdentifier($email_description);
 		
-		if ( $identifierScanResults['found'] ) 
-		{
-			$matches = $identifierScanResults['matches'];
-			$identifiers = $identifierScanResults['identifiers'];
-
-			if (!empty($identifiers)) 
-			{
-				//array should have only one element in it.
-				$identifier = trim($identifiers[0]);
-				$row = getExistingCampaignLogEntry($identifier);
+        if ( $identifierScanResults['found'] ) 
+        {
+            $matches = $identifierScanResults['matches'];
+            $identifiers = $identifierScanResults['identifiers'];
+
+            if (!empty($identifiers)) 
+            {
+                //array should have only one element in it.
+                $identifier = trim($identifiers[0]);
+                $row = getExistingCampaignLogEntry($identifier);
 				
-				//Found entry
-				if (!empty($row)) 
-				{
-					//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')";
+                //Found entry
+                if (!empty($row)) 
+                {
+                    //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')";
                     $targeted = new CampaignLog();
-					$result_log=$targeted->db->query($query_log);
-					$row_log=$targeted->db->fetchByAssoc($result_log);
-
-					if (empty($row_log)) 
-					{
-						$return_id = createBouncedCampaignLogEntry($row, $email, $email_description);	
-						return TRUE;
-					}				
-					else 
-					{
-					    $GLOBALS['log']->debug("Warning: campaign log entry already exists for identifier $identifier");
-					    return FALSE;
-					}
-				} 
-				else 
-				{
-				    $GLOBALS['log']->info("Warning: skipping bounced email with this tracker_key(identifier) in the message body: ".$identifier);
-					return FALSE;
-				}			
-    		} 
-    		else 
-    		{
-    			$GLOBALS['log']->info("Warning: Empty identifier for campaign log.");
-    			return FALSE;
-    		}
-    	}  
-    	else 
-    	{
-    	    $GLOBALS['log']->info("Warning: skipping bounced email because it does not have the removeme link.");	
-    		return FALSE;	
-      	}
-  } 
-  else 
-  {
-	$GLOBALS['log']->info("Warning: skipping bounced email because the sender is not MAILER-DAEMON.");
-	return FALSE;
-  }
+                    $result_log=$targeted->db->query($query_log);
+                    $row_log=$targeted->db->fetchByAssoc($result_log);
+
+                    if (empty($row_log)) 
+                    {
+                        $return_id = createBouncedCampaignLogEntry($row, $email, $email_description);	
+                        return TRUE;
+                    }				
+                    else 
+                    {
+                        $GLOBALS['log']->debug("Warning: campaign log entry already exists for identifier $identifier");
+                        return FALSE;
+                    }
+                } 
+                else 
+                {
+                    $GLOBALS['log']->info("Warning: skipping bounced email with this tracker_key(identifier) in the message body: ".$identifier);
+                    return FALSE;
+                }			
+            } 
+            else 
+            {
+                $GLOBALS['log']->info("Warning: Empty identifier for campaign log.");
+                return FALSE;
+            }
+        }  
+        else 
+        {
+            $GLOBALS['log']->info("Warning: skipping bounced email because it does not have the removeme link.");	
+            return FALSE;	
+            }
+    } 
+    else 
+    {
+    $GLOBALS['log']->info("Warning: skipping bounced email because the sender is not MAILER-DAEMON.");
+    return FALSE;
+    }
 }
 ?>

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)) 
 					{

Braces +17 added lines, -19 removed lines

@@ -1,5 +1,7 @@ 
 <?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,8 +57,9 @@ 
     $contents = "";
     $query = "SELECT description FROM notes WHERE file_mime_type = 'messsage/rfc822' AND parent_type='Emails' AND parent_id = '".$email->id."' AND deleted=0";
     $rs = $GLOBALS['db']->query($query);
-    while ($row = $GLOBALS['db']->fetchByAssoc($rs)) 
-		$contents .= $row['description'];
+    while ($row = $GLOBALS['db']->fetchByAssoc($rs)) {
+    		$contents .= $row['description'];
+    }
 
     return $contents;
 }
@@ -89,9 +92,9 @@ 
     {
         $bounce->activity_type='invalid email';
         markEmailAddressInvalid($email);
+    } else {
+            $bounce->activity_type='send error';
     }
-    else 
-        $bounce->activity_type='send error';
         
     $return_id=$bounce->save();
     return $return_id;
@@ -104,8 +107,9 @@ 
  */
 function markEmailAddressInvalid($email_address)
 {
-    if(empty($email_address))
-        return;
+    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)
@@ -149,8 +153,7 @@ 
         $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);
         $found = TRUE;
@@ -207,32 +210,27 @@ 
 					{
 						$return_id = createBouncedCampaignLogEntry($row, $email, $email_description);	
 						return TRUE;
-					}				
-					else 
+					} else 
 					{
 					    $GLOBALS['log']->debug("Warning: campaign log entry already exists for identifier $identifier");
 					    return FALSE;
 					}
-				} 
-				else 
+				} else 
 				{
 				    $GLOBALS['log']->info("Warning: skipping bounced email with this tracker_key(identifier) in the message body: ".$identifier);
 					return FALSE;
 				}			
-    		} 
-    		else 
+    		} else 
     		{
     			$GLOBALS['log']->info("Warning: Empty identifier for campaign log.");
     			return FALSE;
     		}
-    	}  
-    	else 
+    	} else 
     	{
     	    $GLOBALS['log']->info("Warning: skipping bounced email because it does not have the removeme link.");	
     		return FALSE;	
       	}
-  } 
-  else 
+  } else 
   {
 	$GLOBALS['log']->info("Warning: skipping bounced email because the sender is not MAILER-DAEMON.");
 	return FALSE;