adamjakab / SuiteCRM

modules/Campaigns/PopupCampaignRoi.php

Indentation +18 added lines, -18 removed lines

@@ -79,46 +79,46 @@
             //$opp_query1 .= " and deleted=0";
             $opp_result1=$campaign->db->query($opp_query1);
             $opp_data1=$campaign->db->fetchByAssoc($opp_result1);
- //get the click-throughs
- $query_click = "SELECT count(*) hits ";
-			$query_click.= " FROM campaign_log ";
-			$query_click.= " WHERE campaign_id = '$campaign_id' AND activity_type='link' AND related_type='CampaignTrackers' AND archived=0 AND deleted=0";
+    //get the click-throughs
+    $query_click = "SELECT count(*) hits ";
+            $query_click.= " FROM campaign_log ";
+            $query_click.= " WHERE campaign_id = '$campaign_id' AND activity_type='link' AND related_type='CampaignTrackers' AND archived=0 AND deleted=0";
 
             //if $marketing id is specified, then lets filter the chart by the value
             if (!empty($marketing_id)){
                 $query_click.= " AND marketing_id ='$marketing_id'";
             }
 
-			$query_click.= " GROUP BY  activity_type, target_type";
-			$query_click.= " ORDER BY  activity_type, target_type";
-			$result = $campaign->db->query($query_click);
+            $query_click.= " GROUP BY  activity_type, target_type";
+            $query_click.= " ORDER BY  activity_type, target_type";
+            $result = $campaign->db->query($query_click);
 
 
-  $xtpl->assign("OPP_COUNT", $opp_data1['opp_count']);
-  $xtpl->assign("ACTUAL_COST",$opp_data1['actual_cost']);
-  $xtpl->assign("PLANNED_BUDGET",$opp_data1['budget']);
-  $xtpl->assign("EXPECTED_REVENUE",$opp_data1['expected_revenue']);
+    $xtpl->assign("OPP_COUNT", $opp_data1['opp_count']);
+    $xtpl->assign("ACTUAL_COST",$opp_data1['actual_cost']);
+    $xtpl->assign("PLANNED_BUDGET",$opp_data1['budget']);
+    $xtpl->assign("EXPECTED_REVENUE",$opp_data1['expected_revenue']);
 
 
 
 
-	$currency  = new Currency();
+    $currency  = new Currency();
 if(isset($focus->currency_id) && !empty($focus->currency_id))
 {
-	$currency->retrieve($focus->currency_id);
-	if( $currency->deleted != 1){
-		$xtpl->assign("CURRENCY", $currency->iso4217 .' '.$currency->symbol );
-	}else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
+    $currency->retrieve($focus->currency_id);
+    if( $currency->deleted != 1){
+        $xtpl->assign("CURRENCY", $currency->iso4217 .' '.$currency->symbol );
+    }else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
 }else{
 
-	$xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
+    $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
 
 }
 
 global $current_user;
 if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){
 
-	$xtpl->assign("ADMIN_EDIT","<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action'] ."&from_module=".$_REQUEST['module'] ."&record=".$_REQUEST['record']. "'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDIT_LAYOUT'])."</a>");
+    $xtpl->assign("ADMIN_EDIT","<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action'] ."&from_module=".$_REQUEST['module'] ."&record=".$_REQUEST['record']. "'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDIT_LAYOUT'])."</a>");
 
 }
 

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.
@@ -65,60 +65,60 @@ 
 
 $GLOBALS['log']->info("Campaign detail view");
 
-$xtpl=new XTemplate ('modules/Campaigns/PopupCampaignRoi.html');
+$xtpl = new XTemplate('modules/Campaigns/PopupCampaignRoi.html');
 
 //_pp($_REQUEST['id']);
-$campaign_id=$_REQUEST['id'];
+$campaign_id = $_REQUEST['id'];
 $campaign = new Campaign();
-$opp_query1  = "select camp.name, camp.actual_cost,camp.budget,camp.expected_revenue,count(*) opp_count,SUM(opp.amount) as Revenue, SUM(camp.actual_cost) as Investment,
+$opp_query1 = "select camp.name, camp.actual_cost,camp.budget,camp.expected_revenue,count(*) opp_count,SUM(opp.amount) as Revenue, SUM(camp.actual_cost) as Investment,
                             ROUND((SUM(opp.amount) - SUM(camp.actual_cost))/(SUM(camp.actual_cost)), 2)*100 as ROI";
             $opp_query1 .= " from opportunities opp";
             $opp_query1 .= " right join campaigns camp on camp.id = opp.campaign_id";
             $opp_query1 .= " where opp.sales_stage = 'Closed Won' and camp.id='$campaign_id'";
             $opp_query1 .= " group by camp.name";
             //$opp_query1 .= " and deleted=0";
