adamjakab / SuiteCRM

modules/AOS_PDF_Templates/formLetterPdf.php

Braces +2 added lines, -3 removed lines

@@ -53,8 +53,7 @@ 
         {
             array_push($recordIds, $val['id']);
         }
-    }
-    else{
+    } else{
         $recordIds = explode(',',$_REQUEST['uid']);
     }
 
@@ -150,7 +149,7 @@ 
 		
 			rename($sugar_config['upload_dir'].'nfile.pdf',$sugar_config['upload_dir'].$note->id);
 		
-		}catch(mPDF_exception $e){ 
+		} catch(mPDF_exception $e){ 
 			echo $e;
 		}
 	}

modules/AOS_PDF_Templates/formLetter.php

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
 		global $app_strings, $sugar_config;
 		if (preg_match('/^6\./', $sugar_config['sugar_version'])) {
 			$script = '<a href="#" style="width: 150px" class="menuItem" onmouseover="hiliteItem(this,\'yes\');" onmouseout="unhiliteItem(this);" onclick="showPopup()">'.$app_strings['LBL_GENERATE_LETTER'].'</a>';
-		}
-		else{
+		} else{
 			$script = ' <input class="button" type="button" value="'.$app_strings['LBL_GENERATE_LETTER'].'" ' .'onClick="showPopup();">';
     		}
 
@@ -96,8 +95,7 @@ 
 					}
 					}
 				</script>';
-			}
-		else{
+			} else{
 			echo '<script>
 				function showPopup(){
 				alert(\''.$app_strings['LBL_NO_TEMPLATE'].'\');		
@@ -148,8 +146,7 @@ 
 						}
 					}
 				</script>';
-		}
-		else{
+		} else{
 			echo '<script>
 				function showPopup(){
 				alert(\''.$app_strings['LBL_NO_TEMPLATE'].'\');		

modules/AOS_PDF_Templates/generatePdf.php

Braces +6 added lines, -10 removed lines

@@ -131,17 +131,16 @@ 
 				$pdf->writeHTML($printable);
 				if($task == 'pdf'){
 					$pdf->Output($file_name, "D");
-				}else{
+				} else{
 					$fp = fopen($sugar_config['upload_dir'].'attachfile.pdf','wb');
 					fclose($fp);
 					$pdf->Output($sugar_config['upload_dir'].'attachfile.pdf','F');
 					sendEmail::send_email($module,$module_type, '',$file_name, true,$module->id);
 				}
-			}catch(mPDF_exception $e){
+			} catch(mPDF_exception $e){
 				echo $e;
 			}
-		}
-		else if($task == 'email')
+		} else if($task == 'email')
 		{
 			sendEmail::send_email($module,$module_type, $printable,'', false);
 		}
@@ -222,8 +221,7 @@ 
             }
             $tcount=strpos($parts[1],$endElement)+strlen($endElement);
             $parts[1]= substr($parts[1],$tcount);
-        }
-        else{
+        } else{
             $tcount = strrpos($text,$startElement);
             $text = substr($text,0,$tcount);
 
@@ -309,8 +307,7 @@ 
         //check if there is only one line item
         if($firstNum == $lastNum){
             $linePart = $firstValue;
-        }
-        else{
+        } else{
             $tparts = explode($lastValue,$tparts[1]);
             $linePart = $firstValue . $tparts[0] . $lastValue;
         }
@@ -390,8 +387,7 @@ 
         //check if there is only one line item
         if($firstNum == $lastNum){
             $linePart = $firstValue;
-        }
-        else{
+        } else{
             $tparts = explode($lastValue,$tparts[1]);
             $linePart = $firstValue . $tparts[0] . $lastValue;
         }

modules/AOS_PDF_Templates/sendEmail.php

Braces +5 added lines, -4 removed lines

@@ -44,10 +44,11 @@
 		$email->type = "draft";
 		$email->status = "draft";
 	
-		if(!empty($module->billing_contact_id) && $module->billing_contact_id!="")
-            $contact_id = $module->billing_contact_id;
-        else if(!empty($module->contact_id) && $module->contact_id!="")
-            $contact_id = $module->contact_id;
+		if(!empty($module->billing_contact_id) && $module->billing_contact_id!="") {
+		            $contact_id = $module->billing_contact_id;
+		} else if(!empty($module->contact_id) && $module->contact_id!="") {
+                    $contact_id = $module->contact_id;
+        }
 
             require_once('modules/Contacts/Contact.php');
             $contact = new Contact;

modules/AOW_WorkFlow/aow_utils.php

Braces +69 added lines, -43 removed lines

@@ -47,7 +47,9 @@ 
             } //End loop.
 
             foreach($unset as $name){
-                if(isset($fields[$name])) unset( $fields[$name]);
+                if(isset($fields[$name])) {
+                    unset( $fields[$name]);
+                }
             }
 
         }
