adamjakab / SuiteCRM

modules/Documents/Document.php

Braces +22 added lines, -13 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry)
+if(!defined('sugarEntry') || !sugarEntry) {
 	die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -237,9 +238,13 @@ 
             	$this->name = $this->document_name;
             }
 
-            if(isset($row['filename']))$this->filename = $row['filename'];
+            if(isset($row['filename'])) {
+                $this->filename = $row['filename'];
+            }
             //$this->latest_revision = $row['revision'];
-            if(isset($row['revision']))$this->revision = $row['revision'];
+            if(isset($row['revision'])) {
+                $this->revision = $row['revision'];
+            }
 
             //image is selected based on the extension name <ext>_icon_inline, extension is stored in document_revisions.
             //if file is not found then default image file will be used.
@@ -266,7 +271,7 @@ 
 
     		$this->file_url = $file_url;
     		$this->file_url_noimage = "index.php?entryPoint=download&type=Documents&id={$this->document_revision_id}";
-		}else{
+		} else{
             $this->file_url = "";
             $this->file_url_noimage = "";
 		}
@@ -306,15 +311,17 @@ 
 
 		$where_auto = " documents.deleted = 0";
 
-		if ($where != "")
-			$query .= " WHERE $where AND ".$where_auto;
-		else
-			$query .= " WHERE ".$where_auto;
+		if ($where != "") {
+					$query .= " WHERE $where AND ".$where_auto;
+		} else {
+					$query .= " WHERE ".$where_auto;
+		}
 
-		if ($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY documents.document_name";
+		if ($order_by != "") {
+					$query .= " ORDER BY $order_by";
+		} else {
+					$query .= " ORDER BY documents.document_name";
+		}
 
 		return $query;
 	}
@@ -374,7 +381,9 @@ 
 
 	//static function.
 	function get_document_name($doc_id){
-		if (empty($doc_id)) return null;
+		if (empty($doc_id)) {
+		    return null;
+		}
 
 		$db = DBManagerFactory::getInstance();
 		$query="select document_name from documents where id='$doc_id'  and deleted=0";

modules/Campaigns/PopupCampaignRoi.php

Braces +8 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -108,8 +110,10 @@ 
 	$currency->retrieve($focus->currency_id);
 	if( $currency->deleted != 1){
 		$xtpl->assign("CURRENCY", $currency->iso4217 .' '.$currency->symbol );
-	}else $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
-}else{
+	} else {
+	    $xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
+	}
+	} else{
 
 	$xtpl->assign("CURRENCY", $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol() );
 
@@ -185,7 +189,7 @@ 
     if(!empty($selected_marketing_id)){$latest_marketing_id = $selected_marketing_id;}
     if(empty($latest_marketing_id) ||  $latest_marketing_id === 'all'){
         $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") . $cache_file_name_roi,true));
-    }else{
+    } else{
 
     $xtpl->assign("MY_CHART_ROI", $chart->campaign_response_roi_popup($app_list_strings['roi_type_dom'],$app_list_strings['roi_type_dom'],$campaign_id,sugar_cached("xml/") .$cache_file_name_roi,true));
     }

modules/Campaigns/WizardNewsletter.php

Braces +41 added lines, -29 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.
@@ -80,7 +82,7 @@ 
 
 if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_NEWSLETTER WIZARD_TITLE'].$focus->name), true, false);
-}else{
+} else{
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_CAMPAIGN'].$focus->name), true, false);   
 }
 
@@ -89,9 +91,15 @@ 
 $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');
@@ -120,10 +128,10 @@ 
 if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
     $campaign_type = 'newsletter';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());    
-}elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
+} elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
     $campaign_type = 'email';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());
-}else{
+} else{
     $campaign_type = 'general';
 }
 
@@ -162,16 +170,21 @@ 
 $ss->assign("CAMP_NAME", $focus->name);
 $ss->assign("CAMP_RECORD", $focus->id);
 $ss->assign("CAMP_IMPRESSIONS", $focus->impressions);
