adamjakab / SuiteCRM

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

modules/AOR_Conditions/conditionLines.php

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
             $html .= "</script>";
         }
 
-    }
-    else if($view == 'DetailView'){
+    } else if($view == 'DetailView'){
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='0' width='100%' id='conditionLines'></table>";
 

modules/EmailTemplates/PopupDocumentsCampaignTemplate.php

Braces +8 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,11 @@ 
 $form->assign('MODULE_NAME', $currentModule);
 $form->assign('NAME', $name);
 $form->assign('DOCUMENT_NAME', $document_name);
-if(isset($_REQUEST['target'])) $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
-else $form->assign('DOCUMENT_TARGET', '');
+if(isset($_REQUEST['target'])) {
+    $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
+} else {
+    $form->assign('DOCUMENT_TARGET', '');
+}
 
 $form->assign('DOCUMENT_REVISION_ID', $document_revision_id);
 

modules/EmailTemplates/AttachFiles.php

Braces +5 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.
@@ -47,8 +49,9 @@ 
 require_once('include/JSON.php');
 require_once('include/upload_file.php');
 
-if (!is_dir($cachedir = sugar_cached('images/')))
+if (!is_dir($cachedir = sugar_cached('images/'))) {
     mkdir_recursive($cachedir);
+}
 
 // cn: bug 11012 - fixed some MIME types not getting picked up.  Also changed array iterator.
 $imgType = array('image/gif', 'image/png', 'image/x-png', 'image/bmp', 'image/jpeg', 'image/jpg', 'image/pjpeg');

modules/EmailTemplates/EditView.php

Braces +45 added lines, -13 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');
+}
 
 require_once('modules/Campaigns/utils.php');
 
@@ -26,7 +28,9 @@ 
 
 
 //setting default flag value so due date and time not required