-            $opp_result1=$campaign->db->query($opp_query1);
-            $opp_data1=$campaign->db->fetchByAssoc($opp_result1);
+            $opp_result1 = $campaign->db->query($opp_query1);
+            $opp_data1 = $campaign->db->fetchByAssoc($opp_result1);
  //get the click-throughs
  $query_click = "SELECT count(*) hits ";
-			$query_click.= " FROM campaign_log ";
-			$query_click.= " WHERE campaign_id = '$campaign_id' AND activity_type='link' AND related_type='CampaignTrackers' AND archived=0 AND deleted=0";
+			$query_click .= " FROM campaign_log ";
+			$query_click .= " WHERE campaign_id = '$campaign_id' AND activity_type='link' AND related_type='CampaignTrackers' AND archived=0 AND deleted=0";
 
             //if $marketing id is specified, then lets filter the chart by the value
-            if (!empty($marketing_id)){
-                $query_click.= " AND marketing_id ='$marketing_id'";
+            if (!empty($marketing_id)) {
+                $query_click .= " AND marketing_id ='$marketing_id'";
             }
 
-			$query_click.= " GROUP BY  activity_type, target_type";
-			$query_click.= " ORDER BY  activity_type, target_type";
+			$query_click .= " GROUP BY  activity_type, target_type";
+			$query_click .= " ORDER BY  activity_type, target_type";
 			$result = $campaign->db->query($query_click);
 
 
   $xtpl->assign("OPP_COUNT", $opp_data1['opp_count']);
-  $xtpl->assign("ACTUAL_COST",$opp_data1['actual_cost']);
-  $xtpl->assign("PLANNED_BUDGET",$opp_data1['budget']);
-  $xtpl->assign("EXPECTED_REVENUE",$opp_data1['expected_revenue']);
+  $xtpl->assign("ACTUAL_COST", $opp_data1['actual_cost']);
+  $xtpl->assign("PLANNED_BUDGET", $opp_data1['budget']);
+  $xtpl->assign("EXPECTED_REVENUE", $opp_data1['expected_revenue']);
 
 
 
 
-	$currency  = new Currency();
-if(isset($focus->currency_id) && !empty($focus->currency_id))
+	$currency = new Currency();
+if (isset($focus->currency_id) && !empty($focus->currency_id))
 {
 	$currency->retrieve($focus->currency_id);
-	if( $currency->deleted != 1){
-		$xtpl->assign("CURRENCY", $currency->iso4217 .' '.$currency->symbol );
-	}else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
-}else{
+	if ($currency->deleted != 1) {
+		$xtpl->assign("CURRENCY", $currency->iso4217.' '.$currency->symbol);
+	} else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
+} else {
 
-	$xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
+	$xtpl->assign("CURRENCY", $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
 
 }
 
 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'])) {
 
-	$xtpl->assign("ADMIN_EDIT","<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action'] ."&from_module=".$_REQUEST['module'] ."&record=".$_REQUEST['record']. "'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDIT_LAYOUT'])."</a>");
+	$xtpl->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action']."&from_module=".$_REQUEST['module']."&record=".$_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT'])."</a>");
 
 }
 
@@ -171,23 +171,23 @@ 
   */
 
 //add chart
-$seps				= array("-", "/");
-$dates				= array(date($GLOBALS['timedate']->dbDayFormat), $GLOBALS['timedate']->dbDayFormat);
-$dateFileNameSafe	= str_replace($seps, "_", $dates);
-$cache_file_name_roi	= $current_user->getUserPrivGuid()."_campaign_response_by_roi_".$dateFileNameSafe[0]."_".$dateFileNameSafe[1].".xml";
-$chart= new campaign_charts();
+$seps = array("-", "/");
+$dates = array(date($GLOBALS['timedate']->dbDayFormat), $GLOBALS['timedate']->dbDayFormat);
+$dateFileNameSafe = str_replace($seps, "_", $dates);
+$cache_file_name_roi = $current_user->getUserPrivGuid()."_campaign_response_by_roi_".$dateFileNameSafe[0]."_".$dateFileNameSafe[1].".xml";
+$chart = new campaign_charts();
 
 //ob_start();
 
     //if marketing id has been selected, then set "latest_marketing_id" to the selected value
     //latest marketing id will be passed in to filter the charts and subpanels
 
