adamjakab / SuiteCRM

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

modules/Campaigns/WizardMarketingSave.php

Indentation +14 added lines, -14 removed lines

@@ -65,8 +65,8 @@ 
     }
         
 }else{
-     //default to just saving and exiting wizard
-     $master = 'save';   
+        //default to just saving and exiting wizard
+        $master = 'save';   
 }
 
 
@@ -90,17 +90,17 @@ 
 }
 
     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 ($_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;
+            }               
     }
 
 if(!empty($_REQUEST['meridiem'])){
@@ -108,9 +108,9 @@ 
 }
 
 if(empty($_REQUEST['time_start'])) {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' 00:00';	
+    $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' 00:00';	
 } else {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' ' . $_REQUEST['time_start'];
+    $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' ' . $_REQUEST['time_start'];
 }
 
 foreach($marketing->column_fields as $field)
@@ -180,8 +180,8 @@ 
     $_REQUEST['record'] =$marketing->campaign_id;
     $_POST['record']=$marketing->campaign_id;
     $_REQUEST['mode'] = $master;
-     $_POST['mode'] = $master; 
-     $_REQUEST['from_wiz']= 'true';
+        $_POST['mode'] = $master; 
+        $_REQUEST['from_wiz']= 'true';
     require_once('modules/Campaigns/QueueCampaign.php');
 }
 