@@ -124,7 +126,7 @@ 
                 if(isset($arr['vname']) && $arr['vname'] != '') {
                     $label = $rel_module_label . ' : ' . translate($arr['vname'], $mod->module_dir);
                     $module_label = trim(translate($arr['vname'],$mod->module_dir),':');
-                }else {
+                } else {
                     $label = $rel_module_label . ' : '. $name;
                     $module_label = $name;
                 }
@@ -175,7 +177,9 @@ 
                         $sort_fields[$name] = $relModuleName.' : '. $name;
                     }
                     if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
-                        if(isset($fields[$arr['id_name']])) unset( $fields[$arr['id_name']]);
+                        if(isset($fields[$arr['id_name']])) {
+                            unset( $fields[$arr['id_name']]);
+                        }
                     }
                 }
             } //End loop.
@@ -269,7 +273,9 @@ 
             $vardef['type'] = 'varchar';
         }
 
-        if(isset($vardef['precision'])) unset($vardef['precision']);
+        if(isset($vardef['precision'])) {
+            unset($vardef['precision']);
+        }
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
@@ -308,8 +314,9 @@ 
         // remove the special text entry field function 'getEmailAddressWidget'
         if ( isset($vardef['function'])
             && ( $vardef['function'] == 'getEmailAddressWidget'
-                || $vardef['function']['name'] == 'getEmailAddressWidget' ) )
-            unset($vardef['function']);
+                || $vardef['function']['name'] == 'getEmailAddressWidget' ) ) {
+                    unset($vardef['function']);
+        }
 
         if(isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')){
             $vardef['name'] = 'aow_temp_date';
@@ -334,8 +341,9 @@ 
         }
 
         // hack to disable one of the js calls in this control
-        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) )
-            $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) ) {
+                    $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        }
 
         // Save it to the cache file
         if($fh = @sugar_fopen($file, 'w')) {
@@ -361,8 +369,7 @@ 
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
     if(!isset($match[2]) || $match[2] == '') {
         $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
-    }
-    else {
+    } else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
         $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
     }
@@ -371,8 +378,9 @@ 
 
     // populate the fieldlist from the vardefs
     $fieldlist = array();
-    if ( !isset($focus) || !($focus instanceof SugarBean) )
-        require_once($beanFiles[$beanList[$module]]);
+    if ( !isset($focus) || !($focus instanceof SugarBean) ) {
+            require_once($beanFiles[$beanList[$module]]);
+    }
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields = $focus->getFieldDefinitions();
@@ -382,14 +390,17 @@ 
     foreach ( $vardefFields as $name => $properties ) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        }
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        }
         // Bug 22730: make sure all enums have the ability to select blank as the default value.
-        if(!isset($fieldlist[$name]['options']['']))
-            $fieldlist[$name]['options'][''] = '';
+        if(!isset($fieldlist[$name]['options'][''])) {
+                    $fieldlist[$name]['options'][''] = '';
+        }
     }
 
     // fill in function return values
@@ -399,8 +410,9 @@ 
         {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
-                require_once($fieldlist[$fieldname]['function']['include']);
+            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include'])) {
+                            require_once($fieldlist[$fieldname]['function']['include']);
+            }
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
 
@@ -456,9 +468,11 @@ 
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         if(!empty($params['date_format']) && isset($params['date_format'])){
             $convert_format = "Y-m-d H:i:s";
-            if($fieldlist[$fieldname]['type'] == 'date') $convert_format = "Y-m-d";
+            if($fieldlist[$fieldname]['type'] == 'date') {
+                $convert_format = "Y-m-d";
+            }
             $fieldlist[$fieldname]['value'] = $timedate->to_display($value, $convert_format, $params['date_format']);
-        }else{
+        } else{
             $fieldlist[$fieldname]['value'] = $timedate->to_display_date_time($value, true, true);
         }
         $fieldlist[$fieldname]['name'] = $aow_field;