-    if(!empty($selected_marketing_id)){$latest_marketing_id = $selected_marketing_id;}
-    if(empty($latest_marketing_id) ||  $latest_marketing_id === 'all'){
-        $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") . $cache_file_name_roi,true));
-    }else{
+    if (!empty($selected_marketing_id)) {$latest_marketing_id = $selected_marketing_id; }
+    if (empty($latest_marketing_id) || $latest_marketing_id === 'all') {
+        $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'], $app_list_strings['roi_type_dom'], $campaign_id, sugar_cached("xml/").$cache_file_name_roi, true));
+    } else {
 
-    $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") .$cache_file_name_roi,true));
+    $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'], $app_list_strings['roi_type_dom'], $campaign_id, sugar_cached("xml/").$cache_file_name_roi, true));
     }
 
 //$output_html .= ob_get_contents();

Braces +8 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.
@@ -108,8 +110,10 @@ 
 	$currency->retrieve($focus->currency_id);
 	if( $currency->deleted != 1){
 		$xtpl->assign("CURRENCY", $currency->iso4217 .' '.$currency->symbol );
-	}else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
-}else{
+	} else {
+	    $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
+	}
+	} else{
 
 	$xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
 
@@ -185,7 +189,7 @@ 
     if(!empty($selected_marketing_id)){$latest_marketing_id = $selected_marketing_id;}
     if(empty($latest_marketing_id) ||  $latest_marketing_id === 'all'){
         $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") . $cache_file_name_roi,true));
-    }else{
+    } else{
 
     $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") .$cache_file_name_roi,true));
     }

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 +58 added lines, -58 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,10 +51,10 @@ 
 
     //create new campaign bean and populate
     $campaign_focus = new Campaign();
-    if(isset($_REQUEST['record']) && $_REQUEST['record'] && !(isset($_REQUEST['campaign_id']) && $_REQUEST['campaign_id'])) {
+    if (isset($_REQUEST['record']) && $_REQUEST['record'] && !(isset($_REQUEST['campaign_id']) && $_REQUEST['campaign_id'])) {
         $campaign_focus->retrieve($_REQUEST['record']);
     }
-    else if(isset($_REQUEST['campaign_id']) && $_REQUEST['campaign_id']) {
+    else if (isset($_REQUEST['campaign_id']) && $_REQUEST['campaign_id']) {
         $campaign_focus->retrieve($_REQUEST['campaign_id']);
     }
 
@@ -63,8 +63,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
@@ -74,7 +74,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');
@@ -82,7 +82,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;
@@ -90,36 +90,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]);
@@ -127,7 +127,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();
@@ -152,27 +152,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];
@@ -187,11 +187,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];
@@ -212,19 +212,19 @@ 
 $_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 = '';
 $redirectToTargetList = '';
-if(isset($_REQUEST['wiz_direction'])){
-    if($_REQUEST['wiz_direction']== 'continue') {
+if (isset($_REQUEST['wiz_direction'])) {
+    if ($_REQUEST['wiz_direction'] == 'continue') {
         $action = 'WizardMarketing';
     }
-    else if($_REQUEST['wiz_direction'] == 'continue_targetList') {
+    else if ($_REQUEST['wiz_direction'] == 'continue_targetList') {
         $action = 'WizardMarketing';
         $redirectToTargetList = '&redirectToTargetList=1';
     }
-}else{
+} else {
     $action = 'WizardHome&record='.$campaign_focus->id;
 }
 //require_once('modules/Campaigns/WizardMarketing.php');
@@ -238,12 +238,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;
@@ -260,34 +260,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;
     }
@@ -295,27 +295,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;
     }
@@ -323,26 +323,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 +8 added lines, -8 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.
@@ -53,8 +55,7 @@ 
     $campaign_focus = new Campaign();
     if(isset($_REQUEST['record']) && $_REQUEST['record'] && !(isset($_REQUEST['campaign_id']) && $_REQUEST['campaign_id'])) {
         $campaign_focus->retrieve($_REQUEST['record']);
-    }
-    else if(isset($_REQUEST['campaign_id']) && $_REQUEST['campaign_id']) {
+    } else if(isset($_REQUEST['campaign_id']) && $_REQUEST['campaign_id']) {
         $campaign_focus->retrieve($_REQUEST['campaign_id']);
     }
 
@@ -95,7 +96,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
 
@@ -127,7 +128,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();
@@ -219,12 +220,11 @@ 
 if(isset($_REQUEST['wiz_direction'])){
     if($_REQUEST['wiz_direction']== 'continue') {
         $action = 'WizardMarketing';
-    }
-    else if($_REQUEST['wiz_direction'] == 'continue_targetList') {
+    } else if($_REQUEST['wiz_direction'] == 'continue_targetList') {
         $action = 'WizardMarketing';
         $redirectToTargetList = '&redirectToTargetList=1';
     }
-}else{
+} else{
     $action = 'WizardHome&record='.$campaign_focus->id;
 }
 //require_once('modules/Campaigns/WizardMarketing.php');

modules/Campaigns/WebToLeadCapture.php

Spacing +41 added lines, -41 removed lines

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

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

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

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

modules/Campaigns/WebToLeadFormSave.php

Spacing +12 added lines, -12 removed lines

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

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.

Indentation +16 added lines, -16 removed lines

@@ -62,27 +62,27 @@
 
 while (strpos($bodyHTML, "ta_replace") !== false){
 
-	//define the marker edges of the sub string to process (opening and closing tag brackets)
-	$marker = strpos($bodyHTML, "ta_replace");
-	$start_border = strpos($bodyHTML, "input", $marker) - 1;// to account for opening '<' char;
-	$end_border = strpos($bodyHTML, '>', $start_border); //get the closing tag after marker ">";
+    //define the marker edges of the sub string to process (opening and closing tag brackets)
+    $marker = strpos($bodyHTML, "ta_replace");
+    $start_border = strpos($bodyHTML, "input", $marker) - 1;// to account for opening '<' char;
+    $end_border = strpos($bodyHTML, '>', $start_border); //get the closing tag after marker ">";
 
-	//extract the input tag string
-	$working_str = substr($bodyHTML, $marker-3, $end_border-($marker-3) );
+    //extract the input tag string
+    $working_str = substr($bodyHTML, $marker-3, $end_border-($marker-3) );
 
-	//replace input markup with text areas markups
-	$new_str = str_replace('input','textarea',$working_str);
-	$new_str = str_replace("type=\"text\"", ' ', $new_str);
-	$new_str = $new_str . '> </textarea';
+    //replace input markup with text areas markups
+    $new_str = str_replace('input','textarea',$working_str);
+    $new_str = str_replace("type=\"text\"", ' ', $new_str);
+    $new_str = $new_str . '> </textarea';
 
-	//replace the marker with generic term
-	$new_str = str_replace('ta_replace', 'sugarslot', $new_str);
+    //replace the marker with generic term
+    $new_str = str_replace('ta_replace', 'sugarslot', $new_str);
 
-	// NET-enabling start-tag requires SHORTTAG YES
-	$new_str = str_replace('/> </textarea>', '> </textarea>', $new_str);
+    // NET-enabling start-tag requires SHORTTAG YES
+    $new_str = str_replace('/> </textarea>', '> </textarea>', $new_str);
 
-	//merge the processed string back into bodyhtml string
-	$bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
+    //merge the processed string back into bodyhtml string
+    $bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
 }
 //<<<----------end replacing marked text inputs with text area tags
 

modules/Campaigns/CampaignDiagnostic.php

Indentation +19 added lines, -19 removed lines

@@ -59,11 +59,11 @@ 
 //if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
 //account for use within wizards
 if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
-	$params = array();
-	$params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
-	$params[] = $mod_strings['LBL_CAMPAIGN_DIAGNOSTICS'];
+    $params = array();
+    $params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
+    $params[] = $mod_strings['LBL_CAMPAIGN_DIAGNOSTICS'];
 	
-	echo getClassicModuleTitle('Campaigns', $params, true);
+    echo getClassicModuleTitle('Campaigns', $params, true);
 }
 
 global $theme;
