adamjakab / SuiteCRM

modules/AOR_Reports/AOR_Report.php

Braces +42 added lines, -34 removed lines

@@ -211,8 +211,10 @@ 
                 $html = '<script src="modules/AOR_Reports/js/Chart.js"></script>';
                 break;
             case self::CHART_TYPE_RGRAPH:
-                if($_REQUEST['module']!= 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
+                if($_REQUEST['module']!= 'Home') {
+                    //Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
                     require_once('include/SuiteGraphs/RGraphIncludes.php');
+                }
 
                 break;
         }
@@ -235,15 +237,13 @@ 
 
         if(count($rows) > 1) {
             $GLOBALS['log']->fatal('ambiguous group display for report ' . $this->id);
-        }
-        else if(count($rows) == 1){
+        } else if(count($rows) == 1){
             $rows[0]['module_path'] = unserialize(base64_decode($rows[0]['module_path']));
             if(!$rows[0]['module_path'][0]) {
                 $module = new $beanList[$this->report_module]();
                 $rows[0]['field_id_name'] = $module->field_defs[$rows[0]['field']]['id_name'] ? $module->field_defs[$rows[0]['field']]['id_name'] : $module->field_defs[$rows[0]['field']]['name'];
                 $rows[0]['module_path'][0] = $module->table_name;
-            }
-            else {
+            } else {
                 $rows[0]['field_id_name'] = $rows[0]['field'];
             }
             $path[] = $rows[0];
@@ -255,8 +255,7 @@ 
             }
 
             return $this->buildMultiGroupReport($offset, $links, $level+1, $path);
-        }
-        else if(!$rows) {
+        } else if(!$rows) {
             if($path) {
                 $html = '';
                 foreach ($path as $pth) {
@@ -274,12 +273,10 @@ 
                     }
                 }
                 return $html;
-            }
-            else {
+            } else {
                 return $this->build_group_report($offset, $links);
             }
-        }
-        else {
+        } else {
             throw new Exception('incorrect results');
         }
         throw new Exception('incorrect state');
@@ -415,8 +412,7 @@ 
                 foreach($extra['select'] as $selectField => $selectAlias) {
                     if($selectAlias) {
                         $query_array['select'][] = $selectField . " AS " . $selectAlias;
-                    }
-                    else {
+                    } else {
                         $query_array['select'][] = $selectField;
                     }
                 }
@@ -471,14 +467,18 @@ 
             $result = $this->db->query($query);
 
             while ($row = $this->db->fetchByAssoc($result)) {
-                if($html != '') $html .= '<br />';
+                if($html != '') {
+                    $html .= '<br />';
+                }
 
                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }
 
-        if($html == '') $html = $this->build_report_html($offset, $links);
+        if($html == '') {
+            $html = $this->build_report_html($offset, $links);
+        }
         return $html;
 
     }
@@ -663,7 +663,9 @@ 
                     if($att['total']){
                         $totals[$name][] = $row[$name];
                     }
-                    if($att['link'] && $links) $html .= "</a>";
+                    if($att['link'] && $links) {
+                        $html .= "</a>";
+                    }
                     $html .= "</td>";
                 }
             }
@@ -747,7 +749,7 @@ 
             if($field['total']){
                 $totalLabel = $field['label'] ." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
-            }else{
+            } else{
                 $html .= "<th></th>";
             }
         }
@@ -759,7 +761,7 @@ 
             }
             if($field['total'] && isset($totals[$label])){
                 $html .= "<td>".$this->calculateTotal($field['total'],$totals[$label])."</td>";
-            }else{
+            } else{
                 $html .= "<td></td>";
             }
         }
@@ -835,10 +837,11 @@ 
             $csv .= "\r\n";
             foreach($fields as $name => $att){
                 if($att['display']){
-                    if($att['function'] != '' )
-                        $csv .= $this->encloseForCSV($row[$name]);
-                    else
-                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                    if($att['function'] != '' ) {
+                                            $csv .= $this->encloseForCSV($row[$name]);
+                    } else {
+                                            $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                    }
                     $csv .= $delimiter;
                 }
             }
@@ -1022,7 +1025,9 @@ 
 
                 $query['select'][] = $select_field ." AS '".$field->label."'";
 
-                if($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
+                if($field->group_display == 1 && $group_value) {
+                    $query['where'][] = $select_field." = '".$group_value."' AND ";
+                }
                     ++$i;
             }
         }
@@ -1047,13 +1052,13 @@ 
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
-                            }else{
+                            } else{
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($alias);
                             }
 