-if (empty($focus->assigned_user_id) && empty($focus->id))  $focus->assigned_user_id = $current_user->id;
-if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
+if (empty($focus->assigned_user_id) && empty($focus->id)) {
+    $focus->assigned_user_id = $current_user->id;
+}
+if (empty($focus->assigned_name) && empty($focus->id)) {
+    $focus->assigned_user_name = $current_user->user_name;
+}
 $ss->assign("ASSIGNED_USER_OPTIONS", get_select_options_with_id(get_user_array(TRUE, "Active", $focus->assigned_user_id), $focus->assigned_user_id));
 $ss->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
 $ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
 
-if((!isset($focus->status)) && (!isset($focus->id)))
+if((!isset($focus->status)) && (!isset($focus->id))) {
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], 'Planning'));
-else
+} else {
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], $focus->status));
+}
 
 //hide frequency options if this is not a newsletter
 if($campaign_type == 'newsletter'){
@@ -179,10 +192,10 @@ 
     $ss->assign("FREQUENCY_LABEL", $mod_strings['LBL_CAMPAIGN_FREQUENCY']);
     if((!isset($focus->frequency)) && (!isset($focus->id))){
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], 'Monthly'));
-    }else{
+    } else{
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], $focus->frequency));
     }
-}else{
+} else{
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "input type='hidden'");
     $ss->assign("FREQUENCY_LABEL", '&nbsp;');
 }
@@ -192,12 +205,11 @@ 
 if(isset($focus->currency_id) && !empty($focus->currency_id)){
     $selectCurrency = $currency->getSelectOptions($focus->currency_id);
     $ss->assign("CURRENCY", $selectCurrency);
-}
-else if($current_user->getPreference('currency') && !isset($focus->id))
+} else if($current_user->getPreference('currency') && !isset($focus->id))
 {
     $selectCurrency = $currency->getSelectOptions($current_user->getPreference('currency'));
     $ss->assign("CURRENCY", $selectCurrency);
-}else{
+} else{
 
     $selectCurrency = $currency->getSelectOptions();
     $ss->assign("CURRENCY", $selectCurrency);
@@ -228,7 +240,7 @@ 
     foreach($OptionsArr as $key=>$val){
         if($val =='Newsletter' || $val =='Email' || $val =='' ){
             //do not add   
-        }else{
+        } else{
             $myTypeOptionsArr[$key] = $val;
         }
     }
@@ -240,7 +252,7 @@ 
         //if the selected flag is set to true, then just populate
         if($selected){
             $type_option_html .="<option value='$optionKey' >$optionName</option>";
-        }else{//if not selected yet, check to see if this option should be selected
+        } else{//if not selected yet, check to see if this option should be selected
             //if the campaign type is not empty, then select the retrieved type
             if(!empty($focus->campaign_type)){
                 //check to see if key matches campaign type
@@ -249,11 +261,11 @@ 
                     $type_option_html .="<option value='$optionKey' selected>$optionName</option>";
                     //mark as selected for next time
                     $selected=true;
-                }else{
+                } else{
                     //key does not match, just populate
                     $type_option_html .="<option value='$optionKey' >$optionName</option>";
                 }
-            }else{
+            } else{
             //since the campaign type is empty, then select first one                
                 $type_option_html .="<option value='$optionKey' selected>$optionName</option>";    
                 //mark as selected for next time
@@ -264,11 +276,11 @@ 
     //assign the modified dropdown for general campaign creation
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $type_option_html);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "select");    
-}elseif($campaign_type == 'email'){
+} elseif($campaign_type == 'email'){
     //Assign Email as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_EMAIL']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='Email'");
-}else{
+} else{
     //Assign NewsLetter as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_NEWSLETTER']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='NewsLetter'");
@@ -295,7 +307,7 @@ 
         $ct_focus = new CampaignTracker();
         $ct_focus->retrieve($trkr_id);
       if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
-            if($ct_focus->is_optout){$opt = 'checked';}else{$opt = '';}
+            if($ct_focus->is_optout){$opt = 'checked';} else{$opt = '';}
             $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>" ;
             $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'] . $trkr_count ."' id='existing_is_optout". $trkr_count ."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id". $trkr_count ."'type='hidden''/></td>";
             $trkr_html .= "<td width='40%'> <input id='existing_tracker_name". $trkr_count ."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME']. $trkr_count ."' value='".$ct_focus->tracker_name."' ></td>";
@@ -310,7 +322,7 @@ 
     }
     
     $trkr_html .= "<div id='no_trackers'></div>";