@@ -110,10 +110,10 @@ 
 if(isset($mbox) && count($mbox)>0){
     $mboxTable .= "<tr><td colspan='5' style='text-align: left;'><b>" .count($mbox) ." ". $mod_strings['LBL_MAILBOX_CHECK1_GOOD']." </b>.</td></tr>";
         $mboxTable .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX_NAME']."</b></th>"
-                   .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LOGIN']."</b></th>"
-                   .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX']."</b></th>"
-                   .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_SERVER_URL']."</b></th>"
-                   .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LIST_STATUS']."</b></th></tr>";
+                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LOGIN']."</b></th>"
+                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX']."</b></th>"
+                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_SERVER_URL']."</b></th>"
+                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LIST_STATUS']."</b></th></tr>";
 
     foreach($mbox as $details){
         $mboxTable .= "<tr><td>".$details['name']."</td>";
@@ -144,11 +144,11 @@ 
 }else{
     $conf_msg .= "<tr><td colspan = '5'><b> ".$mod_strings['LBL_MAILBOX_CHECK2_GOOD']."</b></td></tr>";
     $conf_msg .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_NAME']."</b></th>"
-               .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_ADDRESS']."</b></th>"
-               .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SENDTYPE']."</b></th>";
+                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_ADDRESS']."</b></th>"
+                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SENDTYPE']."</b></th>";
     if($focus->settings['mail_sendtype']=='SMTP'){
-     $conf_msg .= " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPSERVER']."</b></th>"
-               .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPUSER']."</b></th></tr>";
+        $conf_msg .= " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPSERVER']."</b></th>"
+                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPUSER']."</b></th></tr>";
 
     }else{$conf_msg .= "</tr>";}
                    
@@ -157,7 +157,7 @@ 
         $conf_msg .= "<tr><td>".$focus->settings['notify_fromname']."</td>";
         $conf_msg .= "<td>".$focus->settings['notify_fromaddress']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_sendtype']."</td>";
-     if($focus->settings['mail_sendtype']=='SMTP'){
+        if($focus->settings['mail_sendtype']=='SMTP'){
         $conf_msg .= "<td>".$focus->settings['mail_smtpserver']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_smtpuser']."</td></tr>";
 
@@ -198,7 +198,7 @@ 
 //build the table rows for scheduler display
 while ($sched_row = $focus->db->fetchByAssoc($sched_res)){$scheds[] = $sched_row;}
 foreach ($scheds as $funct){
-  if( ($funct['job']==$check_sched1)  ||   ($funct['job']==$check_sched2)){
+    if( ($funct['job']==$check_sched1)  ||   ($funct['job']==$check_sched2)){
         $sched_mes = 'use';
         $sched_mes_body .= "<tr><td style='text-align: left;'>".$funct['name']."</td>";
         $sched_mes_body .= "<td style='text-align: left;'>".$funct['status']."</td></tr>";
@@ -208,7 +208,7 @@ 
             $check_sched2 ="found";
         }  
         
-  }
+    }
 }
 
 //determine which table header to use, based on whether or not schedulers were found
@@ -216,7 +216,7 @@ 
 if($sched_mes == 'use'){
     $sched_mes = "<h5>".$mod_strings['LBL_SCHEDULER_CHECK_GOOD']."</h5><br><table class='other view' cellspacing='1'>";
     $sched_mes .= "<tr><th scope='col' width='40%'><b>".$mod_strings['LBL_SCHEDULER_NAME']."</b></tH>"
-               .  " <th scope='col' width='60%'><b>".$mod_strings['LBL_SCHEDULER_STATUS']."</b></tH></tr>";
+                .  " <th scope='col' width='60%'><b>".$mod_strings['LBL_SCHEDULER_STATUS']."</b></tH></tr>";
             
 }else{
     $sched_mes = "<table class='other view' cellspacing='1'>";
@@ -238,7 +238,7 @@ 
     if (is_admin($current_user)){
         $admin_sched_link="<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
     }else{
-     $admin_sched_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
+        $admin_sched_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
     }    
 }    
 
@@ -251,7 +251,7 @@ 
 /********** FINAL END OF PAGE UI Stuff ********/
 if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
 
-      $ss->display('modules/Campaigns/CampaignDiagnostic.html');
+        $ss->display('modules/Campaigns/CampaignDiagnostic.html');
 }
 
 /**
@@ -272,7 +272,7 @@ 
     }elseif($num == 0){
         //if health number is zero, then all checks passed, set green image
         //green
-       return SugarThemeRegistry::current()->getImage('green_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_VALID']);
+        return SugarThemeRegistry::current()->getImage('green_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_VALID']);
 
 
     }else{

Spacing +58 added lines, -58 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.
@@ -58,7 +58,7 @@ 
 
 //if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
 //account for use within wizards
-if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
+if (!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline') {
 	$params = array();
 	$params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
 	$params[] = $mod_strings['LBL_CAMPAIGN_DIAGNOSTICS'];
@@ -72,11 +72,11 @@ 
 
 
 
-if(isset($_REQUEST['inline']) && $_REQUEST['inline'] == 'inline'){
+if (isset($_REQUEST['inline']) && $_REQUEST['inline'] == 'inline') {
     {
 
 }
-}else{
+} else {
     //use html if not inline
     $ss = new Sugar_Smarty();
     $ss->assign("MOD", $mod_strings);
@@ -104,18 +104,18 @@ 
 $mboxTable = "<table border ='0' width='100%'  class='detail view' cellpadding='0' cellspacing='0'>";
 //put all rows returned into an array
 $mbox = array();
-while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)){$mbox[] = $mbox_row;}
+while ($mbox_row = $focus->db->fetchByAssoc($mbox_res)) {$mbox[] = $mbox_row; }
     $mbox_msg = ' ';
 //if the array is not empty, then set "good" message
-if(isset($mbox) && count($mbox)>0){
-    $mboxTable .= "<tr><td colspan='5' style='text-align: left;'><b>" .count($mbox) ." ". $mod_strings['LBL_MAILBOX_CHECK1_GOOD']." </b>.</td></tr>";
+if (isset($mbox) && count($mbox) > 0) {
+    $mboxTable .= "<tr><td colspan='5' style='text-align: left;'><b>".count($mbox)." ".$mod_strings['LBL_MAILBOX_CHECK1_GOOD']." </b>.</td></tr>";
         $mboxTable .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX_NAME']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LOGIN']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAILBOX']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_SERVER_URL']."</b></th>"
                    .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_LIST_STATUS']."</b></th></tr>";
 
-    foreach($mbox as $details){
+    foreach ($mbox as $details) {
         $mboxTable .= "<tr><td>".$details['name']."</td>";
         $mboxTable .= "<td>".$details['email_user']."</td>";
         $mboxTable .= "<td>".$details['mailbox']."</td>";
@@ -123,64 +123,64 @@ 
         $mboxTable .= "<td>".$details['status']."</td></tr>";
     }
 
-}else{
+} else {
     //if array is empty, then set "bad" message and increment health counter
-    $mboxTable .=  "<tr><td colspan='5'><b class='error'>". $mod_strings['LBL_MAILBOX_CHECK1_BAD']."</b></td></tr>";
-    $email_health =$email_health +1;
+    $mboxTable .= "<tr><td colspan='5'><b class='error'>".$mod_strings['LBL_MAILBOX_CHECK1_BAD']."</b></td></tr>";
+    $email_health = $email_health + 1;
 }
 
-$mboxTable.= '</table>' ;
+$mboxTable .= '</table>';
 
 
     
 $ss->assign("MAILBOXES_DETECTED_MESSAGE", $mboxTable);
 
 //email settings configured 
-$conf_msg="<table border='0' width='100%' class='detail view' cellpadding='0' cellspacing='0'>";
-if (strstr($focus->settings['notify_fromaddress'], 'example.com')){
+$conf_msg = "<table border='0' width='100%' class='detail view' cellpadding='0' cellspacing='0'>";
+if (strstr($focus->settings['notify_fromaddress'], 'example.com')) {
     //if from address is the default, then set "bad" message and increment health counter
     $conf_msg .= "<tr><td colspan = '5'><b class='error'> ".$mod_strings['LBL_MAILBOX_CHECK2_BAD']." </b></td></td>";
-    $email_health =$email_health +1;
-}else{
+    $email_health = $email_health + 1;
+} else {
     $conf_msg .= "<tr><td colspan = '5'><b> ".$mod_strings['LBL_MAILBOX_CHECK2_GOOD']."</b></td></tr>";
     $conf_msg .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_NAME']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_ADDRESS']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SENDTYPE']."</b></th>";
-    if($focus->settings['mail_sendtype']=='SMTP'){
+    if ($focus->settings['mail_sendtype'] == 'SMTP') {
      $conf_msg .= " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPSERVER']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPUSER']."</b></th></tr>";
 
-    }else{$conf_msg .= "</tr>";}
+    } else {$conf_msg .= "</tr>"; }
                    
     
 
         $conf_msg .= "<tr><td>".$focus->settings['notify_fromname']."</td>";
         $conf_msg .= "<td>".$focus->settings['notify_fromaddress']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_sendtype']."</td>";
-     if($focus->settings['mail_sendtype']=='SMTP'){
+     if ($focus->settings['mail_sendtype'] == 'SMTP') {
         $conf_msg .= "<td>".$focus->settings['mail_smtpserver']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_smtpuser']."</td></tr>";
 
-    }else{$conf_msg .= "</tr>";}       
+    } else {$conf_msg .= "</tr>"; }       
 
 }
           
 $conf_msg .= '</table>'; 
 $ss->assign("EMAIL_SETTINGS_CONFIGURED_MESSAGE", $conf_msg);
-$email_setup_wiz_link='';
-if ($email_health>0){
-    if (is_admin($current_user)){
-        $email_setup_wiz_link="<a href='index.php?module=Campaigns&action=WizardEmailSetup'>".$mod_strings['LBL_EMAIL_SETUP_WIZ']."</a>";
-    }else{
-        $email_setup_wiz_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
+$email_setup_wiz_link = '';
+if ($email_health > 0) {
+    if (is_admin($current_user)) {
+        $email_setup_wiz_link = "<a href='index.php?module=Campaigns&action=WizardEmailSetup'>".$mod_strings['LBL_EMAIL_SETUP_WIZ']."</a>";
+    } else {
+        $email_setup_wiz_link = $mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
     }    
 }
 
 $ss->assign("EMAIL_SETUP_WIZ_LINK", $email_setup_wiz_link);
-$ss->assign( 'EMAIL_IMAGE', define_image($email_health, 2));
-$ss->assign( 'EMAIL_COMPONENTS', $mod_strings['LBL_EMAIL_COMPONENTS']);
-$ss->assign( 'SCHEDULER_COMPONENTS', $mod_strings['LBL_SCHEDULER_COMPONENTS']);
-$ss->assign( 'RECHECK_BTN', $mod_strings['LBL_RECHECK_BTN']);
+$ss->assign('EMAIL_IMAGE', define_image($email_health, 2));
+$ss->assign('EMAIL_COMPONENTS', $mod_strings['LBL_EMAIL_COMPONENTS']);
+$ss->assign('SCHEDULER_COMPONENTS', $mod_strings['LBL_SCHEDULER_COMPONENTS']);
+$ss->assign('RECHECK_BTN', $mod_strings['LBL_RECHECK_BTN']);
 
 /************* SCHEDULER COMPONENTS ************/
 
@@ -196,16 +196,16 @@ 
 
 $scheds = array();
 //build the table rows for scheduler display
-while ($sched_row = $focus->db->fetchByAssoc($sched_res)){$scheds[] = $sched_row;}
-foreach ($scheds as $funct){
-  if( ($funct['job']==$check_sched1)  ||   ($funct['job']==$check_sched2)){
+while ($sched_row = $focus->db->fetchByAssoc($sched_res)) {$scheds[] = $sched_row; }
+foreach ($scheds as $funct) {
+  if (($funct['job'] == $check_sched1) || ($funct['job'] == $check_sched2)) {
         $sched_mes = 'use';
         $sched_mes_body .= "<tr><td style='text-align: left;'>".$funct['name']."</td>";
         $sched_mes_body .= "<td style='text-align: left;'>".$funct['status']."</td></tr>";
-        if($funct['job']==$check_sched1){
-            $check_sched1 ="found";
-        }else{
-            $check_sched2 ="found";
+        if ($funct['job'] == $check_sched1) {
+            $check_sched1 = "found";
+        } else {
+            $check_sched2 = "found";
         }  
         
   }
@@ -213,43 +213,43 @@ 
 
 //determine which table header to use, based on whether or not schedulers were found
 $show_admin_link = false;
-if($sched_mes == 'use'){
+if ($sched_mes == 'use') {
     $sched_mes = "<h5>".$mod_strings['LBL_SCHEDULER_CHECK_GOOD']."</h5><br><table class='other view' cellspacing='1'>";
     $sched_mes .= "<tr><th scope='col' width='40%'><b>".$mod_strings['LBL_SCHEDULER_NAME']."</b></tH>"
                .  " <th scope='col' width='60%'><b>".$mod_strings['LBL_SCHEDULER_STATUS']."</b></tH></tr>";
             
-}else{
+} else {
     $sched_mes = "<table class='other view' cellspacing='1'>";
-    $sched_mes  .= "<tr><td colspan ='3'><font color='red'><b> ".$mod_strings['LBL_SCHEDULER_CHECK_BAD']."</b></font></td></tr>";
+    $sched_mes .= "<tr><td colspan ='3'><font color='red'><b> ".$mod_strings['LBL_SCHEDULER_CHECK_BAD']."</b></font></td></tr>";
     $show_admin_link = true;
 }
 
 //determine if error messages need to be displayed for schedulers
-if($check_sched2 != 'found'){
-    $sched_health =$sched_health +1;
-    $sched_mes_body  .= "<tr><td colspan ='3'><font color='red'> ".$mod_strings['LBL_SCHEDULER_CHECK1_BAD']."</font></td></tr>";
+if ($check_sched2 != 'found') {
+    $sched_health = $sched_health + 1;
+    $sched_mes_body .= "<tr><td colspan ='3'><font color='red'> ".$mod_strings['LBL_SCHEDULER_CHECK1_BAD']."</font></td></tr>";
 }
-if($check_sched1 != 'found'){
-    $sched_health =$sched_health +1;
-    $sched_mes_body  .= "<tr><td colspan ='3' scope='row'><font color='red'>".$mod_strings['LBL_SCHEDULER_CHECK2_BAD']."</font></td></tr>";
+if ($check_sched1 != 'found') {
+    $sched_health = $sched_health + 1;
+    $sched_mes_body .= "<tr><td colspan ='3' scope='row'><font color='red'>".$mod_strings['LBL_SCHEDULER_CHECK2_BAD']."</font></td></tr>";
 }
-$admin_sched_link='';
-if ($sched_health>0){
-    if (is_admin($current_user)){
-        $admin_sched_link="<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
-    }else{
-     $admin_sched_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
+$admin_sched_link = '';
+if ($sched_health > 0) {
+    if (is_admin($current_user)) {
+        $admin_sched_link = "<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
+    } else {
+     $admin_sched_link = $mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
     }    
 }    
 
 //put table html together and display
-    $final_sched_msg = $sched_mes . $sched_mes_body . '</table>' . $admin_sched_link;        
+    $final_sched_msg = $sched_mes.$sched_mes_body.'</table>'.$admin_sched_link;        
     $ss->assign("SCHEDULER_EMAILS_MESSAGE", $final_sched_msg);
-    $ss->assign( 'SCHEDULE_IMAGE', define_image($sched_health, 2));
+    $ss->assign('SCHEDULE_IMAGE', define_image($sched_health, 2));
 
 
 /********** FINAL END OF PAGE UI Stuff ********/
-if(!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline'){
+if (!isset($_REQUEST['inline']) || $_REQUEST['inline'] != 'inline') {
 
       $ss->display('modules/Campaigns/CampaignDiagnostic.html');
 }
@@ -264,18 +264,18 @@ 
 function define_image($num, $total)
 { global $mod_strings;
     //if health number is equal to total number then all checks failed, set red image
-    if($num == $total){
+    if ($num == $total) {
         //red
         return SugarThemeRegistry::current()->getImage('red_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_INVALID']);
 
 
-    }elseif($num == 0){
+    }elseif ($num == 0) {
         //if health number is zero, then all checks passed, set green image
         //green
        return SugarThemeRegistry::current()->getImage('green_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_VALID']);
 
 
-    }else{
+    } else {
         //if health number is between total and num params, then some checks failed but not all, set yellow image
         //yellow
         return SugarThemeRegistry::current()->getImage('yellow_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_ALERT']);

Braces +23 added lines, -15 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.
@@ -76,14 +78,20 @@ 
     {
 
 }
-}else{
+} else{
     //use html if not inline
     $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']);
+    }
     // handle Create $module then Cancel
     if (empty($_REQUEST['return_id'])) {
         $ss->assign("RETURN_ACTION", 'index');
@@ -123,7 +131,7 @@ 
         $mboxTable .= "<td>".$details['status']."</td></tr>";
     }
 
-}else{
+} else{
     //if array is empty, then set "bad" message and increment health counter
     $mboxTable .=  "<tr><td colspan='5'><b class='error'>". $mod_strings['LBL_MAILBOX_CHECK1_BAD']."</b></td></tr>";
     $email_health =$email_health +1;
@@ -141,7 +149,7 @@ 
     //if from address is the default, then set "bad" message and increment health counter
     $conf_msg .= "<tr><td colspan = '5'><b class='error'> ".$mod_strings['LBL_MAILBOX_CHECK2_BAD']." </b></td></td>";
     $email_health =$email_health +1;
-}else{
+} else{
     $conf_msg .= "<tr><td colspan = '5'><b> ".$mod_strings['LBL_MAILBOX_CHECK2_GOOD']."</b></td></tr>";
     $conf_msg .= "<tr><th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_NAME']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_WIZ_FROM_ADDRESS']."</b></th>"
@@ -150,7 +158,7 @@ 
      $conf_msg .= " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPSERVER']."</b></th>"
                .  " <th scope='col' width='20%'><b>".$mod_strings['LBL_MAIL_SMTPUSER']."</b></th></tr>";
 
-    }else{$conf_msg .= "</tr>";}
+    } else{$conf_msg .= "</tr>";}
                    
     
 
@@ -161,7 +169,7 @@ 
         $conf_msg .= "<td>".$focus->settings['mail_smtpserver']."</td>";
         $conf_msg .= "<td>".$focus->settings['mail_smtpuser']."</td></tr>";
 
-    }else{$conf_msg .= "</tr>";}       
+    } else{$conf_msg .= "</tr>";}       
 
 }
           
@@ -171,7 +179,7 @@ 
 if ($email_health>0){
     if (is_admin($current_user)){
         $email_setup_wiz_link="<a href='index.php?module=Campaigns&action=WizardEmailSetup'>".$mod_strings['LBL_EMAIL_SETUP_WIZ']."</a>";
-    }else{
+    } else{
         $email_setup_wiz_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];
     }    
 }
@@ -204,7 +212,7 @@ 
         $sched_mes_body .= "<td style='text-align: left;'>".$funct['status']."</td></tr>";
         if($funct['job']==$check_sched1){
             $check_sched1 ="found";
-        }else{
+        } else{
             $check_sched2 ="found";
         }  
         
@@ -218,7 +226,7 @@ 
     $sched_mes .= "<tr><th scope='col' width='40%'><b>".$mod_strings['LBL_SCHEDULER_NAME']."</b></tH>"
                .  " <th scope='col' width='60%'><b>".$mod_strings['LBL_SCHEDULER_STATUS']."</b></tH></tr>";
             
-}else{
+} else{
     $sched_mes = "<table class='other view' cellspacing='1'>";
     $sched_mes  .= "<tr><td colspan ='3'><font color='red'><b> ".$mod_strings['LBL_SCHEDULER_CHECK_BAD']."</b></font></td></tr>";
     $show_admin_link = true;
@@ -237,7 +245,7 @@ 
 if ($sched_health>0){
     if (is_admin($current_user)){
         $admin_sched_link="<a href='index.php?module=Schedulers&action=index'>".$mod_strings['LBL_SCHEDULER_LINK']."</a>";
-    }else{
+    } else{
      $admin_sched_link=$mod_strings['LBL_NON_ADMIN_ERROR_MSG'];   
     }    
 }    
@@ -269,13 +277,13 @@ 
         return SugarThemeRegistry::current()->getImage('red_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_INVALID']);
 
 
-    }elseif($num == 0){
+    } elseif($num == 0){
         //if health number is zero, then all checks passed, set green image
         //green
        return SugarThemeRegistry::current()->getImage('green_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_VALID']);
 
 
-    }else{
+    } else{
         //if health number is between total and num params, then some checks failed but not all, set yellow image
         //yellow
         return SugarThemeRegistry::current()->getImage('yellow_camp', "align='absmiddle'", null, null, ".gif", $mod_strings['LBL_ALERT']);