-                        }else{
+                        } else{
                             $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                             $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
@@ -1268,12 +1273,16 @@ 
 
                         case 'Multi':
                             $sep = ' AND ';
-                            if ($condition->operator == 'Equal_To') $sep = ' OR ';
+                            if ($condition->operator == 'Equal_To') {
+                                $sep = ' OR ';
+                            }
                             $multi_values = unencodeMultienum($condition->value);
                             if (!empty($multi_values)) {
                                 $value = '(';
                                 foreach ($multi_values as $multi_value) {
-                                    if ($value != '(') $value .= $sep;
+                                    if ($value != '(') {
+                                        $value .= $sep;
+                                    }
                                     $value .= $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . " '" . $multi_value . "'";
                                 }
                                 $value .= ')';
@@ -1313,21 +1322,20 @@ 
                     }
 
 
-                    if (!$where_set) $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                    if (!$where_set) {
+                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                    }
 
                     $tiltLogicOp = false;
-                }
-                else if($condition->parenthesis) {
+                } else if($condition->parenthesis) {
                     if($condition->parenthesis == 'START') {
                         $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) .  '(';
                         $tiltLogicOp = true;
-                    }
-                    else {
+                    } else {
                         $query['where'][] = ')';
                         $tiltLogicOp = false;
                     }
-                }
-                else {
+                } else {
                     $GLOBALS['log']->debug('illegal condition');
                 }
 

modules/AOR_Reports/views/view.edit.php

Braces +3 added lines, -4 removed lines

@@ -94,8 +94,7 @@ 
             }
             if(isset($conditions[$condition_item['condition_order']])) {
                 $conditions[] = $condition_item;
-            }
-            else {
+            } else {
                 $conditions[$condition_item['condition_order']] = $condition_item;
             }
         }
@@ -144,7 +143,7 @@ 
         $modulePathDisplay[] = $currentBean->module_name;
         if(is_array($modulePath)) {
             $split = $modulePath;
-        }else{
+        } else{
             $split = explode(':', $modulePath);
         }
         if ($split && $split[0] == $currentBean->module_dir) {
@@ -162,7 +161,7 @@ 
 
             if(!empty($moduleLabel)){
                 $modulePathDisplay[] = $moduleLabel;
-            }else {
+            } else {
                 $modulePathDisplay[] = $currentBean->module_name;
             }
         }

modules/AOR_Reports/views/view.detail.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             }
             if(isset($parameters[$condition_item['condition_order']])) {
                 $parameters[] = $condition_item;
-            }
-            else {
+            } else {
                 $parameters[$condition_item['condition_order']] = $condition_item;
             }
         }

modules/AOR_Reports/controller.php

Braces +110 added lines, -51 removed lines