-    }else{
+    } else{
         $trkr_html .= "<div id='no_trackers'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
     }
     $ss->assign('EXISTING_TRACKERS', $trkr_html);
@@ -424,7 +436,7 @@ 
 
 
 
-}else{
+} else{
  //this is not a newlsetter campaign, so fill in target list table
     //create array for javascript, this will help to display the option text, not the value
     $dom_txt =' ';
@@ -454,7 +466,7 @@ 
         }
         
         $trgt_html  .= "<div id='no_targets'></div>";
-    }else{
+    } else{
         $trgt_html  .= "<div id='no_targets'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
         
     }
@@ -529,11 +541,11 @@ 
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'campaign',$mrkt_string,$summ_url));
     $ss->assign('HIDE_CONTINUE','hidden');
 
-}elseif($campaign_type == 'email'){
+} elseif($campaign_type == 'email'){
     $steps = create_email_steps();  
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'email',$mrkt_string,$summ_url));
     $ss->assign('HIDE_CONTINUE','submit');
-}else{
+} else{
     $steps = create_newsletter_steps();  
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($steps,'newsletter',$mrkt_string,$summ_url));
     $ss->assign('HIDE_CONTINUE','submit');
@@ -604,7 +616,7 @@ 
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">$mrkt_string</div></td></tr>";
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
         $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+3).">".$summ_url."</div></td></tr>";
-    }else{
+    } else{
      $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";   
     }
        

modules/Campaigns/GenerateWebToLeadForm.php

Braces +62 added lines, -62 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.
@@ -135,11 +137,9 @@ 
  if(count($_REQUEST['colsFirst']) > count($_REQUEST['colsSecond']) || count($_REQUEST['colsFirst']) == count($_REQUEST['colsSecond'])){
    $columns= count($_REQUEST['colsFirst']);
  }
-}
-else if(!empty($_REQUEST['colsFirst'])){
+} else if(!empty($_REQUEST['colsFirst'])){
  $columns= count($_REQUEST['colsFirst']);
-}
-else if(!empty($_REQUEST['colsSecond'])){
+} else if(!empty($_REQUEST['colsSecond'])){
  $columns= count($_REQUEST['colsSecond']);
 }
 
@@ -166,8 +166,7 @@ 
          $field_label = $field_vname .": ";
          if(isset($lead->field_defs[$colsFirstField]['custom_type']) && $lead->field_defs[$colsFirstField]['custom_type'] != null){
             $field_type= $lead->field_defs[$colsFirstField]['custom_type'];
-         }
-         else{
+         } else{
             $field_type= $lead->field_defs[$colsFirstField]['type'];
          }
          
@@ -190,7 +189,9 @@ 
               array_push($required_fields,$lead->field_defs[$colsFirstField]['name']);
             }
           }
-         if($field_type=='multienum' || $field_type=='enum' || $field_type=='radioenum')  $field_options= $lead->field_defs[$colsFirstField]['options'];
+         if($field_type=='multienum' || $field_type=='enum' || $field_type=='radioenum') {
+             $field_options= $lead->field_defs[$colsFirstField]['options'];
+         }
     }
     //preg_replace('/:$/','',translate($field_def['vname'],'Leads')
     if(isset($lead->field_defs[$colsSecondField]) && $lead->field_defs[$colsSecondField] != null)
@@ -200,8 +201,7 @@ 
          $field1_label = $field1_vname .": ";
          if(isset($lead->field_defs[$colsSecondField]['custom_type']) && $lead->field_defs[$colsSecondField]['custom_type'] != null){
             $field1_type= $lead->field_defs[$colsSecondField]['custom_type'];
-         }
-         else{
+         } else{
             $field1_type= $lead->field_defs[$colsSecondField]['type'];
          }
          
@@ -223,7 +223,9 @@ 
               array_push($required_fields,$lead->field_defs[$colsSecondField]['name']);
             }
          }