@@ -519,7 +533,9 @@ 
 
     $value = json_decode(html_entity_decode_utf8($value), true);
 
-    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) unset($app_list_strings['aow_date_type_list']['business_hours']);
+    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) {
+        unset($app_list_strings['aow_date_type_list']['business_hours']);
+    }
 
     $field = '';
 
@@ -527,11 +543,12 @@ 
         $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' title='' tabindex='116'>". getDateFields($module, $view, $value[0], $field_option) ."</select>&nbsp;&nbsp;";
         $field .= "<select type='text' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' onchange='date_field_change(\"$aow_field\")'  title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_operator'], $value[1]) ."</select>&nbsp;";
         $display = 'none';
-        if($value[1] == 'plus' || $value[1] == 'minus') $display = '';
+        if($value[1] == 'plus' || $value[1] == 'minus') {
+            $display = '';
+        }
         $field .= "<input  type='text' style='width:40px; display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' value='$value[2]' tabindex='116'>&nbsp;";
         $field .= "<select type='text' style='display:$display' name='$aow_field".'[3]'."' id='$aow_field".'[3]'."' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_type_list'], $value[3]) ."</select>";
-    }
-    else {
+    } else {
         $field = getDateFields($module, $view, $value[0], $field_option).' '.$app_list_strings['aow_date_operator'][$value[1]];
         if($value[1] == 'plus' || $value[1] == 'minus'){
             $field .= ' '.$value[2].' '.$app_list_strings['aow_date_type_list'][$value[3]];
@@ -547,7 +564,9 @@ 
 
     $fields = $app_list_strings['aow_date_options'];
 
-    if(!$field_option) unset($fields['field']);
+    if(!$field_option) {
+        unset($fields['field']);
+    }
 
     if ($module != '') {
         if(isset($beanList[$module]) && $beanList[$module]){
@@ -580,8 +599,7 @@ 
 
     if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
         unset($app_list_strings['aow_assign_options']['security_group']);
-    }
-    else{
+    } else{
         $securityGroups = get_bean_select_array(true, 'SecurityGroup','name', '','name',true);
     }
 
@@ -591,17 +609,19 @@ 
         $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' onchange='assign_field_change(\"$aow_field\")' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_assign_options'], $value[0]) ."</select>&nbsp;&nbsp;";
         if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
             $field .= "<input type='hidden' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' value=''  />";
-        }
-        else {
+        } else {
             $display = 'none';
-            if($value[0] == 'security_group') $display = '';
+            if($value[0] == 'security_group') {
+                $display = '';
+            }
             $field .= "<select type='text' style='display:$display' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' title='' tabindex='116'>". get_select_options_with_id($securityGroups, $value[1]) ."</select>&nbsp;&nbsp;";
         }
         $display = 'none';
-        if($value[0] == 'role' || $value[0] == 'security_group') $display = '';
+        if($value[0] == 'role' || $value[0] == 'security_group') {
+            $display = '';
+        }
         $field .= "<select type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' tabindex='116'>". get_select_options_with_id($roles, $value[2]) ."</select>&nbsp;&nbsp;";
-    }
-    else {
+    } else {
         $field = $app_list_strings['aow_assign_options'][$value[1]];
     }
     return $field;
@@ -616,8 +636,7 @@ 
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
         } else if($selected_value == $key) {
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
-        }
-        else {
+        } else {
             $option .= '<option value="'.$key.'">'.$value.'</option>';
         }
     }
@@ -644,8 +663,7 @@ 
         if(!empty($users[$key])) {
             return $users[$key];
         }