@@ -191,10 +191,11 @@ 
 
             for($x =0; $x < $countOfCharts; $x++)
             {
-                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus)
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
-                else
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
+                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus) {
+                                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
+                } else {
+                                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
+                }
             }
 
 /*            foreach($graphs as $g)
@@ -241,7 +242,7 @@ 
             $pdf->WriteHTML($printable,3);
             $pdf->Output($this->bean->name.'.pdf', "D");
 
-        }catch(mPDF_exception $e){
+        } catch(mPDF_exception $e){
             echo $e;
         }
 
@@ -259,7 +260,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:100px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_function_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_function_list'][$value];
         }
         die;
@@ -278,11 +279,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -329,7 +336,7 @@ 
         $app_list_strings['aor_operator_list'];
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_operator_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_operator_list'][$value];
         }
         die;
@@ -348,11 +355,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -403,7 +416,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_condition_type_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_condition_type_list'][$value];
         }
         die;
@@ -423,11 +436,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -460,7 +479,9 @@ 
                 break;
             case 'relate':
                 $valid_opp = array('Value','Field');
-                if($vardef['module'] == 'Users') $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
+                if($vardef['module'] == 'Users') {
+                    $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
+                }
                 break;
             default:
                 $valid_opp = array('Value','Field');
@@ -475,7 +496,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_action_type_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_action_type_list'][$value];
         }
         die;
@@ -494,18 +515,26 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         switch($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                } else{
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
@@ -518,7 +547,7 @@ 
             case 'Period':
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getDropdownList('date_time_period_list',$_REQUEST['aor_value']) ."</select>";
-                }else{
+                } else{
                     echo getDropdownList('date_time_period_list',$_REQUEST['aor_value']);
                 }
 
@@ -540,23 +569,33 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         switch($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                } else{
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
             case 'Date':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 echo getDateField($module, $aor_field, $view, $value);
                 break;
             Case 'Round_Robin';
@@ -575,11 +614,17 @@ 
 
     protected function action_getModuleField()
     {
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         echo getModuleField($_REQUEST['aor_module'],$_REQUEST['aor_fieldname'], $_REQUEST['aor_newfieldname'], $view, $value );
         die;
@@ -591,18 +636,26 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
         switch($_REQUEST['aor_type']) {
             case 'Field':
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
+                    $module = $_REQUEST['alt_module'];
+                }
                 if($view == 'EditView'){
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
-                }else{
+                } else{
                     echo getModuleFields($module, $view, $value);
                 }
                 break;
@@ -624,11 +677,17 @@ 
         $fieldname = $_REQUEST['aor_fieldname'];
         $aor_field = $_REQUEST['aor_newfieldname'];
 
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
-        else $view= 'EditView';
+        if(isset($_REQUEST['view'])) {
+            $view = $_REQUEST['view'];
+        } else {
+            $view= 'EditView';
+        }
 
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
-        else $value = '';
+        if(isset($_REQUEST['aor_value'])) {
+            $value = $_REQUEST['aor_value'];
+        } else {
+            $value = '';
+        }
 
 
         require_once($beanFiles[$beanList[$module]]);
@@ -652,7 +711,7 @@ 
 
         if($view == 'EditView'){
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_rel_action_type_list'], $value) ."</select>";
-        }else{
+        } else{
             echo $app_list_strings['aor_rel_action_type_list'][$value];
         }
         die;

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.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');
+}
 
 
 require_once('include/Dashlets/Dashlet.php');
@@ -63,7 +65,7 @@ 
         if(!empty($this->report->id)) {
             //return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_CHARTJS);
             return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_RGRAPH);
-        }else{
+        } else{
             return '';
         }
     }

modules/DynamicFields/DynamicField.php

Braces +84 added lines, -59 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
@@ -103,9 +104,12 @@ 
     */
     function buildCache($module = false, $saveCache=true) {
         //We can't build the cache while installing as the required database tables may not exist.
-        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db']))
+        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db'])) {
+                    return false;
+        }
+        if($module == '../data') {
             return false;
-        if($module == '../data')return false;
+        }
 
         static $results = array ( ) ;
 
@@ -113,8 +117,7 @@ 
         if (! empty ( $module )) {
             $where .= " custom_module='$module' AND ";
             unset( $results[ $module ] ) ; // clear out any old results for the module as $results is declared static
-        }
-        else
+        } else
         {
             $results = array ( ) ; // clear out results - if we remove a module we don't want to have its old vardefs hanging around
         }
@@ -138,10 +141,12 @@ 
             $vardef = $field->get_field_def ();
             $vardef ['id'] = $row ['id'];
             $vardef ['custom_module'] = $row ['custom_module'];
-            if (empty ( $vardef ['source'] ))
-                $vardef ['source'] = 'custom_fields';
-            if (empty ( $results [$row ['custom_module']] ))
-                $results [$row ['custom_module']] = array ( );
+            if (empty ( $vardef ['source'] )) {
+                            $vardef ['source'] = 'custom_fields';
+            }
+            if (empty ( $results [$row ['custom_module']] )) {
+                            $results [$row ['custom_module']] = array ( );
+            }
             $results [$row ['custom_module']] [$row ['name']] = $vardef;
         }
         if (empty ( $module )) {
@@ -151,7 +156,7 @@ 
         } else {
             if (! empty ( $results [$module] )) {
                 $this->saveToVardef ( $module, $results [$module], $saveCache);
-            }else{
+            } else{
                 $this->saveToVardef ( $module, false, $saveCache);
             }
         }
@@ -196,7 +201,9 @@ 
                 //if the vardef isn't loaded let's try loading it.
                 VardefManager::refreshVardefs($module,$object, null, false);
                 //if it's still not loaded we really don't have anything useful to cache
-                if(empty($GLOBALS['dictionary'][$object]['fields']))return;
+                if(empty($GLOBALS['dictionary'][$object]['fields'])) {
+                    return;
+                }
             }
             if (!isset($GLOBALS['dictionary'][$object]['custom_fields'])) {
                 $GLOBALS['dictionary'][$object]['custom_fields'] = false;
@@ -266,8 +273,7 @@ 
         if (empty($expandedList) )
         {
             $select = ",{$this->bean->table_name}_cstm.*" ;
-        }
-        else
+        } else
         {
             $select = '';
             $isList = is_array($expandedList);
@@ -276,8 +282,9 @@ 
                 if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))){
                     // assumption: that the column name in _cstm is the same as the field name. Currently true.
                     // however, two types of dynamic fields do not have columns in the custom table - html fields (they're readonly) and flex relates (parent_name doesn't exist)
-                    if ( $field['type'] != 'html' && $name != 'parent_name')
-                        $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    if ( $field['type'] != 'html' && $name != 'parent_name') {
+                                            $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    }
                 }
             }
         }