-         if($field1_type=='multienum' || $field1_type=='enum' || $field1_type=='radioenum')  $field1_options= $lead->field_defs[$colsSecondField]['options'];
+         if($field1_type=='multienum' || $field1_type=='enum' || $field1_type=='radioenum') {
+             $field1_options= $lead->field_defs[$colsSecondField]['options'];
+         }
     }
 
      $Web_To_Lead_Form_html .= "<tr>";
@@ -233,19 +235,17 @@ 
           $lead_options = '';
           if(!empty($lead->$field_name)){
             $lead_options= get_select_options_with_id($app_list_strings[$field_options], unencodeMultienum($lead->$field_name));
-          }
-          else{
+          } else{
             $lead_options= get_select_options_with_id($app_list_strings[$field_options], '');
           }
           if($field_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-            }
-         else{
+            } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
              }
           if(isset($lead->field_defs[$colsFirstField]['isMultiSelect']) && $lead->field_defs[$colsFirstField]['isMultiSelect'] ==1){
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id='{$field_name}' multiple='true' name='{$field_name}[]' tabindex='1'>$lead_options</select></span sugar='slot'></td>";
-          }elseif(ifRadioButton($lead->field_defs[$colsFirstField]['name'])){
+          } elseif(ifRadioButton($lead->field_defs[$colsFirstField]['name'])){
             $Web_To_Lead_Form_html .="<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>";
             foreach($app_list_strings[$field_options] as $field_option_key => $field_option){
                 if($field_option != null){
@@ -258,15 +258,14 @@ 
                 }
             }
             $Web_To_Lead_Form_html .="</span sugar='slot'></td>";
-          }else{
+          } else{
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id=$field_name name=$field_name tabindex='1'>$lead_options</select></span sugar='slot'></td>";
           }
          }
          if($field_type=='bool'){
           if($field_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-          }
-          else{
+          } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
           }
           $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input type='checkbox' id=$field_name name=$field_name></span sugar='slot'></td>";
@@ -281,8 +280,7 @@ 
 	      $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
           if($field_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-          }
-          else{
+          } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
           }
 
@@ -304,20 +302,22 @@ 
           	$order = explode("%", $cal_dateformat);
           	foreach($order as $part)
           	{
-          		if (!isset($part[0]))
-          			continue;
-          		if (strToUpper($part[0]) == "M" )
-          			$Web_To_Lead_Form_html .= translate("LBL_MONTH") . ":<input class=\"text\"
+          		if (!isset($part[0])) {
+          		          			continue;
+          		}
+          		if (strToUpper($part[0]) == "M" ) {
+          		          			$Web_To_Lead_Form_html .= translate("LBL_MONTH") . ":<input class=\"text\"
 					name=\"{$field_name}_month\" size='2' maxlength='2' id='{$field_name}_month' value=''
 					onblur=\"update{$field_name}Value()\">";
-				else if (strToUpper($part[0]) == "D" )
-					$Web_To_Lead_Form_html .=  translate("LBL_DAY") . ":<input class=\"text\"
+          		} else if (strToUpper($part[0]) == "D" ) {
+									$Web_To_Lead_Form_html .=  translate("LBL_DAY") . ":<input class=\"text\"
 					name=\"{$field_name}_day\" size='2' maxlength='2' id='{$field_name}_day' value=''
 					onblur=\"update{$field_name}Value()\">";
-				else if (strToUpper($part[0]) == "Y" )
-					$Web_To_Lead_Form_html .= translate("LBL_YEAR") . ":<input class=\"text\"
+				} else if (strToUpper($part[0]) == "Y" ) {
+									$Web_To_Lead_Form_html .= translate("LBL_YEAR") . ":<input class=\"text\"
 					name=\"{$field_name}_year\" size='4' maxlength='4' id='{$field_name}_year' value=''
 					onblur=\"update{$field_name}Value()\">";
+				}
           	}
           	$Web_To_Lead_Form_html .= "</span></td>";
 	     } // if
@@ -326,8 +326,7 @@ 
           ||  $field_type=='phone' || $field_type=='currency' || $field_type=='url' || $field_type=='int'){
            if($field_name=='last_name' ||   $field_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-              }
-            else{
+              } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
              }
              if ( $field_name=='email1'||$field_name=='email2' ){
@@ -347,14 +346,12 @@ 
           if($field_type=='email'){
             if($field_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-              }
-           else{
+              } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field_label</span sugar='slot'></td>";
              }
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field_name name=$field_name type='text' onchange='validateEmailAdd();'></span sugar='slot'></td>";
            }