Spacing +39 added lines, -39 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.
@@ -53,18 +53,18 @@ 
 $master = 'save';
 if (isset($_REQUEST['wiz_home_next_step']) && !empty($_REQUEST['wiz_home_next_step'])) {
     
-    if($_REQUEST['wiz_home_next_step']==3){
+    if ($_REQUEST['wiz_home_next_step'] == 3) {
         //user has chosen to save and schedule this campaign for email
         $master = 'send';
-    }elseif($_REQUEST['wiz_home_next_step']==2){
+    }elseif ($_REQUEST['wiz_home_next_step'] == 2) {
         //user has chosen to save and send this campaign in test mode
         $master = 'test';
-    }else{
+    } else {
         //user has chosen to simply save
-        $master  = 'save';        
+        $master = 'save';        
     }
         
-}else{
+} else {
      //default to just saving and exiting wizard
      $master = 'save';   
 }
@@ -78,11 +78,11 @@ 
     $marketing->retrieve($_REQUEST['record']);
 }
 else {
-    if(!empty($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId'])) {
+    if (!empty($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId'])) {
         $marketing->retrieve($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId']);
     }
 }
-if(!$marketing->ACLAccess('Save')){
+if (!$marketing->ACLAccess('Save')) {
         ACLController::displayNoAccess(true);
         sugar_cleanup(true);
 }
@@ -95,40 +95,40 @@ 
 }
 
     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 ($_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;
          }               
     }
 
-if(!empty($_REQUEST['meridiem'])){
-    $_REQUEST['time_start'] = $timedate->merge_time_meridiem($_REQUEST['time_start'],$timedate->get_time_format(), $_REQUEST['meridiem']);
+if (!empty($_REQUEST['meridiem'])) {
+    $_REQUEST['time_start'] = $timedate->merge_time_meridiem($_REQUEST['time_start'], $timedate->get_time_format(), $_REQUEST['meridiem']);
 }
 
-if(empty($_REQUEST['time_start'])) {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' 00:00';	
+if (empty($_REQUEST['time_start'])) {
+  $_REQUEST['date_start'] = $_REQUEST['date_start'].' 00:00';	
 } else {
-  $_REQUEST['date_start'] = $_REQUEST['date_start'] . ' ' . $_REQUEST['time_start'];
+  $_REQUEST['date_start'] = $_REQUEST['date_start'].' '.$_REQUEST['time_start'];
 }
 
-foreach($marketing->column_fields as $field)
+foreach ($marketing->column_fields as $field)
 {
     if ($field == 'all_prospect_lists') {
-        if(isset($_REQUEST[$field]) && $_REQUEST[$field]='on' )
+        if (isset($_REQUEST[$field]) && $_REQUEST[$field] = 'on')
         {
             $marketing->$field = 1;
         } else {
             $marketing->$field = 0;         
         }
-    }else {
-        if(isset($_REQUEST[$field]))
+    } else {
+        if (isset($_REQUEST[$field]))
         {
             $value = $_REQUEST[$field];
             $marketing->$field = trim($value);
@@ -136,9 +136,9 @@ 
     }
 }
 
-foreach($marketing->additional_column_fields as $field)
+foreach ($marketing->additional_column_fields as $field)
 {
-    if(isset($_REQUEST[$field]))
+    if (isset($_REQUEST[$field]))
     {
         $value = $_REQUEST[$field];
         $marketing->$field = $value;
@@ -150,8 +150,8 @@ 
 
 //add prospect lists to campaign.
 $marketing->load_relationship('prospectlists');
-$prospectlists=$marketing->prospectlists->get();
-if ($marketing->all_prospect_lists==1) {
+$prospectlists = $marketing->prospectlists->get();
+if ($marketing->all_prospect_lists == 1) {
     //remove all related prospect lists.
     if (!empty($prospectlists)) {
         $marketing->prospectlists->delete($marketing->id);
@@ -160,7 +160,7 @@ 
     if (isset($_REQUEST['message_for']) && is_array($_REQUEST['message_for'])) {
         foreach ($_REQUEST['message_for'] as $prospect_list_id) {
             
-            $key=array_search($prospect_list_id,$prospectlists);
+            $key = array_search($prospect_list_id, $prospectlists);
             if ($key === null or $key === false) {
                 $marketing->prospectlists->add($prospect_list_id);          
             } else {
@@ -169,7 +169,7 @@ 
         }
         if (count($prospectlists) != 0) {
             foreach ($prospectlists as $key=>$list_id) {
-                $marketing->prospectlists->delete($marketing->id,$list_id);             
+                $marketing->prospectlists->delete($marketing->id, $list_id);             
             }   
         }
     }
@@ -179,21 +179,21 @@ 
 $mass[] = $marketing->id; 
 //if sending an email was chosen, set all the needed variables for queuing campaign
 
-if($master !='save'){
-    $_REQUEST['mass']= $mass;
-    $_POST['mass']=$mass;
-    $_REQUEST['record'] =$marketing->campaign_id;
-    $_POST['record']=$marketing->campaign_id;
+if ($master != 'save') {
+    $_REQUEST['mass'] = $mass;
+    $_POST['mass'] = $mass;
+    $_REQUEST['record'] = $marketing->campaign_id;
+    $_POST['record'] = $marketing->campaign_id;
     $_REQUEST['mode'] = $master;
      $_POST['mode'] = $master; 
-     $_REQUEST['from_wiz']= 'true';
+     $_REQUEST['from_wiz'] = 'true';
     require_once('modules/Campaigns/QueueCampaign.php');
 }
 
-if(isset($_REQUEST['show_wizard_summary']) && $_REQUEST['show_wizard_summary']) {
+if (isset($_REQUEST['show_wizard_summary']) && $_REQUEST['show_wizard_summary']) {
 
-    if( (isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) ||
-        (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) ) {
+    if ((isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) ||
+        (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule'])) {
         // set correct post variables..
         $_POST['module'] = 'Campaigns';
         $_POST['action'] = 'QueueCampaign';
@@ -205,10 +205,10 @@ 
         $_POST['direct_step'] = '1';
         //$_POST['campaign_id'] = '';
         $_POST['wiz_mass'] = $marketing->id;
-        if(isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
+        if (isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
             $_POST['mode'] = 'test';
         }
-        else if(isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
+        else if (isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
             $_POST['mode'] = 'send';
             $_SESSION['msg'] = 'LBL_EMAILS_SCHEDULED';
         }
@@ -222,7 +222,7 @@ 
         exit;
     }
 
-    $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=" . $marketing->campaign_id . "&campaign_id=" . $marketing->campaign_id . "&jump=3&marketing_id=" . $marketing->id;
+    $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=".$marketing->campaign_id."&campaign_id=".$marketing->campaign_id."&jump=3&marketing_id=".$marketing->id;
 }
 else {
     $header_URL = "Location: index.php?action=WizardHome&module=Campaigns&record=".$marketing->campaign_id;

Braces +12 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.
@@ -56,15 +58,15 @@ 
     if($_REQUEST['wiz_home_next_step']==3){
         //user has chosen to save and schedule this campaign for email
         $master = 'send';
-    }elseif($_REQUEST['wiz_home_next_step']==2){
+    } elseif($_REQUEST['wiz_home_next_step']==2){
         //user has chosen to save and send this campaign in test mode
         $master = 'test';
-    }else{
+    } else{
         //user has chosen to simply save
         $master  = 'save';        
     }
         
-}else{
+} else{
      //default to just saving and exiting wizard
      $master = 'save';   
 }
@@ -76,8 +78,7 @@ 
 $marketing = new EmailMarketing();
 if (isset($_REQUEST['record']) && !empty($_REQUEST['record'])) {
     $marketing->retrieve($_REQUEST['record']);
-}
-else {
+} else {
     if(!empty($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId'])) {
         $marketing->retrieve($_SESSION['campaignWizard'][$_REQUEST['campaign_id']]['defaultSelectedMarketingId']);
     }
@@ -89,8 +90,7 @@ 
 
 if (!empty($_REQUEST['assigned_user_id']) && ($marketing->assigned_user_id != $_REQUEST['assigned_user_id']) && ($_POST['assigned_user_id'] != $current_user->id)) {
     $check_notify = TRUE;
-}
-else {
+} else {
     $check_notify = FALSE;
 }
 
@@ -127,7 +127,7 @@ 
         } else {
             $marketing->$field = 0;         
         }
-    }else {
+    } else {
         if(isset($_REQUEST[$field]))
         {
             $value = $_REQUEST[$field];
@@ -207,12 +207,10 @@ 
         $_POST['wiz_mass'] = $marketing->id;
         if(isset($_REQUEST['sendMarketingEmailTest']) && $_REQUEST['sendMarketingEmailTest']) {
             $_POST['mode'] = 'test';
-        }
-        else if(isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
+        } else if(isset($_REQUEST['sendMarketingEmailSchedule']) && $_REQUEST['sendMarketingEmailSchedule']) {
             $_POST['mode'] = 'send';
             $_SESSION['msg'] = 'LBL_EMAILS_SCHEDULED';
-        }
-        else {
+        } else {
             throw new Exception('request error');
         }
 
@@ -223,8 +221,7 @@ 
     }
 
     $header_URL = "Location: index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id=" . $marketing->campaign_id . "&campaign_id=" . $marketing->campaign_id . "&jump=3&marketing_id=" . $marketing->id;
-}
-else {
+} else {
     $header_URL = "Location: index.php?action=WizardHome&module=Campaigns&record=".$marketing->campaign_id;
 }
 

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

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

Indentation +12 added lines, -12 removed lines

@@ -46,19 +46,19 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['EmailTemplate'] = array ('column_fields' => Array("id"
-		, "date_entered"
-		, "date_modified"
-		, "modified_user_id"
-		, "created_by"
-		, "description"
-		, "subject"
-		, "body"
-		, "body_html"
-		, "name"
-		, "published"
-		),
+        , "date_entered"
+        , "date_modified"
+        , "modified_user_id"
+        , "created_by"
+        , "description"
+        , "subject"
+        , "body"
+        , "body_html"
+        , "name"
+        , "published"
+        ),
         'list_fields' =>  Array('id', 'name', 'description','date_modified'
-	),
+    ),
     'required_fields' => array("name"=>1),
 );
 ?>
\ No newline at end of file

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

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

Indentation +25 added lines, -25 removed lines

@@ -49,25 +49,25 @@ 
 
 class DocumentPopupPicker extends Popup_Picker {
 
-	public function __construct()
-	{
-	}
-
-	public function _get_where_clause() {
-		$where = '';
-		if(isset($_REQUEST['query']))
-		{
-			$where_clauses = array();
-			append_where_clause($where_clauses, "document_name", "documents.document_name");
-			append_where_clause($where_clauses, "category_id", "documents.category_id");
-			append_where_clause($where_clauses, "subcategory_id", "documents.subcategory_id");
-			append_where_clause($where_clauses, "template_type", "documents.template_type");
-			append_where_clause($where_clauses, "is_template", "documents.is_template");
-
-			$where = generate_where_statement($where_clauses);
-		}
-		return $where;
-	}
+    public function __construct()
+    {
+    }
+
+    public function _get_where_clause() {
+        $where = '';
+        if(isset($_REQUEST['query']))
+        {
+            $where_clauses = array();
+            append_where_clause($where_clauses, "document_name", "documents.document_name");
+            append_where_clause($where_clauses, "category_id", "documents.category_id");
+            append_where_clause($where_clauses, "subcategory_id", "documents.subcategory_id");
+            append_where_clause($where_clauses, "template_type", "documents.template_type");
+            append_where_clause($where_clauses, "is_template", "documents.is_template");
+
+            $where = generate_where_statement($where_clauses);
+        }
+        return $where;
+    }
 
 }
 
@@ -101,14 +101,14 @@ 
 $button  = "<form action='index.php' method='post' name='form' id='form'>\n";
 if(!$hide_clear_button)
 {
-	$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
-		.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
-		.$app_strings['LBL_CLEAR_BUTTON_LABEL']."  ' />\n";
+    $button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
+        .$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
+        .$app_strings['LBL_CLEAR_BUTTON_LABEL']."  ' />\n";
 }
 $button .= "<input type='submit' name='button' class='button' onclick=\"window.close();\" title='"
-	.$app_strings['LBL_CANCEL_BUTTON_TITLE']."' accesskey='"
-	.$app_strings['LBL_CANCEL_BUTTON_KEY']."' value='  "
-	.$app_strings['LBL_CANCEL_BUTTON_LABEL']."  ' />\n";
+    .$app_strings['LBL_CANCEL_BUTTON_TITLE']."' accesskey='"
+    .$app_strings['LBL_CANCEL_BUTTON_KEY']."' value='  "
+    .$app_strings['LBL_CANCEL_BUTTON_LABEL']."  ' />\n";
 $button .= "</form>\n";
 
 

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 @@ 
 
 	public function _get_where_clause() {
 		$where = '';
-		if(isset($_REQUEST['query']))
+		if (isset($_REQUEST['query']))
 		{
 			$where_clauses = array();
 			append_where_clause($where_clauses, "document_name", "documents.document_name");
@@ -98,8 +98,8 @@ 
 
 
 $hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
-$button  = "<form action='index.php' method='post' name='form' id='form'>\n";
-if(!$hide_clear_button)
+$button = "<form action='index.php' method='post' name='form' id='form'>\n";
+if (!$hide_clear_button)
 {
 	$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
 		.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
@@ -119,7 +119,7 @@ 
 $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']);
+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

Indentation +24 added lines, -24 removed lines

@@ -38,10 +38,10 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- //Request object must have these property values:
- //		Module: module name, this module should have a file called TreeData.php
- //		Function: name of the function to be called in TreeData.php, the function will be called statically.
- //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
+    //Request object must have these property values:
+    //		Module: module name, this module should have a file called TreeData.php
+    //		Function: name of the function to be called in TreeData.php, the function will be called statically.
+    //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
 
 
 require_once('include/JSON.php');
@@ -56,27 +56,27 @@ 
 $ret = array();
 
 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()) {
-		    $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
-		    $guid = create_guid();
-		    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)) {
-		            $ret[] = $dest;
-		        }
-		        // remove temp file
-		        unlink($path);
-		    }
-		}
-	}
+    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()) {
+            $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
+            $guid = create_guid();
+            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)) {
+                    $ret[] = $dest;
+                }
+                // remove temp file
+                unlink($path);
+            }
+        }
+    }
 }
 
 if (!empty($ret)) {
-	$json = getJSONobj();
-	echo $json->encode($ret);
-	//return the parameters
+    $json = getJSONobj();
+    echo $json->encode($ret);
+    //return the parameters
 }

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

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

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

Braces +42 added lines, -12 removed lines

@@ -68,7 +68,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)) {
@@ -130,12 +132,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');
@@ -164,8 +170,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']));
@@ -187,23 +194,38 @@ 
 $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)) {
     $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");
 }
@@ -244,8 +266,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", "");
+}
 
 
 // ---------------------------------

modules/EmailTemplates/CheckDeletable.php

Indentation +27 added lines, -27 removed lines

@@ -50,38 +50,38 @@
 
 $focus = new EmailTemplate();
 if($_REQUEST['from'] == 'DetailView') {
-	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';
-		return;
-	}
-	echo 'false';
+    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';
+        return;
+    }
+    echo 'false';
 } else if($_REQUEST['from'] == 'ListView') {
-	$returnString = '';
-	$idArray = explode(',', $_REQUEST['records']);
-	foreach($idArray as $key => $value) {
-		if($focus->retrieve($value)) {
-			if(check_email_template_in_use($focus)) {
-				$returnString .= $focus->name . ',';
-			}
-		}
-	}
-	$returnString = substr($returnString, 0, -1);
-	echo $returnString;
+    $returnString = '';
+    $idArray = explode(',', $_REQUEST['records']);
+    foreach($idArray as $key => $value) {
+        if($focus->retrieve($value)) {
+            if(check_email_template_in_use($focus)) {
+                $returnString .= $focus->name . ',';
+            }
+        }
+    }
+    $returnString = substr($returnString, 0, -1);
+    echo $returnString;
 } else {
-	echo '';
+    echo '';
 }
 
 function check_email_template_in_use($focus)
 {
-	if($focus->is_used_by_email_marketing()) {
-		return true;
-	}
-	$system = $GLOBALS['sugar_config']['passwordsetting'];
-	if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
-	    return true;
-	}
+    if($focus->is_used_by_email_marketing()) {
+        return true;
+    }
+    $system = $GLOBALS['sugar_config']['passwordsetting'];
+    if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
+        return true;
+    }
     return false;
 }