@@ -332,8 +339,7 @@ 
             else if(!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
             {
                 $name_field = "$joinTableAlias." . $field_def['rname'];
-            }
-            else
+            } else
             {
                 $name_field = "$joinTableAlias.name";
             }
@@ -355,12 +361,16 @@ 
    function fill_relationships(){
         global $beanList, $beanFiles;
         if(!empty($this->bean->relDepth)) {
-            if($this->bean->relDepth > 1)return;
-        }else{
+            if($this->bean->relDepth > 1) {
+                return;
+            }
+        } else{
             $this->bean->relDepth = 0;
         }
         foreach($this->bean->field_defs as $field){
-            if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
+            if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                continue;
+            }
             if($field['type'] == 'relate'){
                 $related_module =$field['ext2'];
                 $name = $field['name'];
@@ -399,8 +409,12 @@ 
             $first = true;
             foreach($this->bean->field_defs as $name=>$field){
 
-                if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-                if($field['type'] == 'html' || $field['type'] == 'parent')continue;
+                if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                    continue;
+                }
+                if($field['type'] == 'html' || $field['type'] == 'parent') {
+                    continue;
+                }
                 if(isset($this->bean->$name)){
                     $quote = "'";
 
@@ -409,16 +423,17 @@ 
                         if(!isset($this->bean->$name) || !is_numeric($this->bean->$name) ){
                             if($field['required']){
                                 $this->bean->$name = 0;
-                            }else{
+                            } else{
                                 $this->bean->$name = 'NULL';
                             }
                         }
                     }
                     if ( $field['type'] == 'bool' ) {
-                        if ( $this->bean->$name === FALSE )
-                            $this->bean->$name = '0';
-                        elseif ( $this->bean->$name === TRUE )
-                            $this->bean->$name = '1';
+                        if ( $this->bean->$name === FALSE ) {
+                                                    $this->bean->$name = '0';
+                        } elseif ( $this->bean->$name === TRUE ) {
+                                                    $this->bean->$name = '1';
+                        }
                     }
 
                     $val = $this->bean->$name;
@@ -431,7 +446,7 @@ 
                         if($first){
                             $query .= " $name=$quote".$GLOBALS['db']->quote($val)."$quote";
 
-                        }else{
+                        } else{
                             $query .= " ,$name=$quote".$GLOBALS['db']->quote($val)."$quote";
                         }
                     }
@@ -450,7 +465,7 @@ 
             if(!$first){
                 if(!$isUpdate){
                     $GLOBALS['db']->query($queryInsert);
-                }else{
+                } else{
                     $checkquery = "SELECT id_c FROM {$this->bean->table_name}_cstm WHERE id_c = '{$this->bean->id}'";
                     if ( $GLOBALS['db']->getOne($checkquery) ) {
                         $result = $GLOBALS['db']->query($query);
@@ -485,8 +500,9 @@ 
 
         $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='" . $this->module . $widget->name . "'");
         $sql = $widget->get_db_delete_alter_table( $this->bean->table_name . "_cstm" ) ;
-        if (! empty( $sql ) )
-            $GLOBALS['db']->query( $sql );
+        if (! empty( $sql ) ) {
+                    $GLOBALS['db']->query( $sql );
+        }
 
         $this->removeVardefExtension($widget);
         VardefManager::clearVardef();
@@ -504,19 +520,21 @@ 
         $name = $this->getDBName($name);
         $vardefs = $GLOBALS['dictionary'][$this->bean->object_name]['fields'];
         if(!empty($vardefs)){
-            if(empty($type) && empty($name))
-                return false;
-            else if(empty($type))
-                return !empty($vardefs[$name]);
-            else if(empty($name)){
+            if(empty($type) && empty($name)) {
+                            return false;
+            } else if(empty($type)) {
+                            return !empty($vardefs[$name]);
+            } else if(empty($name)){
                 foreach($vardefs as $def){
-                    if(!empty($def['type']) && $def['type'] == $type)
-                        return true;
+                    if(!empty($def['type']) && $def['type'] == $type) {
+                                            return true;
+                    }
                 }
                 return false;
-            }else
-                return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
-        }else{
+            } else {
+                            return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
+            }
+        } else{
             return false;
         }
     }
@@ -539,7 +557,7 @@ 
         $label = strtoupper( $field->label );
         if(!empty($id)){
             $is_update = true;
-        }else{
+        } else{
             $db_name = $this->getDBName($field->name);
             $field->name = $db_name;
         }
@@ -550,8 +568,10 @@ 
         $fmd->vname = $label;
         $fmd->type = $field->type;
         $fmd->help = $field->help;
-        if (!empty($field->len))
-            $fmd->len = $field->len; // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
+        if (!empty($field->len)) {
+                    $fmd->len = $field->len;
+        }
+        // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
         $fmd->required = ($field->required ? 1 : 0);
         $fmd->default_value = $field->default;
         $fmd->ext1 = $field->ext1;
@@ -591,7 +611,7 @@ 
 	                	$GLOBALS['db']->query($query, true, "Cannot set default");
 	            	}
                 }
-            }else{
+            } else{
                 $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
                 if(!empty($query)){
                 	$GLOBALS['db']->query($query, true, "Cannot modify field");
@@ -671,16 +691,16 @@ 
 
         $out .= "\n ?>";
 
-        if (!file_exists($this->base_path))
-            mkdir_recursive($this->base_path);
+        if (!file_exists($this->base_path)) {
+                    mkdir_recursive($this->base_path);
+        }
 
         if( $fh = @sugar_fopen( $file_loc, 'w' ) )
         {
             fputs( $fh, $out);
             fclose( $fh );
             return true ;
-        }
-        else
+        } else
         {
             return false ;
         }
@@ -801,8 +821,9 @@ 
     	$out = "";
         if($this->bean->hasCustomFields()){
 	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
-                    continue;
+	        	if(empty($data['source']) || $data['source'] != 'custom_fields') {
+	        	                    continue;
+	        	}
 	            $out .= $this->add_existing_custom_field($data, $execute);
 	        }
     	}