-       }
-      else{
+       } else{
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
         }
@@ -364,40 +361,37 @@ 
           $lead1_options = '';
           if(!empty($lead->$field1_name)){
             $lead1_options= get_select_options_with_id($app_list_strings[$field1_options], unencodeMultienum($lead->$field1_name));
-          }
-          else{
+          } else{
             $lead1_options= get_select_options_with_id($app_list_strings[$field1_options], '');
           }
             if($field1_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-            }
-            else{
+            } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
              }
             if(isset($lead->field_defs[$colsSecondField]['isMultiSelect']) && $lead->field_defs[$colsSecondField]['isMultiSelect'] ==1){
                 $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id='{$field1_name}' name='{$field1_name}[]' multiple='true' tabindex='1'>$lead1_options</select></span sugar='slot'></td>";
-            }elseif(ifRadioButton($lead->field_defs[$colsSecondField]['name'])){
+            } elseif(ifRadioButton($lead->field_defs[$colsSecondField]['name'])){
                 $Web_To_Lead_Form_html .="<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>";
                 foreach($app_list_strings[$field1_options] as $field_option_key => $field_option){
                     if($field_option != null){
                     	if(!empty($lead->$field1_name) && in_array($field_option_key,unencodeMultienum($lead->$field1_name))){
                     		$Web_To_Lead_Form_html .="<input id='$colsSecondField"."_$field_option_key' checked name='$colsSecondField' value='$field_option_key' type='radio'>";
-                    	}else{
+                    	} else{
 	                    	$Web_To_Lead_Form_html .="<input id='$colsSecondField"."_$field_option_key' name='$colsSecondField' value='$field_option_key' type='radio'>";
 	                    }
 	                    $Web_To_Lead_Form_html .="<span ='document.getElementById('".$lead->field_defs[$colsSecondField]."_$field_option_key').checked =true style='cursor:default'; onmousedown='return false;'>$field_option</span><br>";
                     }
                 }
                 $Web_To_Lead_Form_html .="</span sugar='slot'></td>";
-            }else{
+            } else{
                 $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><select id=$field1_name name=$field1_name tabindex='1'>$lead1_options</select></span sugar='slot'></td>";
             }
          }
          if($field1_type=='bool'){
           if($field1_required){
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-          }
-          else{
+          } else{
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
           }
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field1_name name=$field1_name type='checkbox'></span sugar='slot'></td>";
@@ -411,8 +405,7 @@ 
 	        $LBL_ENTER_DATE = translate('LBL_ENTER_DATE', 'Charts');
           if($field1_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-          }
-          else{
+          } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
           }
 			$Web_To_Lead_Form_html .= " 
@@ -433,20 +426,22 @@ 
           	$order = explode("%", $cal_dateformat);
           	foreach($order as $part)
           	{
-          		if (!isset($part[0]))
-          			continue;
-          		if (strToUpper($part[0]) == "M" )
-          			$Web_To_Lead_Form_html .= translate("LBL_MONTH") . ":<input class=\"text\"
+          		if (!isset($part[0])) {
+          		          			continue;
+          		}
+          		if (strToUpper($part[0]) == "M" ) {
+          		          			$Web_To_Lead_Form_html .= translate("LBL_MONTH") . ":<input class=\"text\"
 					name=\"{$field1_name}_month\" size='2' maxlength='2' id='{$field1_name}_month' value='' 
 					onblur=\"update{$field1_name}Value()\">";
-				else if (strToUpper($part[0]) == "D" ) 
-					$Web_To_Lead_Form_html .=  translate("LBL_DAY") . ":<input class=\"text\"
+          		} else if (strToUpper($part[0]) == "D" ) {
+									$Web_To_Lead_Form_html .=  translate("LBL_DAY") . ":<input class=\"text\"
 					name=\"{$field1_name}_day\" size='2' maxlength='2' id='{$field1_name}_day' value='' 
 					onblur=\"update{$field1_name}Value()\">";
-				else if (strToUpper($part[0]) == "Y" ) 
-					$Web_To_Lead_Form_html .= translate("LBL_YEAR") . ":<input class=\"text\"
+				} else if (strToUpper($part[0]) == "Y" ) {
+									$Web_To_Lead_Form_html .= translate("LBL_YEAR") . ":<input class=\"text\"
 					name=\"{$field1_name}_year\" size='4' maxlength='4' id='{$field1_name}_year' value='' 
 					onblur=\"update{$field1_name}Value()\">";
+				}
           	}
           	$Web_To_Lead_Form_html .= "</span></td>";
          } // if