Spacing +11 added lines, -11 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.
@@ -49,22 +49,22 @@ 
 require_once('modules/EmailTemplates/EmailTemplate.php');
 
 $focus = new EmailTemplate();
-if($_REQUEST['from'] == 'DetailView') {
-	if(!isset($_REQUEST['record']))
+if ($_REQUEST['from'] == 'DetailView') {
+	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)) {
+	if (check_email_template_in_use($focus)) {
 		echo 'true';
 		return;
 	}
 	echo 'false';
-} else if($_REQUEST['from'] == 'ListView') {
+} else if ($_REQUEST['from'] == 'ListView') {
 	$returnString = '';
 	$idArray = explode(',', $_REQUEST['records']);
-	foreach($idArray as $key => $value) {
-		if($focus->retrieve($value)) {
-			if(check_email_template_in_use($focus)) {
-				$returnString .= $focus->name . ',';
+	foreach ($idArray as $key => $value) {
+		if ($focus->retrieve($value)) {
+			if (check_email_template_in_use($focus)) {
+				$returnString .= $focus->name.',';
 			}
 		}
 	}
@@ -76,11 +76,11 @@ 
 
 function check_email_template_in_use($focus)
 {
-	if($focus->is_used_by_email_marketing()) {
+	if ($focus->is_used_by_email_marketing()) {
 		return true;
 	}
 	$system = $GLOBALS['sugar_config']['passwordsetting'];
-	if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
+	if ($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
 	    return true;
 	}
     return false;

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

Spacing +8 added lines, -8 removed lines

@@ -46,8 +46,8 @@ 
             require_once($beanFiles[$beanList[$key]]);
             $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) . '_';
+            $prefixes[$key] = strtolower($focus->object_name).'_';
+            if ($focus->object_name == 'Case') $prefixes[$key] = 'a'.strtolower($focus->object_name).'_';
         }
     }
 
@@ -125,16 +125,16 @@ 
         if (isset($beanList[$key]) && isset($beanFiles[$beanList[$key]]) && !str_begin($key, 'AOW_') && !str_begin($key, 'zr2_')) {
 
             if ($key == 'Contacts') {
-                $dropdown .= "<option value='" . $key . "'>
-						" . $lblContactAndOthers . "
+                $dropdown .= "<option value='".$key."'>
+						" . $lblContactAndOthers."
 		  	       </option>";
             } else if (isset($app_list_strings['moduleListSingular'][$key])) {
-                $dropdown .= "<option value='" . $key . "'>
-						" . $app_list_strings['moduleListSingular'][$key] . "
+                $dropdown .= "<option value='".$key."'>
+						" . $app_list_strings['moduleListSingular'][$key]."
 		  	       </option>";
             } else {
-                $dropdown .= "<option value='" . $key . "'>
-						" . $app_list_strings['moduleList'][$key] . "
+                $dropdown .= "<option value='".$key."'>
+						" . $app_list_strings['moduleList'][$key]."
 		  	       </option>";
             }
         }

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