@@ -817,8 +838,9 @@ 
         $query = "/*MISSING IN DATABASE - {$data['name']} -  ROW*/\n"
                 . $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
         $out = $query . "\n";
-        if ($execute)
-            $GLOBALS['db']->query($query);
+        if ($execute) {
+                    $GLOBALS['db']->query($query);
+        }
 
         return $out;
     }
@@ -827,16 +849,18 @@ 
     {
         $out = $this->createCustomTable($execute);
         //If the table didn't exist, createCustomTable will have returned all the SQL to create and populate it
-        if (!empty($out))
-            return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
         //Otherwise make sure all the custom fields defined in the vardefs exist in the custom table.
         //We aren't checking for data types, just that the column exists.
         $db = $GLOBALS['db'];
         $tablename = $this->bean->table_name."_cstm";
         $compareFieldDefs = $db->get_columns($tablename);
         foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
-                continue;
+            if(empty($data['source']) || $data['source'] != 'custom_fields') {
+                            continue;
+            }
             /**
              * @bug 43471
              * @issue 43471
@@ -850,8 +874,9 @@ 
             }
             $out .= $this->add_existing_custom_field($data, $execute);
         }
-        if (!empty($out))
-            $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
 
         return $out;
     }

modules/DynamicFields/UpgradeFields.php

Braces +10 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.
@@ -89,15 +91,19 @@ 
 			$the_field->set($fieldDef);
 				
 				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					if(!$simulate) {
+					    $db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					}
 					unset($fields[$col]);
 					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
+				} else{
 					if($col != 'id_c'){
 					if(trim($the_field->get_db_type()) != trim($type)){
 						
 					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+					if(!$simulate) {
+					    $db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));
+					}
 					}
 					}
 					

modules/Relationships/Relationship.php

Braces +4 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.
@@ -197,8 +199,7 @@ 
 			{
 					$this->$field = $value;
 			}
-		}
-		else {
+		} else {
 			$GLOBALS['log']->fatal('Error fetching relationship from cache '.$relationship_name);
 			return false;
 		}

modules/jjwg_Maps/views/view.geocoding_test.php

Braces +7 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class Jjwg_MapsViewGeocoding_Test extends SugarView {
 
@@ -10,8 +12,10 @@ 
 
 	function display() {
 		
-        if (!isset($_REQUEST['geocoding_address'])) $_REQUEST['geocoding_address'] = '';
-?>
+        if (!isset($_REQUEST['geocoding_address'])) {
+            $_REQUEST['geocoding_address'] = '';
+        }
+        ?>
 
 <div class="moduleTitle"><h2><?php echo $GLOBALS['mod_strings']['LBL_MAP_ADDRESS_TEST']; ?></h2><div class="clear"></div></div>
 <div class="clear"></div>