@@ -454,8 +449,7 @@ 
           ||  $field1_type=='phone' || $field1_type=='currency' || $field1_type=='url' || $field1_type=='int'){
             if($field1_name=='last_name' ||  $field1_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-              }
-            else{
+              } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
              }
              if ( $field1_name=='email1'||$field1_name=='email2' ){
@@ -476,14 +470,12 @@ 
            if($field1_type=='email'){
            	if($field1_required){
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'><span class='required' style='color: rgb(255, 0, 0);'>$web_required_symbol</span></td>";
-              }
-            else{
+              } else{
                 $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>$field1_label</span sugar='slot'></td>";
              }
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'><input id=$field1_name name=$field1_name type='text' onchange='validateEmailAdd();'></span sugar='slot'></td>";
            }
-      }
-      else{
+      } else{
             $Web_To_Lead_Form_html .= "<td width='15%' style='text-align: left; font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
             $Web_To_Lead_Form_html .= "<td width='35%' style='font-size: 12px; font-weight: normal;'><span sugar='slot'>&nbsp</span sugar='slot'></td>";
        }
@@ -596,8 +588,16 @@ 
 }
 </script>";
 
-if(isset($Web_To_Lead_Form_html)) $xtpl->assign("BODY", $Web_To_Lead_Form_html); else $xtpl->assign("BODY", "");
-if(isset($Web_To_Lead_Form_html)) $xtpl->assign("BODY_HTML", $Web_To_Lead_Form_html); else $xtpl->assign("BODY_HTML", "");
+if(isset($Web_To_Lead_Form_html)) {
+    $xtpl->assign("BODY", $Web_To_Lead_Form_html);
+} else {
+    $xtpl->assign("BODY", "");
+}
+if(isset($Web_To_Lead_Form_html)) {
+    $xtpl->assign("BODY_HTML", $Web_To_Lead_Form_html);
+} else {
+    $xtpl->assign("BODY_HTML", "");
+}
 
 
 require_once('include/SugarTinyMCE.php');

modules/Campaigns/WizardEmailSetupSave.php

Braces +4 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -100,7 +102,7 @@ 
             //an error was found during inbound save.  This means the save was allowed but the inbound box had problems, return user to wizard
             //and display error message
             header("Location: index.php?action=WizardEmailSetup&module=Campaigns&error=true");
-    }else{
+    } else{
         //set navigation details
         header("Location: index.php?action=index&module=Campaigns");
     }

modules/Campaigns/WizardNewsletterSave.php

Braces +6 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -92,7 +94,7 @@ 
                     $campaign_focus->prospectlists->delete($campaign_focus->id, $pl_del);
                 }
             }
-        }else{
+        } else{
             //process target lists if this is not a newsletter
             //remove Target Lists if defined
 
@@ -124,7 +126,7 @@ 
                     //load relationship and add to the list
                     $campaign_focus->load_relationship('prospectlists');
                     $campaign_focus->prospectlists->add($trgt_focus ->id);
-                }else{
+                } else{
 
                     //this is a new target, as the id is not populated, need to create and link
                     $trgt_focus = new ProspectList();
@@ -214,7 +216,7 @@ 
 $action = '';
 if(isset($_REQUEST['wiz_direction'])  &&  $_REQUEST['wiz_direction']== 'continue'){
     $action = 'WizardMarketing';
-}else{
+} else{
     $action = 'WizardHome&record='.$campaign_focus->id;
 }
 //require_once('modules/Campaigns/WizardMarketing.php');

modules/Campaigns/WebToLeadCapture.php

Braces +13 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.
@@ -157,8 +159,7 @@ 
 		        $lead->campaigns->add($camplog->id);
                 if(!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
-                }
-                else {
+                } else {
                     $lead->save(FALSE);
                 }
             }
