adamjakab / SuiteCRM

soap.php

Braces +4 added lines, -2 removed lines

@@ -1,6 +1,8 @@
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
-/*********************************************************************************
+ if(!defined('sugarEntry')) {
+     define('sugarEntry', true);
+ }
+ /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 

modules/Connectors/InstallDefaultConnectors.php

Braces +4 added lines, -3 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.
@@ -94,8 +96,7 @@ 
             if(!empty($default_modules_sources[$module])){
                 $merged = array_merge($modules_sources[$module], $default_modules_sources[$module]);
                 $default_modules_sources[$module] = $merged;
-            }
-            else{
+            } else{
                 $default_modules_sources[$module] = $modules_sources[$module];
             }
         }

modules/Prospects/ProspectFormBase.php

Braces +53 added lines, -26 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.
@@ -60,20 +62,20 @@ 
 	$baseQuery = 'select id,first_name, last_name, title, email1, email2  from prospects where deleted!=1 and (';
 	if(!empty($_POST[$prefix.'first_name']) && !empty($_POST[$prefix.'last_name'])){
 		$query = $baseQuery ."  (first_name like '". $_POST[$prefix.'first_name'] . "%' and last_name = '". $_POST[$prefix.'last_name'] ."')";
-	}else{
+	} else{
 			$query = $baseQuery ."  last_name = '". $_POST[$prefix.'last_name'] ."'";
 	}
 	if(!empty($_POST[$prefix.'email1'])){
 		if(empty($query)){
 		$query = $baseQuery. "  email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
-		}else {
+		} else {
 			$query .= "or email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
 		}
 	}
 	if(!empty($_POST[$prefix.'email2'])){
 		if(empty($query))	{
 			$query = $baseQuery. "  email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
-		}else{
+		} else{
 			$query .= "or email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
 		}
 
@@ -87,7 +89,9 @@ 
         while($row = $db->fetchByAssoc($result)) {
             $rows[] = $row;
 		}
-		if(count($rows) > 0) return $rows;
+		if(count($rows) > 0) {
+		    return $rows;
+		}
 		}
 	return null;
 }
@@ -98,15 +102,16 @@ 
 	if(!empty($mod)){
 	global $current_language;
 	$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
+	} else {
+	    global $mod_strings;
+	}
 	global $app_strings;
 	$cols = sizeof($rows[0]) * 2 + 1;
 	if ($action != 'ShowDuplicates') 
 	{
 		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_DUPLICATE']. '</td></tr><tr><td height="20"></td></tr></table>';
 		$form .= "<form action='index.php' method='post' name='dupProspects'><input type='hidden' name='selectedProspect' value=''>";
-	}
-	else 
+	} else 
 	{
 		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_SHOW_DUPLICATES']. '</td></tr><tr><td height="20"></td></tr></table>';
 	}
@@ -132,8 +137,9 @@ 
 	foreach($rows as $row){
 
 		$form .= "<tr class='$rowColor'>";
-		if ($action != 'ShowDuplicates') 
-			$form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
+		if ($action != 'ShowDuplicates') {
+					$form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
+		}
 		
 		$wasSet = false;
 
@@ -142,8 +148,7 @@ 
                 if(!$wasSet) {
                     $form .= "<td scope='row' ><a target='_blank' href='index.php?module=Prospects&action=DetailView&record=${row['id']}'>$value</a></td>\n";
                     $wasSet = true;
-                }
-                else {
+                } else {
                     $form .= "<td><a target='_blank' href='index.php?module=Prospects&action=DetailView&record=${row['id']}'>$value</a></td>\n";
                 }
             }
@@ -151,7 +156,7 @@ 
 
 		if($rowColor == 'evenListRowS1'){
 			$rowColor = 'oddListRowS1';
-		}else{
+		} else{
 			 $rowColor = 'evenListRowS1';
 		}
 		$form .= "</tr>";
@@ -374,7 +379,9 @@ 
 if(!empty($mod)){
 	global $current_language;
 	$mod_strings = return_module_language($current_language, $mod);
-}else global $mod_strings;
+} else {
+    global $mod_strings;
+}
 global $app_strings;
 
 $lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
@@ -423,10 +430,16 @@ 
 	if(!$focus->ACLAccess('Save')){
 		return null;
 	}
-	if (!isset($GLOBALS['check_notify'])) $GLOBALS['check_notify']=false;
+	if (!isset($GLOBALS['check_notify'])) {
+	    $GLOBALS['check_notify']=false;
+	}
 	
-	if (!isset($_POST[$prefix.'email_opt_out'])) $focus->email_opt_out = 0;
-	if (!isset($_POST[$prefix.'do_not_call'])) $focus->do_not_call = 0;
+	if (!isset($_POST[$prefix.'email_opt_out'])) {
+	    $focus->email_opt_out = 0;
+	}
+	if (!isset($_POST[$prefix.'do_not_call'])) {
+	    $focus->do_not_call = 0;
+	}
 	
 	if (empty($_POST['record']) && empty($_POST['dup_checked'])) {
 		/*
@@ -482,15 +495,29 @@ 
 	$GLOBALS['log']->debug("Saved record with id of ".$return_id);
     if(isset($_POST['popup']) && $_POST['popup'] == 'true') {
         $get = '&module=';
-        if(!empty($_POST['return_module'])) $get .= $_POST['return_module'];
-        else $get .= 'Prospects';
+        if(!empty($_POST['return_module'])) {
+            $get .= $_POST['return_module'];
+        } else {
+            $get .= 'Prospects';
+        }
         $get .= '&action=';
-        if(!empty($_POST['return_action'])) $get .= $_POST['return_action'];
-        else $get .= 'Popup';
-        if(!empty($_POST['return_id'])) $get .= '&return_id='.$_POST['return_id'];
-        if(!empty($_POST['popup'])) $get .= '&popup='.$_POST['popup'];
-        if(!empty($_POST['create'])) $get .= '&create='.$_POST['create'];
-        if(!empty($_POST['to_pdf'])) $get .= '&to_pdf='.$_POST['to_pdf'];
+        if(!empty($_POST['return_action'])) {
+            $get .= $_POST['return_action'];
+        } else {
+            $get .= 'Popup';
+        }
+        if(!empty($_POST['return_id'])) {
+            $get .= '&return_id='.$_POST['return_id'];
+        }
+        if(!empty($_POST['popup'])) {
+            $get .= '&popup='.$_POST['popup'];
+        }
+        if(!empty($_POST['create'])) {
+            $get .= '&create='.$_POST['create'];
+        }
+        if(!empty($_POST['to_pdf'])) {
+            $get .= '&to_pdf='.$_POST['to_pdf'];
+        }
         $get .= '&first_name=' . $focus->first_name;
         $get .= '&last_name=' . $focus->last_name;
         $get .= '&query=true';
@@ -500,7 +527,7 @@ 
 	if($redirect){
 	    require_once('include/formbase.php');
 	    handleRedirect($return_id, 'Prospects');
-	}else{
+	} else{
 		return $focus;
 	}
 }

modules/Prospects/metadata/additionalDetails.php

Braces +51 added lines, -21 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.
@@ -48,42 +50,70 @@ 
 		
 	$overlib_string = '';
 	
-	if(!empty($fields['ACCOUNT_NAME'])) $overlib_string .= '<b>'. $mod_strings['LBL_EDIT_ACCOUNT_NAME'] . '</b> ' . $fields['ACCOUNT_NAME'] . '<br>';
+	if(!empty($fields['ACCOUNT_NAME'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_EDIT_ACCOUNT_NAME'] . '</b> ' . $fields['ACCOUNT_NAME'] . '<br>';
+	}
 	if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+		!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+				$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+	}
+	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) {
+			$overlib_string .= '<br>';
+	}
+	if(!empty($fields['PHONE_MOBILE'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+	}
+	if(!empty($fields['PHONE_HOME'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+	}
+	if(!empty($fields['PHONE_OTHER'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+	}
 
-	if(!empty($fields['EMAIL1'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_EMAIL_ADDRESS'] . '</b> ' . 
+	if(!empty($fields['EMAIL1'])) {
+			$overlib_string .= '<b>'. $mod_strings['LBL_EMAIL_ADDRESS'] . '</b> ' . 
 								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
 								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
 								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL1']}&" .
 								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL1']}>") .
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL1']}</a><br>";
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
+	}
+	if(!empty($fields['EMAIL2'])) {
+			$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
 								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
 								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
 								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
 								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
+	}
 	
 	if(!empty($fields['DESCRIPTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['DESCRIPTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 	}	
 	
 	return array('fieldToAddTo' => 'FULL_NAME', 

modules/Documents/DocumentExternalApiDropDown.php

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry)
+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/PopupCampaignRoi.php

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/WizardEmailSetup.php

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

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/CampaignDiagnostic.php

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