adamjakab / SuiteCRM

modules/Campaigns/WebToLeadFormSave.php

Indentation +14 added lines, -14 removed lines

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

Spacing +12 added lines, -12 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

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 +32 added lines, -32 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';   
 }
@@ -77,7 +77,7 @@ 
 if (isset($_REQUEST['record']) && !empty($_REQUEST['record'])) {
     $marketing->retrieve($_REQUEST['record']);
 }
-if(!$marketing->ACLAccess('Save')){
+if (!$marketing->ACLAccess('Save')) {
         ACLController::displayNoAccess(true);
         sugar_cleanup(true);
 }
@@ -90,40 +90,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);
@@ -131,9 +131,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;
@@ -145,8 +145,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);
@@ -155,7 +155,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 {
@@ -164,7 +164,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);             
             }   
         }
     }
@@ -174,14 +174,14 @@ 
 $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');
 }
 

Braces +8 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -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';   
 }
@@ -84,8 +86,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;
 }
 
@@ -122,7 +123,7 @@ 
         } else {
             $marketing->$field = 0;         
         }
-    }else {
+    } else {
         if(isset($_REQUEST[$field]))
         {
             $value = $_REQUEST[$field];

modules/AOR_Conditions/vardefs.php

Indentation +28 added lines, -28 removed lines

@@ -23,12 +23,12 @@ 
  */
 
 $dictionary['AOR_Condition'] = array(
-	'table'=>'aor_conditions',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-  'aor_report_id' =>
-  array (
+    'table'=>'aor_conditions',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+    'aor_report_id' =>
+    array (
     'required' => false,
     'name' => 'aor_report_id',
     'vname' => 'LBL_AOR_REPORT_ID',
@@ -45,9 +45,9 @@ 
     'merge_filter' => 'disabled',
     'len' => 36,
     'size' => '20',
-  ),
-  'condition_order' => 
-  array (
+    ),
+    'condition_order' => 
+    array (
     'required' => false,
     'name' => 'condition_order',
     'vname' => 'LBL_ORDER',
@@ -66,7 +66,7 @@ 
     'size' => '20',
     'enable_range_search' => false,
     'disable_num_format' => '',
-  ),
+    ),
         'logic_op' => array(
             'name' => 'logic_op',
             'vname' => 'LBL_LOGIC_OP',
@@ -78,15 +78,15 @@ 
             'vname' => 'LBL_PARENTHESIS',
             'type' => 'varchar',
         ),
-  'module_path' =>
-  array (
+    'module_path' =>
+    array (
     'name' => 'module_path',
     'type' => 'longtext',
     'vname' => 'LBL_MODULE_PATH',
     'isnull' => true,
-  ),
-  'field' => 
-  array (
+    ),
+    'field' => 
+    array (
     'required' => false,
     'name' => 'field',
     'vname' => 'LBL_FIELD',
@@ -106,9 +106,9 @@ 
     'options' => 'user_type_dom',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'operator' => 
-  array (
+    ),
+    'operator' => 
+    array (
     'required' => false,
     'name' => 'operator',
     'vname' => 'LBL_OPERATOR',
@@ -129,7 +129,7 @@ 
     'options' => 'aor_operator_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
+    ),
     'value_type' =>
     array (
     'required' => false,
@@ -149,8 +149,8 @@ 
     'len' => '255',
     'size' => '20',
     ),
-  'value' => 
-  array (
+    'value' => 
+    array (
     'required' => false,
     'name' => 'value',
     'vname' => 'LBL_VALUE',
@@ -167,7 +167,7 @@ 
     'merge_filter' => 'disabled',
     'len' => '255',
     'size' => '20',
-  ),
+    ),
         'parameter' =>
             array (
                 'required' => false,
@@ -186,17 +186,17 @@ 
                 'merge_filter' => 'disabled',
                 'studio' => 'visible',
             ),
-  'aor_reports' =>
-  array (
+    'aor_reports' =>
+    array (
     'name' => 'aor_reports',
     'type' => 'link',
     'relationship' => 'aor_report_aor_conditions',
     'module'=>'AOR_Reports',
     'bean_name'=>'AOR_Reports',
     'source'=>'non-db',
-  ),
+    ),
 ),
-	'relationships'=>array (
+    'relationships'=>array (
 ),
     'indices' => array(
         array(
@@ -205,8 +205,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){

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

Spacing +21 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
 	var $table_name = 'aor_conditions';
     var $tracker_visibility = false;
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 	
 	var $id;
 	var $name;
@@ -52,11 +52,11 @@ 
 	var $operator;
 	var $value;
 	
-	function AOR_Condition(){
+	function AOR_Condition() {
 		parent::Basic();
 	}
 
-    function save_lines($post_data, $parent, $key = ''){
+    function save_lines($post_data, $parent, $key = '') {
 
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 
@@ -64,57 +64,57 @@ 
         $j = 0;
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if($post_data[$key.'deleted'][$i] == 1){
+            if ($post_data[$key.'deleted'][$i] == 1) {
                 $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $condition = new AOR_Condition();
-                foreach($this->field_defs as $field_def) {
-                    if(isset($post_data[$key.$field_def['name']][$i])){
-                        if(is_array($post_data[$key.$field_def['name']][$i])){
+                foreach ($this->field_defs as $field_def) {
+                    if (isset($post_data[$key.$field_def['name']][$i])) {
+                        if (is_array($post_data[$key.$field_def['name']][$i])) {
 
-                                switch($condition->value_type) {
+                                switch ($condition->value_type) {
                                     case 'Date':
                                         $post_data[$key.$field_def['name']][$i] = base64_encode(serialize($post_data[$key.$field_def['name']][$i]));
                                     default:
                                         $post_data[$key.$field_def['name']][$i] = encodeMultienumValue($post_data[$key.$field_def['name']][$i]);
                                 }
-                        } else if($field_def['name'] == 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
+                        } else if ($field_def['name'] == 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
                             $post_data[$key.$field_def['name']][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key.$field_def['name']][$i]);
-                        }else if($field_def['name'] == 'parameter'){
+                        } else if ($field_def['name'] == 'parameter') {
                             $post_data[$key.$field_def['name']][$i] = isset($post_data[$key.$field_def['name']][$i]);
-                        }else if($field_def['name'] == 'module_path'){
-                            $post_data[$key.$field_def['name']][$i] = base64_encode(serialize(explode(":",$post_data[$key.$field_def['name']][$i])));
+                        } else if ($field_def['name'] == 'module_path') {
+                            $post_data[$key.$field_def['name']][$i] = base64_encode(serialize(explode(":", $post_data[$key.$field_def['name']][$i])));
                         }
-                        if($field_def['name'] == 'parenthesis' && $post_data[$key.$field_def['name']][$i] == 'END') {
-                            if(!isset($lastParenthesisStartConditionId)) {
+                        if ($field_def['name'] == 'parenthesis' && $post_data[$key.$field_def['name']][$i] == 'END') {
+                            if (!isset($lastParenthesisStartConditionId)) {
                                 throw new Exception('a closure parenthesis has no starter pair');
                             }
                             $condition->parenthesis = $lastParenthesisStartConditionId;
                         }
                         else {
-                            $condition->$field_def['name'] = $post_data[$key . $field_def['name']][$i];
+                            $condition->$field_def['name'] = $post_data[$key.$field_def['name']][$i];
                         }
-                    }else if($field_def['name'] == 'parameter'){
+                    } else if ($field_def['name'] == 'parameter') {
                         $condition->$field_def['name'] = 0;
                     }
 
                 }
                 // Period must be saved as a string instead of a base64 encoded datetime.
                 // Overwriting value
-                if((!isset($condition->parenthesis) || !$condition->parenthesis) && isset($condition->value_type) && $condition->value_type == 'Period') {
+                if ((!isset($condition->parenthesis) || !$condition->parenthesis) && isset($condition->value_type) && $condition->value_type == 'Period') {
                     $condition->value = base64_encode($_POST['aor_conditions_value'][$i]);
 //                    $condition->value = $_POST['aor_conditions_value'][$i];
                 }
-                if(trim($condition->field) != '' || $condition->parenthesis){
-                    if(isset($_POST['aor_conditions_order'][$i])) {
-                        $condition->condition_order = (int) $_POST['aor_conditions_order'][$i];
+                if (trim($condition->field) != '' || $condition->parenthesis) {
+                    if (isset($_POST['aor_conditions_order'][$i])) {
+                        $condition->condition_order = (int)$_POST['aor_conditions_order'][$i];
                     }
                     else {
                         $condition->condition_order = ++$j;
                     }
                     $condition->aor_report_id = $parent->id;
                     $conditionId = $condition->save();
-                    if($condition->parenthesis=='START') {
+                    if ($condition->parenthesis == 'START') {
                         $lastParenthesisStartConditionId = $conditionId;
                     }
                 }

Braces +5 added lines, -7 removed lines

@@ -80,9 +80,9 @@ 
                                 }
                         } else if($field_def['name'] == 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
                             $post_data[$key.$field_def['name']][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key.$field_def['name']][$i]);
-                        }else if($field_def['name'] == 'parameter'){
+                        } else if($field_def['name'] == 'parameter'){
                             $post_data[$key.$field_def['name']][$i] = isset($post_data[$key.$field_def['name']][$i]);
-                        }else if($field_def['name'] == 'module_path'){
+                        } else if($field_def['name'] == 'module_path'){
                             $post_data[$key.$field_def['name']][$i] = base64_encode(serialize(explode(":",$post_data[$key.$field_def['name']][$i])));
                         }
                         if($field_def['name'] == 'parenthesis' && $post_data[$key.$field_def['name']][$i] == 'END') {
@@ -90,11 +90,10 @@ 
                                 throw new Exception('a closure parenthesis has no starter pair');
                             }
                             $condition->parenthesis = $lastParenthesisStartConditionId;
-                        }
-                        else {
+                        } else {
                             $condition->$field_def['name'] = $post_data[$key . $field_def['name']][$i];
                         }
-                    }else if($field_def['name'] == 'parameter'){
+                    } else if($field_def['name'] == 'parameter'){
                         $condition->$field_def['name'] = 0;
                     }
 
@@ -108,8 +107,7 @@ 
                 if(trim($condition->field) != '' || $condition->parenthesis){
                     if(isset($_POST['aor_conditions_order'][$i])) {
                         $condition->condition_order = (int) $_POST['aor_conditions_order'][$i];
-                    }
-                    else {
+                    } else {
                         $condition->condition_order = ++$j;
                     }
                     $condition->aor_report_id = $parent->id;

Indentation +26 added lines, -26 removed lines

@@ -24,37 +24,37 @@
 
 
 class AOR_Condition extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'AOR_Conditions';
-	var $object_name = 'AOR_Condition';
-	var $table_name = 'aor_conditions';
+    var $new_schema = true;
+    var $module_dir = 'AOR_Conditions';
+    var $object_name = 'AOR_Condition';
+    var $table_name = 'aor_conditions';
     var $tracker_visibility = false;
-	var $importable = true;
-	var $disable_row_level_security = true ;
+    var $importable = true;
+    var $disable_row_level_security = true ;
 	
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
-	var $aor_report_id;
-	var $condition_order;
-	var $field;
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
+    var $aor_report_id;
+    var $condition_order;
+    var $field;
     var $logic_op;
     var $parenthesis;
-	var $operator;
-	var $value;
+    var $operator;
+    var $value;
 	
-	function AOR_Condition(){
-		parent::Basic();
-	}
+    function AOR_Condition(){
+        parent::Basic();
+    }
 
     function save_lines($post_data, $parent, $key = ''){
 

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
 		parent::Basic();
 	}
 
+    /**
+     * @param AOR_Report $parent
+     */
     function save_lines($post_data, $parent, $key = ''){
 
         require_once('modules/AOW_WorkFlow/aow_utils.php');

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

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author SalesAgility <info@salesagility.com>
- */
+         * Advanced OpenReports, SugarCRM Reporting.
+         * @package Advanced OpenReports for SugarCRM
+         * @copyright SalesAgility Ltd http://www.salesagility.com
+         *
+         * This program is free software; you can redistribute it and/or modify
+         * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+         * the Free Software Foundation; either version 3 of the License, or
+         * (at your option) any later version.
+         *
+         * This program is distributed in the hope that it will be useful,
+         * but WITHOUT ANY WARRANTY; without even the implied warranty of
+         * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+         * GNU General Public License for more details.
+         *
+         * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+         * along with this program; if not, see http://www.gnu.org/licenses
+         * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+         * Fifth Floor, Boston, MA 02110-1301  USA
+         *
+         * @author SalesAgility <info@salesagility.com>
+         */
 
 
 function display_field_lines($focus, $field, $value, $view){

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

Indentation +6 added lines, -6 removed lines

@@ -76,14 +76,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 +4 added lines, -4 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.
@@ -73,8 +73,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='  "
@@ -94,7 +94,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);

Braces +8 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -94,8 +96,11 @@ 
 $form->assign('MODULE_NAME', $currentModule);
 $form->assign('NAME', $name);
 $form->assign('DOCUMENT_NAME', $document_name);
-if(isset($_REQUEST['target'])) $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
-else $form->assign('DOCUMENT_TARGET', '');
+if(isset($_REQUEST['target'])) {
+    $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
+} else {
+    $form->assign('DOCUMENT_TARGET', '');
+}
 
 $form->assign('DOCUMENT_REVISION_ID', $document_revision_id);
 

modules/EmailTemplates/EmailTemplateFormBase.php

Indentation +233 added lines, -233 removed lines

@@ -54,24 +54,24 @@ 
 
     }
 
-	function getFormBody($prefix, $mod='',$formname='', $size='30') {
+    function getFormBody($prefix, $mod='',$formname='', $size='30') {
 
 
-		global $mod_strings;
+        global $mod_strings;
 
-		$temp_strings = $mod_strings;
+        $temp_strings = $mod_strings;
 
-		if(!empty($mod)) {
-			global $current_language;
-			$mod_strings = return_module_language($current_language, $mod);
-		}
-					global $app_strings;
-					global $app_list_strings;
+        if(!empty($mod)) {
+            global $current_language;
+            $mod_strings = return_module_language($current_language, $mod);
+        }
+                    global $app_strings;
+                    global $app_list_strings;
 
-				$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
-				$lbl_subject = $mod_strings['LBL_NOTE_SUBJECT'];
-				$lbl_description = $mod_strings['LBL_NOTE'];
-				$default_parent_type= $app_list_strings['record_type_default_key'];
+                $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
+                $lbl_subject = $mod_strings['LBL_NOTE_SUBJECT'];
+                $lbl_description = $mod_strings['LBL_NOTE'];
+                $default_parent_type= $app_list_strings['record_type_default_key'];
 
 $form = <<<EOF
 				<input type="hidden" name="${prefix}record" value="">
@@ -93,105 +93,105 @@ 
 				</table></p>
 EOF;
 
-	$javascript = new javascript();
-	$javascript->setFormName($formname);
-	$javascript->setSugarBean(new EmailTemplate());
-	$javascript->addRequiredFields($prefix);
-	$form .=$javascript->getScript();
-	$mod_strings = $temp_strings;
-	return $form;
-	}
-
-	function getForm($prefix, $mod='') {
-		if(!empty($mod)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
-		global $app_strings;
-		global $app_list_strings;
-
-		$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
-		$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
-		$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
-
-
-		$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
+    $javascript = new javascript();
+    $javascript->setFormName($formname);
+    $javascript->setSugarBean(new EmailTemplate());
+    $javascript->addRequiredFields($prefix);
+    $form .=$javascript->getScript();
+    $mod_strings = $temp_strings;
+    return $form;
+    }
+
+    function getForm($prefix, $mod='') {
+        if(!empty($mod)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, $mod);
+    }else global $mod_strings;
+        global $app_strings;
+        global $app_list_strings;
+
+        $lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
+        $lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
+        $lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
+
+
+        $the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 $the_form .= <<<EOQ
 
 				<form name="${prefix}EmailTemplateSave" onSubmit="return check_form('${prefix}EmailTemplateSave')" method="POST" action="index.php">
 					<input type="hidden" name="${prefix}module" value="EmailTemplates">
 					<input type="hidden" name="${prefix}action" value="Save">
 EOQ;
-		$the_form .= $this->getFormBody($prefix, $mod, "${prefix}EmailTemplateSave", "20");
+        $the_form .= $this->getFormBody($prefix, $mod, "${prefix}EmailTemplateSave", "20");
 $the_form .= <<<EOQ
 				<p><input title="$lbl_save_button_title" accessKey="$lbl_save_button_key" class="button" type="submit" name="button" value="  $lbl_save_button_label  " ></p>
 				</form>
 
 EOQ;
 
-		$the_form .= get_left_form_footer();
-		$the_form .= get_validate_record_js();
+        $the_form .= get_left_form_footer();
+        $the_form .= get_validate_record_js();
 
 
-		return $the_form;
-	}
-
+        return $the_form;
+    }
 
-	function handleSave($prefix,$redirect=true, $useRequired=false)
-	{
-		require_once('include/formbase.php');
-		require_once('include/upload_file.php');
-		global $upload_maxsize;
-		global $mod_strings;
-		global $sugar_config;
 
-		$focus = new EmailTemplate();
-		if($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
-			return null;
-		}
-		$focus = populateFromPost($prefix, $focus);
+    function handleSave($prefix,$redirect=true, $useRequired=false)
+    {
+        require_once('include/formbase.php');
+        require_once('include/upload_file.php');
+        global $upload_maxsize;
+        global $mod_strings;
+        global $sugar_config;
+
+        $focus = new EmailTemplate();
+        if($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
+            return null;
+        }
+        $focus = populateFromPost($prefix, $focus);
         //process the text only flag
         if(isset($_POST['text_only']) && ($_POST['text_only'] == '1')){
             $focus->text_only = 1;
         }else{
             $focus->text_only = 0;
         }
-		if(!$focus->ACLAccess('Save')) {
-			ACLController::displayNoAccess(true);
-			sugar_cleanup(true);
-		}
-		if(!isset($_REQUEST['published'])) $focus->published = 'off';
-
-		$preProcessedImages = array();
-		$emailTemplateBodyHtml = from_html($focus->body_html);
-		if(strpos($emailTemplateBodyHtml, '"cache/images/')) {
-			$matches = array();
-			preg_match_all('#<img[^>]*[\s]+src[^=]*=[\s]*["\']cache/images/(.+?)["\']#si', $emailTemplateBodyHtml, $matches);
-			foreach($matches[1] as $match) {
-				$filename = urldecode($match);
+        if(!$focus->ACLAccess('Save')) {
+            ACLController::displayNoAccess(true);
+            sugar_cleanup(true);
+        }
+        if(!isset($_REQUEST['published'])) $focus->published = 'off';
+
+        $preProcessedImages = array();
+        $emailTemplateBodyHtml = from_html($focus->body_html);
+        if(strpos($emailTemplateBodyHtml, '"cache/images/')) {
+            $matches = array();
+            preg_match_all('#<img[^>]*[\s]+src[^=]*=[\s]*["\']cache/images/(.+?)["\']#si', $emailTemplateBodyHtml, $matches);
+            foreach($matches[1] as $match) {
+                $filename = urldecode($match);
                 if($filename != pathinfo($filename, PATHINFO_BASENAME)) {
                     // don't allow paths there
                     $emailTemplateBodyHtml = str_replace("cache/images/$match", "", $emailTemplateBodyHtml);
                     continue;
                 }
-				$file_location = sugar_cached("images/{$filename}");
-				$mime_type = pathinfo($filename, PATHINFO_EXTENSION);
-
-				if(file_exists($file_location)) {
-					$id = create_guid();
-					$newFileLocation = "upload://$id";
-					if(!copy($file_location, $newFileLocation)) {
-						$GLOBALS['log']->debug("EMAIL Template could not copy attachment to $newFileLocation");
-					} else {
-						$secureLink = "index.php?entryPoint=download&type=Notes&id={$id}";
-					    $emailTemplateBodyHtml = str_replace("cache/images/$match", $secureLink, $emailTemplateBodyHtml);
-						unlink($file_location);
-						$preProcessedImages[$filename] = $id;
-					}
-				} // if
-			} // foreach
-		} // if
-		if (isset($GLOBALS['check_notify'])) {
+                $file_location = sugar_cached("images/{$filename}");
+                $mime_type = pathinfo($filename, PATHINFO_EXTENSION);
+
+                if(file_exists($file_location)) {
+                    $id = create_guid();
+                    $newFileLocation = "upload://$id";
+                    if(!copy($file_location, $newFileLocation)) {
+                        $GLOBALS['log']->debug("EMAIL Template could not copy attachment to $newFileLocation");
+                    } else {
+                        $secureLink = "index.php?entryPoint=download&type=Notes&id={$id}";
+                        $emailTemplateBodyHtml = str_replace("cache/images/$match", $secureLink, $emailTemplateBodyHtml);
+                        unlink($file_location);
+                        $preProcessedImages[$filename] = $id;
+                    }
+                } // if
+            } // foreach
+        } // if
+        if (isset($GLOBALS['check_notify'])) {
             $check_notify = $GLOBALS['check_notify'];
         }
         else {
@@ -199,183 +199,183 @@ 
         }
         $focus->body_html = $emailTemplateBodyHtml;
         $return_id = $focus->save($check_notify);
-		///////////////////////////////////////////////////////////////////////////////
-		////	ATTACHMENT HANDLING
+        ///////////////////////////////////////////////////////////////////////////////
+        ////	ATTACHMENT HANDLING
+
+        ///////////////////////////////////////////////////////////////////////////
+        ////	ADDING NEW ATTACHMENTS
+
+        $max_files_upload = count($_FILES);
+
+        if(!empty($focus->id)) {
+            $note = new Note();
+            $where = "notes.parent_id='{$focus->id}'";
+            if(!empty($_REQUEST['old_id'])) { // to support duplication of email templates
+                $where .= " OR notes.parent_id='".htmlspecialchars($_REQUEST['old_id'], ENT_QUOTES)."'";
+            }
+            $notes_list = $note->get_full_list("", $where, true);
+        }
 
-		///////////////////////////////////////////////////////////////////////////
-		////	ADDING NEW ATTACHMENTS
+        if(!isset($notes_list)) {
+            $notes_list = array();
+        }
 
-		$max_files_upload = count($_FILES);
+        if(!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
+            $focus->attachments = array();
+        }
+        $focus->attachments = array_merge($focus->attachments, $notes_list);
 
-		if(!empty($focus->id)) {
-			$note = new Note();
-			$where = "notes.parent_id='{$focus->id}'";
-			if(!empty($_REQUEST['old_id'])) { // to support duplication of email templates
-				$where .= " OR notes.parent_id='".htmlspecialchars($_REQUEST['old_id'], ENT_QUOTES)."'";
-			}
-			$notes_list = $note->get_full_list("", $where, true);
-		}
 
-		if(!isset($notes_list)) {
-			$notes_list = array();
-		}
 
-		if(!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
-			$focus->attachments = array();
-		}
-		$focus->attachments = array_merge($focus->attachments, $notes_list);
+        //for($i = 0; $i < $max_files_upload; $i++) {
 
+        foreach ($_FILES as $key => $file)
+        {
+            $note = new Note();
 
+            //Images are presaved above so we need to prevent duplicate files from being created.
+            if( isset($preProcessedImages[$file['name']]) )
+            {
+                $oldId = $preProcessedImages[$file['name']];
+                $note->id = $oldId;
+                $note->new_with_id = TRUE;
+                $GLOBALS['log']->debug("Image {$file['name']} has already been processed.");
+            }
 
-		//for($i = 0; $i < $max_files_upload; $i++) {
+            $i=preg_replace("/email_attachment(.+)/",'$1',$key);
+            $upload_file = new UploadFile($key);
+
+            if(isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/",$key)) {
+                $note->filename = $upload_file->get_stored_file_name();
+                $note->file = $upload_file;
+                $note->name = $mod_strings['LBL_EMAIL_ATTACHMENT'].': '.$note->file->original_file_name;
+                if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
+                    if($_REQUEST['embedded'.$i]=='true'){
+                        $note->embed_flag =true;
+                    }
+                    else{
+                        $note->embed_flag =false;
+                    }
+                }
+                array_push($focus->attachments, $note);
+            }
 
-		foreach ($_FILES as $key => $file)
-		{
-			$note = new Note();
+        }
 
-			//Images are presaved above so we need to prevent duplicate files from being created.
-			if( isset($preProcessedImages[$file['name']]) )
-			{
-			    $oldId = $preProcessedImages[$file['name']];
-			    $note->id = $oldId;
-			    $note->new_with_id = TRUE;
-			    $GLOBALS['log']->debug("Image {$file['name']} has already been processed.");
+        $focus->saved_attachments = array();
+        foreach($focus->attachments as $note)
+        {
+            if( !empty($note->id) && $note->new_with_id === FALSE)
+            {
+                if(empty($_REQUEST['old_id']))
+                    array_push($focus->saved_attachments, $note); // to support duplication of email templates
+                else
+                {
+                    // we're duplicating a template with attachments
+                    // dupe the file, create a new note, assign the note to the new template
+                    $newNote = new Note();
+                    $newNote->retrieve($note->id);
+                    $newNote->id = create_guid();
+                    $newNote->parent_id = $focus->id;
+                    $newNote->new_with_id = true;
+                    $newNote->date_modified = '';
+                    $newNote->date_entered = '';
+                    /* BEGIN - SECURITY GROUPS */
+                    //Need to do this so that attachments show under an EmailTemplate correctly for a normal user
+                    global $current_user;
+                    $newNote->assigned_user_id = $current_user->id;
+                    /* END - SECURITY GROUPS */
+                    $newNoteId = $newNote->save();
+
+                    UploadFile::duplicate_file($note->id, $newNoteId, $note->filename);
+                }
+                continue;
             }
+            $note->parent_id = $focus->id;
+            $note->parent_type = 'Emails';
+            $note->file_mime_type = $note->file->mime_type;
+            /* BEGIN - SECURITY GROUPS */
+            //Need to do this so that attachments show under an EmailTemplate correctly for a normal user
+            global $current_user;
+            $note->assigned_user_id = $current_user->id;
+            /* END - SECURITY GROUPS */
+            $note_id = $note->save();
+            array_push($focus->saved_attachments, $note);
+            $note->id = $note_id;
+
+            if($note->new_with_id === FALSE)
+                $note->file->final_move($note->id);
+            else
+                $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
+        }
 
-			$i=preg_replace("/email_attachment(.+)/",'$1',$key);
-			$upload_file = new UploadFile($key);
-
-			if(isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/",$key)) {
-				$note->filename = $upload_file->get_stored_file_name();
-				$note->file = $upload_file;
-				$note->name = $mod_strings['LBL_EMAIL_ATTACHMENT'].': '.$note->file->original_file_name;
-				if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
-                  if($_REQUEST['embedded'.$i]=='true'){
-				  	$note->embed_flag =true;
-                  }
-                  else{
-                  	$note->embed_flag =false;
-                  }
-				}
-				array_push($focus->attachments, $note);
-			}
-
-		}
-
-		$focus->saved_attachments = array();
-		foreach($focus->attachments as $note)
-		{
-			if( !empty($note->id) && $note->new_with_id === FALSE)
-			{
-				if(empty($_REQUEST['old_id']))
-					array_push($focus->saved_attachments, $note); // to support duplication of email templates
-				else
-				{
-					// we're duplicating a template with attachments
-					// dupe the file, create a new note, assign the note to the new template
-					$newNote = new Note();
-					$newNote->retrieve($note->id);
-					$newNote->id = create_guid();
-					$newNote->parent_id = $focus->id;
-					$newNote->new_with_id = true;
-					$newNote->date_modified = '';
-					$newNote->date_entered = '';
-					/* BEGIN - SECURITY GROUPS */
-					//Need to do this so that attachments show under an EmailTemplate correctly for a normal user
-					global $current_user;
-					$newNote->assigned_user_id = $current_user->id;
-					/* END - SECURITY GROUPS */
-					$newNoteId = $newNote->save();
-
-					UploadFile::duplicate_file($note->id, $newNoteId, $note->filename);
-				}
-				continue;
-			}
-			$note->parent_id = $focus->id;
-			$note->parent_type = 'Emails';
-			$note->file_mime_type = $note->file->mime_type;
-			/* BEGIN - SECURITY GROUPS */
-			//Need to do this so that attachments show under an EmailTemplate correctly for a normal user
-			global $current_user;
-			$note->assigned_user_id = $current_user->id;
-			/* END - SECURITY GROUPS */
-			$note_id = $note->save();
-			array_push($focus->saved_attachments, $note);
-			$note->id = $note_id;
-
-			if($note->new_with_id === FALSE)
-    			$note->file->final_move($note->id);
-    	    else
-    	       $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
-		}
-
-		////	END NEW ATTACHMENTS
-		///////////////////////////////////////////////////////////////////////////
-
-	///////////////////////////////////////////////////////////////////////////
-	////	ATTACHMENTS FROM DOCUMENTS
-	$count='';
-	//_pp($_REQUEST);
-	//_ppd(count($_REQUEST['document']));
-	if(!empty($_REQUEST['document'])){
-      $count = count($_REQUEST['document']);
+        ////	END NEW ATTACHMENTS
+        ///////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////
+    ////	ATTACHMENTS FROM DOCUMENTS
+    $count='';
+    //_pp($_REQUEST);
+    //_ppd(count($_REQUEST['document']));
+    if(!empty($_REQUEST['document'])){
+        $count = count($_REQUEST['document']);
     }
     else{
-    	$count=10;
+        $count=10;
     }
 
-	for($i=0; $i<$count; $i++) {
-		if(isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
-			$doc = new Document();
-			$docRev = new DocumentRevision();
-			$docNote = new Note();
+    for($i=0; $i<$count; $i++) {
+        if(isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
+            $doc = new Document();
+            $docRev = new DocumentRevision();
+            $docNote = new Note();
 
-			$doc->retrieve($_REQUEST['documentId'.$i]);
-			$docRev->retrieve($doc->document_revision_id);
+            $doc->retrieve($_REQUEST['documentId'.$i]);
+            $docRev->retrieve($doc->document_revision_id);
 
-			array_push($focus->saved_attachments, $docRev);
+            array_push($focus->saved_attachments, $docRev);
 
-			$docNote->name = $doc->document_name;
-			$docNote->filename = $docRev->filename;
-			$docNote->description = $doc->description;
-			$docNote->parent_id = $focus->id;
-			$docNote->parent_type = 'Emails';
-			$docNote->file_mime_type = $docRev->file_mime_type;
-			$docId = $docNote = $docNote->save();
+            $docNote->name = $doc->document_name;
+            $docNote->filename = $docRev->filename;
+            $docNote->description = $doc->description;
+            $docNote->parent_id = $focus->id;
+            $docNote->parent_type = 'Emails';
+            $docNote->file_mime_type = $docRev->file_mime_type;
+            $docId = $docNote = $docNote->save();
 
-			UploadFile::duplicate_file($docRev->id, $docId, $docRev->filename);
-		}
+            UploadFile::duplicate_file($docRev->id, $docId, $docRev->filename);
+        }
 
-	}
+    }
 
-	////	END ATTACHMENTS FROM DOCUMENTS
-	///////////////////////////////////////////////////////////////////////////
+    ////	END ATTACHMENTS FROM DOCUMENTS
+    ///////////////////////////////////////////////////////////////////////////
 
-		///////////////////////////////////////////////////////////////////////////
-		////	REMOVE ATTACHMENTS
+        ///////////////////////////////////////////////////////////////////////////
+        ////	REMOVE ATTACHMENTS
 
-		if(isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
-			foreach($_REQUEST['remove_attachment'] as $noteId) {
-				$q = 'UPDATE notes SET deleted = 1 WHERE id = \''.$noteId.'\'';
-				$focus->db->query($q);
-			}
+        if(isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
+            foreach($_REQUEST['remove_attachment'] as $noteId) {
+                $q = 'UPDATE notes SET deleted = 1 WHERE id = \''.$noteId.'\'';
+                $focus->db->query($q);
+            }
 
-		}
+        }
 
-		////	END REMOVE ATTACHMENTS
-		///////////////////////////////////////////////////////////////////////////
-	////	END ATTACHMENT HANDLING
-	///////////////////////////////////////////////////////////////////////////////
+        ////	END REMOVE ATTACHMENTS
+        ///////////////////////////////////////////////////////////////////////////
+    ////	END ATTACHMENT HANDLING
+    ///////////////////////////////////////////////////////////////////////////////
 
         clear_register_value('select_array', $focus->object_name);
 
-		if($redirect) {
-		$GLOBALS['log']->debug("Saved record with id of ".$return_id);
-			handleRedirect($return_id, "EmailTemplates");
-		}else{
-			return $focus;
-		}
-	}
+        if($redirect) {
+        $GLOBALS['log']->debug("Saved record with id of ".$return_id);
+            handleRedirect($return_id, "EmailTemplates");
+        }else{
+            return $focus;
+        }
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +45 added lines, -45 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.
@@ -54,14 +54,14 @@ 
 
     }
 
-	function getFormBody($prefix, $mod='',$formname='', $size='30') {
+	function getFormBody($prefix, $mod = '', $formname = '', $size = '30') {
 
 
 		global $mod_strings;
 
 		$temp_strings = $mod_strings;
 
-		if(!empty($mod)) {
+		if (!empty($mod)) {
 			global $current_language;
 			$mod_strings = return_module_language($current_language, $mod);
 		}
@@ -71,7 +71,7 @@ 
 				$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
 				$lbl_subject = $mod_strings['LBL_NOTE_SUBJECT'];
 				$lbl_description = $mod_strings['LBL_NOTE'];
-				$default_parent_type= $app_list_strings['record_type_default_key'];
+				$default_parent_type = $app_list_strings['record_type_default_key'];
 
 $form = <<<EOF
 				<input type="hidden" name="${prefix}record" value="">
@@ -97,16 +97,16 @@ 
 	$javascript->setFormName($formname);
 	$javascript->setSugarBean(new EmailTemplate());
 	$javascript->addRequiredFields($prefix);
-	$form .=$javascript->getScript();
+	$form .= $javascript->getScript();
 	$mod_strings = $temp_strings;
 	return $form;
 	}
 
-	function getForm($prefix, $mod='') {
-		if(!empty($mod)) {
+	function getForm($prefix, $mod = '') {
+		if (!empty($mod)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
+	} else global $mod_strings;
 		global $app_strings;
 		global $app_list_strings;
 
@@ -137,7 +137,7 @@ 
 	}
 
 
-	function handleSave($prefix,$redirect=true, $useRequired=false)
+	function handleSave($prefix, $redirect = true, $useRequired = false)
 	{
 		require_once('include/formbase.php');
 		require_once('include/upload_file.php');
@@ -146,30 +146,30 @@ 
 		global $sugar_config;
 
 		$focus = new EmailTemplate();
-		if($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
+		if ($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
 			return null;
 		}
 		$focus = populateFromPost($prefix, $focus);
         //process the text only flag
-        if(isset($_POST['text_only']) && ($_POST['text_only'] == '1')){
+        if (isset($_POST['text_only']) && ($_POST['text_only'] == '1')) {
             $focus->text_only = 1;
-        }else{
+        } else {
             $focus->text_only = 0;
         }
-		if(!$focus->ACLAccess('Save')) {
+		if (!$focus->ACLAccess('Save')) {
 			ACLController::displayNoAccess(true);
 			sugar_cleanup(true);
 		}
-		if(!isset($_REQUEST['published'])) $focus->published = 'off';
+		if (!isset($_REQUEST['published'])) $focus->published = 'off';
 
 		$preProcessedImages = array();
 		$emailTemplateBodyHtml = from_html($focus->body_html);
-		if(strpos($emailTemplateBodyHtml, '"cache/images/')) {
+		if (strpos($emailTemplateBodyHtml, '"cache/images/')) {
 			$matches = array();
 			preg_match_all('#<img[^>]*[\s]+src[^=]*=[\s]*["\']cache/images/(.+?)["\']#si', $emailTemplateBodyHtml, $matches);
-			foreach($matches[1] as $match) {
+			foreach ($matches[1] as $match) {
 				$filename = urldecode($match);
-                if($filename != pathinfo($filename, PATHINFO_BASENAME)) {
+                if ($filename != pathinfo($filename, PATHINFO_BASENAME)) {
                     // don't allow paths there
                     $emailTemplateBodyHtml = str_replace("cache/images/$match", "", $emailTemplateBodyHtml);
                     continue;
@@ -177,10 +177,10 @@ 
 				$file_location = sugar_cached("images/{$filename}");
 				$mime_type = pathinfo($filename, PATHINFO_EXTENSION);
 
-				if(file_exists($file_location)) {
+				if (file_exists($file_location)) {
 					$id = create_guid();
 					$newFileLocation = "upload://$id";
-					if(!copy($file_location, $newFileLocation)) {
+					if (!copy($file_location, $newFileLocation)) {
 						$GLOBALS['log']->debug("EMAIL Template could not copy attachment to $newFileLocation");
 					} else {
 						$secureLink = "index.php?entryPoint=download&type=Notes&id={$id}";
@@ -207,20 +207,20 @@ 
 
 		$max_files_upload = count($_FILES);
 
-		if(!empty($focus->id)) {
+		if (!empty($focus->id)) {
 			$note = new Note();
 			$where = "notes.parent_id='{$focus->id}'";
-			if(!empty($_REQUEST['old_id'])) { // to support duplication of email templates
+			if (!empty($_REQUEST['old_id'])) { // to support duplication of email templates
 				$where .= " OR notes.parent_id='".htmlspecialchars($_REQUEST['old_id'], ENT_QUOTES)."'";
 			}
 			$notes_list = $note->get_full_list("", $where, true);
 		}
 
-		if(!isset($notes_list)) {
+		if (!isset($notes_list)) {
 			$notes_list = array();
 		}
 
-		if(!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
+		if (!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
 			$focus->attachments = array();
 		}
 		$focus->attachments = array_merge($focus->attachments, $notes_list);
@@ -234,7 +234,7 @@ 
 			$note = new Note();
 
 			//Images are presaved above so we need to prevent duplicate files from being created.
-			if( isset($preProcessedImages[$file['name']]) )
+			if (isset($preProcessedImages[$file['name']]))
 			{
 			    $oldId = $preProcessedImages[$file['name']];
 			    $note->id = $oldId;
@@ -242,19 +242,19 @@ 
 			    $GLOBALS['log']->debug("Image {$file['name']} has already been processed.");
             }
 
-			$i=preg_replace("/email_attachment(.+)/",'$1',$key);
+			$i = preg_replace("/email_attachment(.+)/", '$1', $key);
 			$upload_file = new UploadFile($key);
 
-			if(isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/",$key)) {
+			if (isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/", $key)) {
 				$note->filename = $upload_file->get_stored_file_name();
 				$note->file = $upload_file;
 				$note->name = $mod_strings['LBL_EMAIL_ATTACHMENT'].': '.$note->file->original_file_name;
-				if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
-                  if($_REQUEST['embedded'.$i]=='true'){
-				  	$note->embed_flag =true;
+				if (isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])) {
+                  if ($_REQUEST['embedded'.$i] == 'true') {
+				  	$note->embed_flag = true;
                   }
-                  else{
-                  	$note->embed_flag =false;
+                  else {
+                  	$note->embed_flag = false;
                   }
 				}
 				array_push($focus->attachments, $note);
@@ -263,11 +263,11 @@ 
 		}
 
 		$focus->saved_attachments = array();
-		foreach($focus->attachments as $note)
+		foreach ($focus->attachments as $note)
 		{
-			if( !empty($note->id) && $note->new_with_id === FALSE)
+			if (!empty($note->id) && $note->new_with_id === FALSE)
 			{
-				if(empty($_REQUEST['old_id']))
+				if (empty($_REQUEST['old_id']))
 					array_push($focus->saved_attachments, $note); // to support duplication of email templates
 				else
 				{
@@ -303,7 +303,7 @@ 
 			array_push($focus->saved_attachments, $note);
 			$note->id = $note_id;
 
-			if($note->new_with_id === FALSE)
+			if ($note->new_with_id === FALSE)
     			$note->file->final_move($note->id);
     	    else
     	       $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
@@ -314,18 +314,18 @@ 
 
 	///////////////////////////////////////////////////////////////////////////
 	////	ATTACHMENTS FROM DOCUMENTS
-	$count='';
+	$count = '';
 	//_pp($_REQUEST);
 	//_ppd(count($_REQUEST['document']));
-	if(!empty($_REQUEST['document'])){
+	if (!empty($_REQUEST['document'])) {
       $count = count($_REQUEST['document']);
     }
-    else{
-    	$count=10;
+    else {
+    	$count = 10;
     }
 
-	for($i=0; $i<$count; $i++) {
-		if(isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
+	for ($i = 0; $i < $count; $i++) {
+		if (isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
 			$doc = new Document();
 			$docRev = new DocumentRevision();
 			$docNote = new Note();
@@ -354,8 +354,8 @@ 
 		///////////////////////////////////////////////////////////////////////////
 		////	REMOVE ATTACHMENTS
 
-		if(isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
-			foreach($_REQUEST['remove_attachment'] as $noteId) {
+		if (isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
+			foreach ($_REQUEST['remove_attachment'] as $noteId) {
 				$q = 'UPDATE notes SET deleted = 1 WHERE id = \''.$noteId.'\'';
 				$focus->db->query($q);
 			}
@@ -369,10 +369,10 @@ 
 
         clear_register_value('select_array', $focus->object_name);
 
-		if($redirect) {
+		if ($redirect) {
 		$GLOBALS['log']->debug("Saved record with id of ".$return_id);
 			handleRedirect($return_id, "EmailTemplates");
-		}else{
+		} else {
 			return $focus;
 		}
 	}

Braces +23 added lines, -17 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -106,7 +108,9 @@ 
 		if(!empty($mod)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
+	} else {
+	    global $mod_strings;
+	}
 		global $app_strings;
 		global $app_list_strings;
 
@@ -153,14 +157,16 @@ 
         //process the text only flag
         if(isset($_POST['text_only']) && ($_POST['text_only'] == '1')){
             $focus->text_only = 1;
-        }else{
+        } else{
             $focus->text_only = 0;
         }
 		if(!$focus->ACLAccess('Save')) {
 			ACLController::displayNoAccess(true);
 			sugar_cleanup(true);
 		}
-		if(!isset($_REQUEST['published'])) $focus->published = 'off';
+		if(!isset($_REQUEST['published'])) {
+		    $focus->published = 'off';
+		}
 
 		$preProcessedImages = array();
 		$emailTemplateBodyHtml = from_html($focus->body_html);
@@ -193,8 +199,7 @@ 
 		} // if
 		if (isset($GLOBALS['check_notify'])) {
             $check_notify = $GLOBALS['check_notify'];
-        }
-        else {
+        } else {
             $check_notify = FALSE;
         }
         $focus->body_html = $emailTemplateBodyHtml;
@@ -252,8 +257,7 @@ 
 				if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
                   if($_REQUEST['embedded'.$i]=='true'){
 				  	$note->embed_flag =true;
-                  }
-                  else{
+                  } else{
                   	$note->embed_flag =false;
                   }
 				}
@@ -267,8 +271,10 @@ 
 		{
 			if( !empty($note->id) && $note->new_with_id === FALSE)
 			{
-				if(empty($_REQUEST['old_id']))
-					array_push($focus->saved_attachments, $note); // to support duplication of email templates
+				if(empty($_REQUEST['old_id'])) {
+									array_push($focus->saved_attachments, $note);
+				}
+				// to support duplication of email templates
 				else
 				{
 					// we're duplicating a template with attachments
@@ -303,10 +309,11 @@ 
 			array_push($focus->saved_attachments, $note);
 			$note->id = $note_id;
 
-			if($note->new_with_id === FALSE)
-    			$note->file->final_move($note->id);
-    	    else
-    	       $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
+			if($note->new_with_id === FALSE) {
+			    			$note->file->final_move($note->id);
+			} else {
+    	        	       $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
+    	    }
 		}
 
 		////	END NEW ATTACHMENTS
@@ -319,8 +326,7 @@ 
 	//_ppd(count($_REQUEST['document']));
 	if(!empty($_REQUEST['document'])){
       $count = count($_REQUEST['document']);
-    }
-    else{
+    } else{
     	$count=10;
     }
 
@@ -372,7 +378,7 @@ 
 		if($redirect) {
 		$GLOBALS['log']->debug("Saved record with id of ".$return_id);
 			handleRedirect($return_id, "EmailTemplates");
-		}else{
+		} else{
 			return $focus;
 		}
 	}