adamjakab / SuiteCRM

modules/Campaigns/WizardEmailSetup.php

Spacing +24 added lines, -24 removed lines

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

modules/Campaigns/ProcessBouncedEmails.php

Spacing +34 added lines, -34 removed lines

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

modules/Campaigns/WebToLeadFormSave.php

Spacing +12 added lines, -12 removed lines

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

modules/Campaigns/CampaignDiagnostic.php

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

modules/AOR_Conditions/vardefs.php

Spacing +13 added lines, -13 removed lines

@@ -26,9 +26,9 @@ 
 	'table'=>'aor_conditions',
 	'audited'=>false,
 	'duplicate_merge'=>true,
-	'fields'=>array (
+	'fields'=>array(
   'aor_report_id' =>
-  array (
+  array(
     'required' => false,
     'name' => 'aor_report_id',
     'vname' => 'LBL_AOR_REPORT_ID',
@@ -47,7 +47,7 @@ 
     'size' => '20',
   ),
   'condition_order' => 
-  array (
+  array(
     'required' => false,
     'name' => 'condition_order',
     'vname' => 'LBL_ORDER',
@@ -79,14 +79,14 @@ 
             'type' => 'varchar',
         ),
   'module_path' =>
-  array (
+  array(
     'name' => 'module_path',
     'type' => 'longtext',
     'vname' => 'LBL_MODULE_PATH',
     'isnull' => true,
   ),
   'field' => 
-  array (
+  array(
     'required' => false,
     'name' => 'field',
     'vname' => 'LBL_FIELD',
@@ -108,7 +108,7 @@ 
     'dependency' => false,
   ),
   'operator' => 
-  array (
+  array(
     'required' => false,
     'name' => 'operator',
     'vname' => 'LBL_OPERATOR',
@@ -131,7 +131,7 @@ 
     'dependency' => false,
   ),
     'value_type' =>
-    array (
+    array(
     'required' => false,
     'name' => 'value_type',
     'vname' => 'LBL_VALUE_TYPE',
@@ -150,7 +150,7 @@ 
     'size' => '20',
     ),
   'value' => 
-  array (
+  array(
     'required' => false,
     'name' => 'value',
     'vname' => 'LBL_VALUE',
@@ -169,7 +169,7 @@ 
     'size' => '20',
   ),
         'parameter' =>
-            array (
+            array(
                 'required' => false,
                 'name' => 'parameter',
                 'vname' => 'LBL_PARAMETER',
@@ -187,7 +187,7 @@ 
                 'studio' => 'visible',
             ),
   'aor_reports' =>
-  array (
+  array(
     'name' => 'aor_reports',
     'type' => 'link',
     'relationship' => 'aor_report_aor_conditions',
@@ -196,7 +196,7 @@ 
     'source'=>'non-db',
   ),
 ),
-	'relationships'=>array (
+	'relationships'=>array(
 ),
     'indices' => array(
         array(
@@ -209,7 +209,7 @@ 
 	'unified_search'=>true,
 );
 
-if (!class_exists('VardefManager')){
+if (!class_exists('VardefManager')) {
         require_once('include/SugarObjects/VardefManager.php');
 }
-VardefManager::createVardef('AOR_Conditions','AOR_Condition', array('basic'));
+VardefManager::createVardef('AOR_Conditions', 'AOR_Condition', array('basic'));

modules/AOR_Conditions/conditionLines.php

Spacing +11 added lines, -11 removed lines

@@ -23,19 +23,19 @@ 
  */
 
 
-function display_condition_lines($focus, $field, $value, $view){
+function display_condition_lines($focus, $field, $value, $view) {
 
     global $locale, $app_list_strings, $mod_strings;
 
     $html = '';
 
-    if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
+    if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
         require_once ('include/language/jsLanguage.php');
         jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
     }
-    $html .= '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
+    $html .= '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
 
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='4' width='100%' id='conditionLines'></table>";
@@ -45,12 +45,12 @@ 
         $html .= "</div>";
 
 
-        if(isset($focus->report_module) && $focus->report_module != ''){
+        if (isset($focus->report_module) && $focus->report_module != '') {
             require_once("modules/AOW_WorkFlow/aow_utils.php");
             $html .= "<script>";
             $html .= "report_module = \"".$focus->report_module."\";";
             $html .= "document.getElementById('btn_ConditionLine').disabled = '';";
-            if($focus->id != ''){
+            if ($focus->id != '') {
                 $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$focus->id."' AND deleted = 0 ORDER BY condition_order ASC";
                 $result = $focus->db->query($sql);
 
@@ -58,8 +58,8 @@ 
                     $condition_name = new AOR_Condition();
                     $condition_name->retrieve($row['id']);
                     $condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
-                    $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module,$condition_name->module_path[0]))))."\";";
-                    if($condition_name->value_type == 'Date'){
+                    $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module, $condition_name->module_path[0]))))."\";";
+                    if ($condition_name->value_type == 'Date') {
                         $condition_name->value = unserialize(base64_decode($condition_name->value));
                     }
                     $condition_item = json_encode($condition_name->toArray());
@@ -71,12 +71,12 @@ 
         }
 
     }
-    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>";
 
 
-        if(isset($focus->report_module) && $focus->report_module != ''){
+        if (isset($focus->report_module) && $focus->report_module != '') {
             require_once("modules/AOW_WorkFlow/aow_utils.php");
             $html .= "<script>";
             $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields($focus->report_module)))."\";";
@@ -88,7 +88,7 @@ 
                 $condition_name = new AOR_Condition();
                 $condition_name->retrieve($row['id']);
                 $condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
-                if($condition_name->value_type == 'Date'){
+                if ($condition_name->value_type == 'Date') {
                     $condition_name->value = unserialize(base64_decode($condition_name->value));
                 }
                 $condition_item = json_encode($condition_name->toArray());

modules/EmailTemplates/field_arrays.php

Spacing +3 added lines, -3 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.
@@ -45,7 +45,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-$fields_array['EmailTemplate'] = array ('column_fields' => Array("id"
+$fields_array['EmailTemplate'] = array('column_fields' => Array("id"
 		, "date_entered"
 		, "date_modified"
 		, "modified_user_id"
@@ -57,7 +57,7 @@ 
 		, "name"
 		, "published"
 		),
-        'list_fields' =>  Array('id', 'name', 'description','date_modified'
+        'list_fields' =>  Array('id', 'name', 'description', 'date_modified'
 	),
     'required_fields' => array("name"=>1),
 );

modules/EmailTemplates/AttachFiles.php

Spacing +6 added lines, -6 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,17 +55,17 @@ 
 
 $ret = array();
 
-foreach($_FILES as $k => $file) {
-	if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
+foreach ($_FILES as $k => $file) {
+	if (in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
 	    $upload_file = new UploadFile($k);
 		// check the file
-		if($upload_file->confirm_upload()) {
+		if ($upload_file->confirm_upload()) {
 		    $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
 		    $guid = create_guid();
-		    if($upload_file->final_move($guid)) { // move to uploads
+		    if ($upload_file->final_move($guid)) { // move to uploads
 		        $path = $upload_file->get_upload_path($guid);
 		        // if file is OK, copy to cache
-		        if(verify_uploaded_image($path) && copy($path, $dest)) {
+		        if (verify_uploaded_image($path) && copy($path, $dest)) {
 		            $ret[] = $dest;
 		        }
 		        // remove temp file

modules/EmailTemplates/EditView.php

Spacing +15 added lines, -15 removed lines

@@ -74,9 +74,9 @@ 
 $GLOBALS['log']->info("EmailTemplate detail view");
 
 if ($has_campaign || $inboundEmail) {
-    $xtpl = new XTemplate ('modules/EmailTemplates/EditView.html');
+    $xtpl = new XTemplate('modules/EmailTemplates/EditView.html');
 } else {
-    $xtpl = new XTemplate ('modules/EmailTemplates/EditViewMain.html');
+    $xtpl = new XTemplate('modules/EmailTemplates/EditViewMain.html');
 } // else
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
@@ -128,13 +128,13 @@ 
 require_once('include/QuickSearchDefaults.php');
 $qsd = QuickSearchDefaults::getQuickSearchDefaults();
 $sqs_objects = array('EditView_assigned_user_name' => $qsd->getQSUser());
-$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '; enableQS();</script>';
+$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'; enableQS();</script>';
 
 $xtpl->assign("CANCEL_SCRIPT", $cancel_script);
-$xtpl->assign("PRINT_URL", "index.php?" . $GLOBALS['request_string']);
-$xtpl->assign("JAVASCRIPT", get_set_focus_js() . $quicksearch_js);
+$xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
+$xtpl->assign("JAVASCRIPT", get_set_focus_js().$quicksearch_js);
 
-if (!is_file(sugar_cached('jsLanguage/') . $GLOBALS['current_language'] . '.js')) {
+if (!is_file(sugar_cached('jsLanguage/').$GLOBALS['current_language'].'.js')) {
     require_once('include/language/jsLanguage.php');
     jsLanguage::createAppStringsCache($GLOBALS['current_language']);
 }
@@ -183,18 +183,18 @@ 
         $record = $_REQUEST['record'];
     }
 
-    $xtpl->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=" . $_REQUEST['action'] . "&from_module=" . $_REQUEST['module'] . "&record=" . $record . "'>" . SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT']) . "</a>");
+    $xtpl->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action']."&from_module=".$_REQUEST['module']."&record=".$record."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT'])."</a>");
 
 }
 if (isset($focus->parent_type) && $focus->parent_type != "") {
-    $change_parent_button = "<input title='" . $app_strings['LBL_SELECT_BUTTON_TITLE'] . "'
-tabindex='3' type='button' class='button' value='" . $app_strings['LBL_SELECT_BUTTON_LABEL'] . "' name='button' LANGUAGE=javascript onclick='return
+    $change_parent_button = "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']."'
+tabindex='3' type='button' class='button' value='" . $app_strings['LBL_SELECT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return
 window.open(\"index.php?module=\"+ document.EditView.parent_type.value +
 \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
     $xtpl->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 if ($focus->parent_type == "Account") {
-    $xtpl->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=" . urlencode($focus->parent_name));
+    $xtpl->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name));
 }
 
 $xtpl->assign("DESCRIPTION", $focus->description);
@@ -251,7 +251,7 @@ 
     // If it's campaign then hide the Account.
     if ($has_campaign) {
         $dropdown = "<option value='Contacts'>
-						" . $lblContactAndOthers . "
+						" . $lblContactAndOthers."
 			       </option>";
         $xtpl->assign("DROPDOWN", $dropdown);
         $xtpl->assign("DEFAULT_MODULE", 'Contacts');
@@ -285,13 +285,13 @@ 
             if (empty($the_note->filename)) {
                 continue;
             }
-            $secureLink = 'index.php?entryPoint=download&id=' . $the_note->id . '&type=Notes';
-            $attachments .= '<input type="checkbox" name="remove_attachment[]" value="' . $the_note->id . '"> ' . $app_strings['LNK_REMOVE'] . '&nbsp;&nbsp;';
-            $attachments .= '<a href="' . $secureLink . '" target="_blank">' . $the_note->filename . '</a><br>';
+            $secureLink = 'index.php?entryPoint=download&id='.$the_note->id.'&type=Notes';
+            $attachments .= '<input type="checkbox" name="remove_attachment[]" value="'.$the_note->id.'"> '.$app_strings['LNK_REMOVE'].'&nbsp;&nbsp;';
+            $attachments .= '<a href="'.$secureLink.'" target="_blank">'.$the_note->filename.'</a><br>';
         }
     }
     $attJs = '<script type="text/javascript">';
-    $attJs .= 'var lnk_remove = "' . $app_strings['LNK_REMOVE'] . '";';
+    $attJs .= 'var lnk_remove = "'.$app_strings['LNK_REMOVE'].'";';
     $attJs .= '</script>';
     $xtpl->assign('ATTACHMENTS', $attachments);
     $xtpl->assign('ATTACHMENTS_JAVASCRIPT', $attJs);