-    }
-    else if (is_file($file)){
+    } else if (is_file($file)){
         require_once($file);
         if(isset($lastUser['User']) && $lastUser['User'] != '') {
             $users_by_key = array_flip($users); // now keys are values
@@ -706,7 +724,9 @@ 
             $mod = new $beanList[$module]();
 
             foreach($mod->get_related_fields() as $field){
-                if(isset($field['link'])) $checked_link[] = $field['link'];
+                if(isset($field['link'])) {
+                    $checked_link[] = $field['link'];
+                }
                 if(!isset($field['module']) || !in_array($field['module'],$emailableModules) || (isset($field['dbType']) && $field['dbType'] == "id")){
                     continue;
                 }
@@ -749,7 +769,9 @@ 
     switch($bean->field_defs[$field]['type']) {
         case 'datetime':
         case 'datetimecombo':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;
@@ -760,7 +782,9 @@ 
             }
             break;
         case 'date':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;
@@ -771,7 +795,9 @@ 
             }
             break;
         case 'time':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;

modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php

Braces +21 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.
@@ -62,12 +64,15 @@ 
     {
         global $timedate;
 
-        if(empty($options['mypbss_date_start']))
-            $options['mypbss_date_start'] = $timedate->nowDbDate();
-        if(empty($options['mypbss_date_end']))
-            $options['mypbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
-        if(empty($options['title']))
-            $options['title'] = translate('LBL_MY_PIPELINE_FORM_TITLE', 'Home');
+        if(empty($options['mypbss_date_start'])) {
+                    $options['mypbss_date_start'] = $timedate->nowDbDate();
+        }
+        if(empty($options['mypbss_date_end'])) {
+                    $options['mypbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        }
+        if(empty($options['title'])) {
+                    $options['title'] = translate('LBL_MY_PIPELINE_FORM_TITLE', 'Home');
+        }
 
         parent::__construct($id,$options);
     }
@@ -80,11 +85,12 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (count($this->mypbss_sales_stages) > 0)
-            foreach ($this->mypbss_sales_stages as $key)
+        if (count($this->mypbss_sales_stages) > 0) {
+                    foreach ($this->mypbss_sales_stages as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        }
 
         $this->_searchFields['mypbss_sales_stages']['options'] = $app_list_strings['sales_stage_dom'];
         $this->_searchFields['mypbss_sales_stages']['input_name0'] = $selected_datax;
@@ -316,8 +322,7 @@ 
                 $datax[$key] = $app_list_strings['sales_stage_dom'][$key];
                 array_push($selected_datax, $key);
             }
-        }
-        else {
+        } else {
             $datax = $app_list_strings['sales_stage_dom'];
             $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
         }
@@ -391,8 +396,9 @@ 
             " AND opportunities.date_closed >= ". db_convert("'".$this->mypbss_date_start."'",'date').
             " AND opportunities.date_closed <= ".db_convert("'".$this->mypbss_date_end."'",'date') .
             " AND opportunities.assigned_user_id = users.id  AND opportunities.deleted=0 ";
-        if ( count($this->mypbss_sales_stages) > 0 )
-            $query .= " AND opportunities.sales_stage IN ('" . implode("','",$this->mypbss_sales_stages) . "') ";
+        if ( count($this->mypbss_sales_stages) > 0 ) {
+                    $query .= " AND opportunities.sales_stage IN ('" . implode("','",$this->mypbss_sales_stages) . "') ";
+        }
         $query .= " GROUP BY opportunities.sales_stage ,users.user_name,opportunities.assigned_user_id";
 
         return $query;

modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php

Braces +18 added lines, -11 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.
@@ -66,11 +68,13 @@ 
     {
         global $timedate;
 
-        if(empty($options['obm_date_start']))
-            $options['obm_date_start'] = $timedate->nowDbDate();
+        if(empty($options['obm_date_start'])) {
+                    $options['obm_date_start'] = $timedate->nowDbDate();
+        }
 
-        if(empty($options['obm_date_end']))
-            $options['obm_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        if(empty($options['obm_date_end'])) {
+                    $options['obm_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        }
 
         parent::__construct($id,$options);
     }
@@ -80,8 +84,9 @@ 
      */
     public function displayOptions()
     {
-        if (!isset($this->obm_ids) || count($this->obm_ids) == 0)
-            $this->_searchFields['obm_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->obm_ids) || count($this->obm_ids) == 0) {
+                    $this->_searchFields['obm_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -247,8 +252,9 @@ 
         $query .= " WHERE opportunities.date_closed >= ".db_convert("'".$this->obm_date_start."'",'date') .
             " AND opportunities.date_closed <= ".db_convert("'".$this->obm_date_end."'",'date') .
             " AND opportunities.deleted=0";
-        if (count($this->obm_ids) > 0)
-            $query .= " AND opportunities.assigned_user_id IN ('" . implode("','",$this->obm_ids) . "')";
+        if (count($this->obm_ids) > 0) {
+                    $query .= " AND opportunities.assigned_user_id IN ('" . implode("','",$this->obm_ids) . "')";
+        }
         $query .= " GROUP BY sales_stage,".
             db_convert('opportunities.date_closed','date_format',array("'%Y-%m'"),array("'YYYY-MM'")) .
             " ORDER BY m";
@@ -274,8 +280,9 @@ 
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
-                $chart['key'][] = $stage;
+            if(!in_array($stage,$chart['key'])) {
+                            $chart['key'][] = $stage;
+            }
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
             $chart['data'][count($chart['data'])-1][] = $formattedFloat;

modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php

Braces +19 added lines, -13 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -62,17 +64,19 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (!empty($this->pbls_lead_sources) && sizeof($this->pbls_lead_sources) > 0)
-            foreach ($this->pbls_lead_sources as $key)
+        if (!empty($this->pbls_lead_sources) && sizeof($this->pbls_lead_sources) > 0) {
+                    foreach ($this->pbls_lead_sources as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        }
 
         $this->_searchFields['pbls_lead_sources']['options'] = array_filter($app_list_strings['lead_source_dom']);
         $this->_searchFields['pbls_lead_sources']['input_name0'] = $selected_datax;
 
-        if (!isset($this->pbls_ids) || count($this->pbls_ids) == 0)
-            $this->_searchFields['pbls_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->pbls_ids) || count($this->pbls_ids) == 0) {
+                    $this->_searchFields['pbls_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -241,12 +245,14 @@ 
         $query = "SELECT lead_source,sum(amount_usdollar/1000) as total,count(*) as opp_count ".
             "FROM opportunities ";
         $query .= "WHERE opportunities.deleted=0 ";
-        if ( count($this->pbls_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->pbls_ids)."') ";
-        if ( count($this->pbls_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->pbls_lead_sources)."') ";
-        else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        if ( count($this->pbls_ids) > 0 ) {
+                    $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->pbls_ids)."') ";
+        }
+        if ( count($this->pbls_lead_sources) > 0 ) {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",$this->pbls_lead_sources)."') ";
+        } else {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        }
         $query .= "GROUP BY lead_source ORDER BY total DESC";
 
         return $query;

modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php

Braces +25 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.
@@ -61,17 +63,19 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (!empty($this->lsbo_lead_sources) && sizeof($this->lsbo_lead_sources) > 0)
-            foreach ($this->lsbo_lead_sources as $key)
+        if (!empty($this->lsbo_lead_sources) && sizeof($this->lsbo_lead_sources) > 0) {
+                    foreach ($this->lsbo_lead_sources as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        }
 
         $this->_searchFields['lsbo_lead_sources']['options'] = array_filter($app_list_strings['lead_source_dom']);
         $this->_searchFields['lsbo_lead_sources']['input_name0'] = $selected_datax;
 
-        if (!isset($this->lsbo_ids) || count($this->lsbo_ids) == 0)
-            $this->_searchFields['lsbo_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->lsbo_ids) || count($this->lsbo_ids) == 0) {
+                    $this->_searchFields['lsbo_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -131,8 +135,9 @@ 
 
 
         $url_params = array();
-        if ( count($this->lsbo_ids) > 0 )
-            $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
+        if ( count($this->lsbo_ids) > 0 ) {
+                    $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
+        }
 
 
         $data = $this->getChartData($this->constructQuery());
@@ -253,12 +258,14 @@ 
         $query = "SELECT lead_source,sales_stage,sum(amount_usdollar/1000) as total, ".
             "count(*) as opp_count FROM opportunities ";
         $query .= " WHERE opportunities.deleted=0 ";
-        if ( count($this->lsbo_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
-        if ( count($this->lsbo_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
-        else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        if ( count($this->lsbo_ids) > 0 ) {
+                    $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
+        }
+        if ( count($this->lsbo_lead_sources) > 0 ) {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
+        } else {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        }
         $query .= " GROUP BY sales_stage,lead_source ORDER BY lead_source,sales_stage";
 
         return $query;
@@ -282,8 +289,9 @@ 
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
-                $chart['key'][] = $stage;
+            if(!in_array($stage,$chart['key'])) {
+                            $chart['key'][] = $stage;
+            }
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
             $chart['data'][count($chart['data'])-1][] = $formattedFloat;