@@ -188,14 +189,14 @@ 
 				$get_and_post = array_merge($_GET, $_POST);
 				foreach($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
-						continue;
+					if($param == 'redirect_url' && $param == 'submit') {
+											continue;
+					}
 					
 					if($first_iteration){
 						$first_iteration = false;
 						$query_string .= $first_char;
-					}
-					else{
+					} else{
 						$query_string .= "&";
 					}
 					$query_string .= "{$param}=".urlencode($value);
@@ -203,8 +204,7 @@ 
 				if(empty($lead)) {
 					if($first_iteration){
 						$query_string .= $first_char;
-					}
-					else{
+					} else{
 						$query_string .= "&";
 					}
 					$query_string .= "error=1";
@@ -229,20 +229,17 @@ 
     				}
     				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     				echo '</body></html>';
-    			}
-				else{
+    			} else{
     				header("Location: {$redirect_url}");
     				die();
 			    }
-			}
-			else{
+			} else{
 				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING_LEAD'];
 			}
 			sugar_cleanup();
 			// die to keep code from running into redirect case below
 			die();
-	    }
-	   else{
+	    } else{
 	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
 	  }
 }
@@ -253,8 +250,7 @@ 
     	echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
     	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     	echo '</body></html>';
-    }
-    else{
+    } else{
     	header("Location: {$_POST['redirect']}");
     	die();
     }

modules/Campaigns/WebToLeadCreation.php

Braces +10 added lines, -5 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.
@@ -181,8 +183,7 @@ 
         $col_arr[0]=$cols_name;
         $col_arr[1]=$field_def['name'];
         $col_arr[2]=true;
-     }
-     else{
+     } else{
 	     $cols_name=$field_def['vname'];
 	     $col_arr[0]=$cols_name;
 	     $col_arr[1]=$field_def['name'];
@@ -209,8 +210,12 @@ 
 
 
 
-if (empty($focus->assigned_user_id) && empty($focus->id))  $focus->assigned_user_id = $current_user->id;
-if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
+if (empty($focus->assigned_user_id) && empty($focus->id)) {
+    $focus->assigned_user_id = $current_user->id;
+}
+if (empty($focus->assigned_name) && empty($focus->id)) {
+    $focus->assigned_user_name = $current_user->user_name;
+}
 $xtpl->assign("ASSIGNED_USER_OPTIONS", get_select_options_with_id(get_user_array(TRUE, "Active", $focus->assigned_user_id), $focus->assigned_user_id));
 $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
 $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );

modules/Campaigns/WizardEmailSetup.php

Braces +17 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,7 +57,9 @@ 
 global $mod_strings,$app_list_strings,$app_strings,$current_user;
 
 
-if (!is_admin($current_user)&& !is_admin_for_module($GLOBALS['current_user'],'Campaigns')) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)&& !is_admin_for_module($GLOBALS['current_user'],'Campaigns')) {
+    sugar_die("Unauthorized access to administration.");
+}
 
 $params = array();
 $params[] = "<a href='index.php?module=Campaigns&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>";
@@ -78,9 +82,15 @@ 
 $ss = new Sugar_Smarty();
 $ss->assign("MOD", $mod_strings);
 $ss->assign("APP", $app_strings);
-if (isset($_REQUEST['return_module'])) $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
-if (isset($_REQUEST['return_action'])) $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
-if (isset($_REQUEST['return_id'])) $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_module'])) {
+    $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
+if (isset($_REQUEST['return_action'])) {
+    $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
+}
+if (isset($_REQUEST['return_id'])) {
+    $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 
 
 
@@ -146,7 +156,7 @@ 
                 
      if( $colorclass == "class='evenListRowS1'"){
             $colorclass= "class='oddListRowS1'";
-        }else{ 
+        } else{ 
             $colorclass= "class='evenListRowS1'";
         }           
         
@@ -159,7 +169,7 @@ 
     }
 
 
-}else{
+} else{
 $need_mbox = 'checked';
 $mboxTable .= "<tr><td colspan='5'><b>".$mod_strings['LBL_MAILBOX_CHECK_WIZ_BAD']." </b>.</td></tr>";
 }