-if (!isset($focus->id)) $focus->date_due_flag = 1;
+if (!isset($focus->id)) {
+    $focus->date_due_flag = 1;
+}
 
 //needed when creating a new case with default values passed in
 if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) {
@@ -85,12 +89,16 @@ 
 $xtpl->parse("main.variable_option");
 
 $returnAction = 'index';
-if (isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if (isset($_REQUEST['return_module'])) {
+    $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
 if (isset($_REQUEST['return_action'])) {
     $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
     $returnAction = $_REQUEST['return_action'];
 }
-if (isset($_REQUEST['return_id'])) $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_id'])) {
+    $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 // handle Create $module then Cancel
 if (empty($_REQUEST['return_id'])) {
     $xtpl->assign("RETURN_ACTION", 'index');
@@ -119,8 +127,9 @@ 
 );
 $json = getJSONobj();
 $xtpl->assign('encoded_assigned_users_popup_request_data', $json->encode($popup_request_data));
-if (!empty($focus->assigned_user_name))
+if (!empty($focus->assigned_user_name)) {
     $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
+}
 
 $xtpl->assign("assign_user_select", SugarThemeRegistry::current()->getImage('id-ff-select', '', null, null, '.png', $mod_strings['LBL_SELECT']));
 $xtpl->assign("assign_user_clear", SugarThemeRegistry::current()->getImage('id-ff-clear', '', null, null, '.gif', $mod_strings['LBL_ID_FF_CLEAR']));
@@ -142,24 +151,39 @@ 
 $xtpl->assign("JSLANG", $jsLang);
 
 $xtpl->assign("ID", $focus->id);
-if (isset($focus->name)) $xtpl->assign("NAME", $focus->name); else $xtpl->assign("NAME", "");
+if (isset($focus->name)) {
+    $xtpl->assign("NAME", $focus->name);
+} else {
+    $xtpl->assign("NAME", "");
+}
 
 //Bug45632
 /* BEGIN - SECURITY GROUPS */
 /**
  * if(isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id); else $xtpl->assign("ASSIGNED_USER_ID", "");
  */
-if (isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
-else if (empty($focus->id) && empty($focus->assigned_user_id)) {
+if (isset($focus->assigned_user_id)) {
+    $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
+} else if (empty($focus->id) && empty($focus->assigned_user_id)) {
     global $current_user;
     $xtpl->assign("ASSIGNED_USER_ID", $current_user->id);
     $xtpl->assign("ASSIGNED_USER_NAME", get_assigned_user_name($current_user->id));
-} else $xtpl->assign("ASSIGNED_USER_ID", "");
+} else {
+    $xtpl->assign("ASSIGNED_USER_ID", "");
+}
 /* END - SECURITY GROUPS */
 //Bug45632
 
-if (isset($focus->description)) $xtpl->assign("DESCRIPTION", $focus->description); else $xtpl->assign("DESCRIPTION", "");
-if (isset($focus->subject)) $xtpl->assign("SUBJECT", $focus->subject); else $xtpl->assign("SUBJECT", "");
+if (isset($focus->description)) {
+    $xtpl->assign("DESCRIPTION", $focus->description);
+} else {
+    $xtpl->assign("DESCRIPTION", "");
+}
+if (isset($focus->subject)) {
+    $xtpl->assign("SUBJECT", $focus->subject);
+} else {
+    $xtpl->assign("SUBJECT", "");
+}
 if ($focus->published == 'on') {
     $xtpl->assign("PUBLISHED", "CHECKED");
 }
@@ -201,8 +225,16 @@ 
 $xtpl->assign("TYPE_OPTIONS", get_select_options_with_id($app_list_strings['record_type_display'], $focus->parent_type));
 //$xtpl->assign("DEFAULT_MODULE","Accounts");
 
-if (isset($focus->body)) $xtpl->assign("BODY", $focus->body); else $xtpl->assign("BODY", "");
-if (isset($focus->body_html)) $xtpl->assign("BODY_HTML", $focus->body_html); else $xtpl->assign("BODY_HTML", "");
+if (isset($focus->body)) {
+    $xtpl->assign("BODY", $focus->body);
+} else {
+    $xtpl->assign("BODY", "");
+}
+if (isset($focus->body_html)) {
+    $xtpl->assign("BODY_HTML", $focus->body_html);
+} else {
+    $xtpl->assign("BODY_HTML", "");
+}
 
 
 if (true) {

modules/EmailTemplates/CheckDeletable.php

Braces +6 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.
@@ -50,8 +52,9 @@ 
 
 $focus = new EmailTemplate();
 if($_REQUEST['from'] == 'DetailView') {
-	if(!isset($_REQUEST['record']))
-		sugar_die("A record number must be specified to delete the template.");
+	if(!isset($_REQUEST['record'])) {
+			sugar_die("A record number must be specified to delete the template.");
+	}
 	$focus->retrieve($_REQUEST['record']);
 	if(check_email_template_in_use($focus)) {
 		echo 'true';

modules/EmailTemplates/templateFields.php

Braces +9 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');
+}
 
 
 function generateFieldDefsJS2()
@@ -47,7 +49,9 @@ 
             $focus = new $beanList[$key];
             $loopControl[$key][$key] = $focus;
             $prefixes[$key] = strtolower($focus->object_name) . '_';
-            if ($focus->object_name == 'Case') $prefixes[$key] = 'a' . strtolower($focus->object_name) . '_';
+            if ($focus->object_name == 'Case') {
+                $prefixes[$key] = 'a' . strtolower($focus->object_name) . '_';
+            }
         }
     }
 
@@ -94,8 +98,9 @@ 
                         break;
                     }
                 }
-                if ($dup)
-                    $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                if ($dup) {
+                                    $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                }
             }
         }
     }

modules/FP_events/responseEntryPoint.php

Braces +18 added lines, -31 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');
+}
 
 	global $db;
 	 
@@ -29,16 +31,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-    		}
-    		else {
+    		} else {
     			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
     		}	
-    	}
-    	else if($response == 'decline'){
+    	} else if($response == 'decline'){
     		//check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
              $check = $db->getOne($check_q);
@@ -52,12 +51,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-    		}
-    		else {
+    		} else {
     			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
     		}
     	}
@@ -79,16 +76,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-            }
-            else {
+            } else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }   
-    	}
-    	else if($response == 'decline'){
+    	} else if($response == 'decline'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
              $check = $db->getOne($check_q);
@@ -101,12 +95,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-            }
-            else {
+            } else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }
     	}
@@ -127,16 +119,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-            }
-            else {
+            } else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }   
-    	}
-    	else if($response == 'decline'){
+    	} else if($response == 'decline'){
     		//check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
              $check = $db->getOne($check_q);
@@ -150,12 +139,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-            }
-            else {
+            } else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }
     	}