adamjakab / SuiteCRM

include/utils/additional_details.php

Braces +3 added lines, -1 removed lines

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

include/ListView/ListViewSubPanel.php

Braces +42 added lines, -83 removed lines

@@ -111,8 +111,7 @@ 
                     $this->smartyTemplate->assign("THEME", $this->local_theme);
                     $this->smartyTemplate->assign("IMAGE_PATH", $this->local_image_path);
                     $this->smartyTemplate->assign("MODULE_NAME", $this->local_current_module);
-                }
-                else {
+                } else {
                     $GLOBALS['log']->error("NO SMARTY TEMPLATE PATH DEFINED CANNOT CREATE SMARTY TEMPLATE");
                 }
             }
@@ -145,8 +144,7 @@ 
 
             if ($subpanel_def->isCollection()) {
                 $thepanel = $subpanel_def->get_header_panel_def();
-            }
-            else {
+            } else {
                 $thepanel = $subpanel_def;
             }
 
@@ -212,15 +210,13 @@ 
 
                         if (!isset($count)) {
                             $count = 0;
-                        }
-                        else {
+                        } else {
                             $count++;
                         }
 
                         if ($col_count == 0 || $column_name == 'name') {
                             $footable = 'data-toggle="true"';
-                        }
-                        else {
+                        } else {
                             $footable = 'data-hide="phone"';
                             if ($col_count > 2) {
                                 $footable = 'data-hide="phone,phonelandscape"';
@@ -230,8 +226,7 @@ 
                             }
                         }
 
-                    }
-                    else {
+                    } else {
                         $buttons = true;
                     }
                 }
@@ -272,8 +267,7 @@ 
             $subpanel_list = array();
             if ($subpanel_def->isCollection()) {
                 $subpanel_list = $subpanel_def->sub_subpanels;
-            }
-            else {
+            } else {
                 $subpanel_list[] = $subpanel_def;
             }
 
@@ -313,8 +307,7 @@ 
                 if (isset($processed_ids[$aItem->id])) {
                     continue;
 
-                }
-                else {
+                } else {
                     $processed_ids[$aItem->id] = 1;
                 }
 
@@ -325,8 +318,7 @@ 
                 if ($this->shouldProcess) {
                     if ($aItem->ACLAccess('EditView')) {
                         $widget_contents[$aVal][0] = "<input type='checkbox' class='checkbox' name='mass[]' value='" . $fields['ID'] . "' />";
-                    }
-                    else {
+                    } else {
                         $widget_contents[$aVal][0] = '';
                     }
 //                    if ($aItem->ACLAccess('DetailView')) {
@@ -353,8 +345,7 @@ 
                 //the sub-panel and panel in the bean being processed.
                 if ($subpanel_def->isCollection()) {
                     $thepanel = $subpanel_def->sub_subpanels[$aItem->panel_name];
-                }
-                else {
+                } else {
                     $thepanel = $subpanel_def;
                 }
 
@@ -368,8 +359,7 @@ 
                 global $current_user;
                 if (is_admin($current_user)) {
                     $aclaccess_is_owner = true;
-                }
-                else {
+                } else {
                     $aclaccess_is_owner = $aItem->isOwner($current_user->id);
                 }
 
@@ -410,8 +400,7 @@ 
                         $count++;
                         $widget_contents[$aVal][$field_name] = '&nbsp;';
 
-                    }
-                    else {
+                    } else {
                         if ($usage != 'query_only') {
                             $list_field['name'] = $field_name;
 
@@ -422,15 +411,13 @@ 
                                 $list_field['owner_id'] = $aItem->$owner_field;
                                 $list_field['owner_module'] = $aItem->$module_field;
 
-                            }
-                            else {
+                            } else {
                                 $list_field['owner_id'] = false;
                                 $list_field['owner_module'] = false;
                             }
                             if (isset($list_field['alias'])) {
                                 $list_field['name'] = $list_field['alias'];
-                            }
-                            else {
+                            } else {
                                 $list_field['name'] = $field_name;
                             }
                             $list_field['fields'] = $fields;
@@ -448,15 +435,13 @@ 
                                 if (isset($vardef['type'])) {
                                     $fieldType = isset($vardef['custom_type']) ? $vardef['custom_type'] : $vardef['type'];
                                     $tmpField = SugarFieldHandler::getSugarField($fieldType, true);
-                                }
-                                else {
+                                } else {
                                     $tmpField = null;
                                 }
 
                                 if ($tmpField != null) {
                                     $widget_contents[$aVal][$field_name] = SugarFieldHandler::displaySmarty($list_field['fields'], $vardef, 'ListView', $list_field);
-                                }
-                                else {
+                                } else {
                                     // No SugarField for this particular type
                                     // Use the old, icky, SugarWidget for now
                                     $widget_contents[$aVal][$field_name] = $layout_manager->widgetDisplay($list_field);
@@ -476,8 +461,7 @@ 
 
                                     }
                                     $widget_contents[$aVal][$field_name] = $layout_manager->widgetDisplay($list_field);
-                                }
-                                else {
+                                } else {
                                     if (isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink') {
                                         $widget_contents[$aVal][$field_name] = $layout_manager->widgetDisplay($list_field);
                                     }
@@ -487,8 +471,7 @@ 
                                 if (empty($widget_contents)) {
                                     $widget_contents[$aVal][$field_name] = '&nbsp;';
                                 }
-                            }
-                            else {
+                            } else {
                                 // This handles the edit and remove buttons and icon widget
                                 if (isset($list_field['widget_class']) && $list_field['widget_class'] == "SubPanelIcon") {
                                     $count++;
@@ -497,23 +480,20 @@ 
                                     if (empty($widget_contents[$aVal][$field_name])) {
                                         $widget_contents[$aVal][$field_name] = '&nbsp;';
                                     }
-                                }
-                                elseif (preg_match("/button/i", $list_field['name'])) {
+                                } elseif (preg_match("/button/i", $list_field['name'])) {
                                     if ((($list_field['name'] === 'edit_button' && $field_acl['EditView']) || ($list_field['name'] === 'close_button' && $field_acl['EditView']) || ($list_field['name'] === 'remove_button' && $field_acl['Delete'])) && '' != ($_content = $layout_manager->widgetDisplay($list_field))) {
                                         $button_contents[$aVal][] = $_content;
                                         unset($_content);
-                                    }
-                                    else {
+                                    } else {
                                         $doNotProcessTheseActions = array("edit_button", "close_button","remove_button");
                                         if(!in_array($list_field['name'],$doNotProcessTheseActions) && '' != ($_content = $layout_manager->widgetDisplay($list_field))){
                                             $button_contents[$aVal][] = $_content;
                                             unset($_content);
-                                        }else{
+                                        } else{
                                             $button_contents[$aVal][] = '';
                                         }
                                     }
-                                }
-                                else {
+                                } else {
                                     $count++;
 //                                    $this->smartyTemplate->assign('CLASS', "");
                                     $widget_contents[$aVal][$field_name] = $layout_manager->widgetDisplay($list_field);
@@ -563,8 +543,7 @@ 
             // Determine the start location of the last page
             if ($row_count == 0) {
                 $number_pages = 0;
-            }
-            else {
+            } else {
                 $number_pages = floor(($row_count - 1) / $this->records_per_page);
             }
 
@@ -612,22 +591,18 @@ 
                 if (0 == $current_offset) {
                     $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("start_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
                     $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("previous_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
-                }
-                else {
+                } else {
                     if ($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
                         $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
                         $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
-                    }
-                    elseif ($this->shouldProcess) {
+                    } elseif ($this->shouldProcess) {
                         $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
                         $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
-                    }
-                    else {
+                    } else {
                         $onClick = '';
                         if (0 != preg_match('/javascript.*/', $start_URL)) {
                             $onClick = "\"$start_URL;\"";
-                        }
-                        else {
+                        } else {
                             $onClick = "'location.href=\"$start_URL\";'";
                         }
                         $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
@@ -635,8 +610,7 @@ 
                         $onClick = '';
                         if (0 != preg_match('/javascript.*/', $previous_URL)) {
                             $onClick = "\"$previous_URL;\"";
-                        }
-                        else {
+                        } else {
                             $onClick = "'location.href=\"$previous_URL\";'";
                         }
                         $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
@@ -646,25 +620,21 @@ 
                 if ($last_offset <= $current_offset) {
                     $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("end_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
                     $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("next_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
-                }
-                else {
+                } else {
                     if ($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
                         $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
                         if (!empty($sugar_config['disable_count_query'])) {
                             $end_link = '';
                         }
                         $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
-                    }
-                    elseif ($this->shouldProcess) {
+                    } elseif ($this->shouldProcess) {
                         $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
                         $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
-                    }
-                    else {
+                    } else {
                         $onClick = '';
                         if (0 != preg_match('/javascript.*/', $next_URL)) {
                             $onClick = "\"$next_URL;\"";
-                        }
-                        else {
+                        } else {
                             $onClick = "'location.href=\"$next_URL\";'";
                         }
                         $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
@@ -672,8 +642,7 @@ 
                         $onClick = '';
                         if (0 != preg_match('/javascript.*/', $end_URL)) {
                             $onClick = "\"$end_URL;\"";
-                        }
-                        else {
+                        } else {
                             $onClick = "'location.href=\"$end_URL\";'";
                         }
                         $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
@@ -711,8 +680,7 @@ 
                         $this->show_plus = true;
                         $total = $pageTotal;
                         $total_label = $total . '+';
-                    }
-                    else {
+                    } else {
                         $this->show_plus = false;
                         $total_label = $total;
                     }
@@ -728,8 +696,7 @@ 
                         'class' => 'clickMenu selectmenu', 'id' => 'selectLink', 'buttons' => $menuItems, 'flat' => false,
                     ), $this->smartyTemplate);
 
-                }
-                else {
+                } else {
                     $select_link = "&nbsp;";
                 }
 
@@ -737,8 +704,7 @@ 
 
                 if ($this->show_delete_button) {
                     $delete_link = '<input class="button" type="button" id="delete_button" name="Delete" value="' . $this->local_app_strings['LBL_DELETE_BUTTON_LABEL'] . '" onclick="return sListView.send_mass_update(\'selected\',\'' . $this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'] . '\', 1)">';
-                }
-                else {
+                } else {
                     $delete_link = '&nbsp;';
                 }
 
@@ -779,8 +745,7 @@ 
                     }
                     $export_link = "&nbsp;";
                     $merge_link = "&nbsp;";
-                }
-                elseif ($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
+                } elseif ($_REQUEST['module'] != "Accounts" && $_REQUEST['module'] != "Cases" && $_REQUEST['module'] != "Contacts" && $_REQUEST['module'] != "Leads" && $_REQUEST['module'] != "Opportunities") {
                     $merge_link = "&nbsp;";
                 }
 
@@ -804,20 +769,17 @@ 
                         //attempt to get the query to recreate this subpanel
                         if (!empty($this->response)) {
                             $response =& $this->response;
-                        }
-                        else {
+                        } else {
                             $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
                             $this->response = $response;
                         }
                         //if query is present, then pass it in as parameter
                         if (isset($response['query']) && !empty($response['query'])) {
                             $html_text .= $subpanelTiles->get_buttons($subpanel_def, $response['query']);
-                        }
-                        else {
+                        } else {
                             $html_text .= $subpanelTiles->get_buttons($subpanel_def);
                         }
-                    }
-                    else {
+                    } else {
                         $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  nowrap>$select_link&nbsp;$export_link&nbsp;$delete_link&nbsp;$selected_objects_span";
                     }
                     $html_text .= "</td>\n<td nowrap align=\"right\">" . $start_link . "&nbsp;&nbsp;" . $previous_link . "&nbsp;&nbsp;<span class='pageNumbers'>(" . $start_record . " - " . $end_record . " " . $this->local_app_strings['LBL_LIST_OF'] . " " . $row_count . ")</span>&nbsp;&nbsp;" . $next_link . "&nbsp;&nbsp;" . $end_link . "</td></tr></table>\n";
@@ -868,12 +830,10 @@ 
 
                     if ($this->base_URL == "/index.php") {
                         $this->base_URL .= "?";
-                    }
-                    else {
+                    } else {
                         if ($fullRequestString == substr($this->baseURL, '-' . strlen($fullRequestString))) {
                             $this->base_URL = preg_replace("/&" . $key . "\=.*/", "", $this->base_URL);
-                        }
-                        else {
+                        } else {
                             $this->base_URL = preg_replace("/&" . $key . "\=.*?&/", "&", $this->base_URL);
                         }
                         $this->base_URL .= "&";
@@ -891,8 +851,7 @@ 
                 $this->smartyTemplate->assign("ORDER_BY", $sort_URL_base);
 
                 return $sort_URL_base;
-            }
-            else {
+            } else {
                 return '';
             }
         }

include/ListView/ListView.php

Braces +173 added lines, -101 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,9 +137,13 @@ 
     }
 
     //when processing a multi-select popup.
-    if($this->process_for_popups && $this->multi_select_popup)  $this->shouldProcess =true;
+    if($this->process_for_popups && $this->multi_select_popup) {
+        $this->shouldProcess =true;
+    }
     //mass update turned off?
-    if(!$this->show_mass_update) $this->shouldProcess = false;
+    if(!$this->show_mass_update) {
+        $this->shouldProcess = false;
+    }
     if(is_subclass_of($seed, "SugarBean")) {
         if($seed->bean_implements('ACL')) {
             if(!ACLController::checkAccess($seed->module_dir,'list',true)) {
@@ -188,8 +194,9 @@ 
 {
         $this->source_module = $source_module;
         $this->subpanel_module = $subpanel_def->name;
-        if(!isset($this->xTemplate))
-            $this->createXTemplate();
+        if(!isset($this->xTemplate)) {
+                    $this->createXTemplate();
+        }
 
         $html_var = $this->subpanel_module . "_CELL";
 
@@ -280,8 +287,9 @@ 
     if ( empty($data) ) {
         $this->xTemplate->assign("ROW_COLOR", 'oddListRow');
         $thepanel=$subpanel_def;
-        if($subpanel_def->isCollection())
-            $thepanel=$subpanel_def->get_header_panel_def();
+        if($subpanel_def->isCollection()) {
+                    $thepanel=$subpanel_def->get_header_panel_def();
+        }
         $this->xTemplate->assign("COL_COUNT", count($thepanel->get_list_fields()));
         $this->xTemplate->parse($xtemplateSection.".nodata");
     }
@@ -339,8 +347,7 @@ 
         {
             $ROW_COLOR = 'oddListRow';
             $BG_COLOR =  $odd_bg;
-        }
-        else
+        } else
         {
             $ROW_COLOR = 'evenListRow';
             $BG_COLOR =  $even_bg;
@@ -353,8 +360,9 @@ 
         $layout_manager->setAttribute('context','List');
         $layout_manager->setAttribute('image_path',$this->local_image_path);
         $layout_manager->setAttribute('module_name', $subpanel_def->_instance_properties['module']);
-        if(!empty($this->child_focus))
-            $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        if(!empty($this->child_focus)) {
+                    $layout_manager->setAttribute('related_module_name',$this->child_focus->module_dir);
+        }
 
         //AG$subpanel_data = $this->list_field_defs;
         //$bla = array_pop($subpanel_data);
@@ -389,7 +397,9 @@ 
         $linked_field=$thepanel->get_data_source_name();
         $linked_field_set=$thepanel->get_data_source_name(true);
         static $count;
-        if(!isset($count))$count = 0;
+        if(!isset($count)) {
+            $count = 0;
+        }
 		/* BEGIN - SECURITY GROUPS */
 		/**
         $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
@@ -420,7 +430,7 @@ 
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
 
-            }else if($usage != 'query_only')
+            } else if($usage != 'query_only')
             {
                 $list_field['name']=$field_name;
 
@@ -435,8 +445,11 @@ 
                     $list_field['owner_id'] = false;
                     $list_field['owner_module'] = false;
                 }
-                if(isset($list_field['alias'])) $list_field['name'] = $list_field['alias'];
-                else $list_field['name']=$field_name;
+                if(isset($list_field['alias'])) {
+                    $list_field['name'] = $list_field['alias'];
+                } else {
+                    $list_field['name']=$field_name;
+                }
                 $list_field['fields'] = $fields;
                 $list_field['module'] = $aItem->module_dir;
                 $list_field['start_link_wrapper'] = $this->start_link_wrapper;
@@ -485,7 +498,9 @@ 
                  $count++;
                 $this->xTemplate->assign('CELL_COUNT', $count);
                 $this->xTemplate->assign('CLASS', "");
-                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+                if ( empty($widget_contents) ) {
+                    $widget_contents = '&nbsp;';
+                }
                 $this->xTemplate->assign('CELL', $widget_contents);
                 $this->xTemplate->parse($xtemplateSection.".row.cell");
                 } else {
@@ -495,7 +510,9 @@ 
 		                $widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
 		                $this->xTemplate->assign('CLASS', "");
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if ( empty($widget_contents) ) {
+		                    $widget_contents = '&nbsp;';
+		                }
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	} elseif (preg_match("/button/i", $list_field['name'])) {
@@ -503,8 +520,7 @@ 
                         {
                             $button_contents[] = $_content;
                             unset($_content);
-                        }
-                        else
+                        } else
                         {
                             $button_contents[] = '';
                         }
@@ -513,7 +529,9 @@ 
                			$this->xTemplate->assign('CLASS', "");
                			$widget_contents = $layout_manager->widgetDisplay($list_field);
 		                $this->xTemplate->assign('CELL_COUNT', $count);
-		                if ( empty($widget_contents) ) $widget_contents = '&nbsp;';
+		                if ( empty($widget_contents) ) {
+		                    $widget_contents = '&nbsp;';
+		                }
 		                $this->xTemplate->assign('CELL', $widget_contents);
 		                $this->xTemplate->parse($xtemplateSection.".row.cell");
                 	}
@@ -541,8 +559,7 @@ 
                     'class' => 'clickMenu subpanel records fancymenu button',
                     'flat' => false //assign flat value as false to display dropdown menu at any other preferences.
                 ), $this->xTemplate);
-            }
-            else
+            } else
             {
                 $action_button = '';
             }
@@ -630,11 +647,13 @@ 
 */
  function initNewXTemplate($XTemplatePath, $modString, $imagePath = null) {
     $this->setXTemplatePath($XTemplatePath);
-    if(isset($modString))
-        $this->setModStrings($modString);
-    if(isset($imagePath))
-        $this->setImagePath($imagePath);
-}
+    if(isset($modString)) {
+            $this->setModStrings($modString);
+    }
+    if(isset($imagePath)) {
+            $this->setImagePath($imagePath);
+    }
+    }
 
 
 function getOrderBy($varName, $defaultOrderBy='', $force_sortorder='') {
@@ -715,7 +734,7 @@ 
             }
             //Just clear from url...
             $this->appendToBaseUrl[$orderByColumn] = false;
-    }else {
+    } else {
         $this->query_orderby = "";
     }
     $this->sortby = $sortBy;
@@ -760,8 +779,10 @@ 
 */
  function setTheme($theme) {
     $this->local_theme = $theme;
-    if(isset($this->xTemplate))$this->xTemplate->assign("THEME", $this->local_theme);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("THEME", $this->local_theme);
+    }
+    }
 
 /**sets the AppStrings used only use if it is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -771,8 +792,10 @@ 
  function setAppStrings($app_strings) {
     unset($this->local_app_strings);
     $this->local_app_strings = $app_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("APP", $this->local_app_strings);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("APP", $this->local_app_strings);
+    }
+    }
 
 /**sets the ModStrings used
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -782,8 +805,10 @@ 
  function setModStrings($mod_strings) {
     unset($this->local_module_strings);
     $this->local_mod_strings = $mod_strings;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MOD", $this->local_mod_strings);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("MOD", $this->local_mod_strings);
+    }
+    }
 
 /**sets the ImagePath used
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -795,8 +820,10 @@ 
     if(empty($this->local_image_path)) {
         $this->local_image_path = SugarThemeRegistry::get($this->local_theme)->getImagePath();
     }
-    if(isset($this->xTemplate))$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
+    }
+    }
 
 /**sets the currentModule only use if this is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -806,8 +833,10 @@ 
  function setCurrentModule($currentModule) {
     unset($this->local_current_module);
     $this->local_current_module = $currentModule;
-    if(isset($this->xTemplate))$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
-}
+    if(isset($this->xTemplate)) {
+        $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
+    }
+    }
 
 /**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -820,7 +849,9 @@ 
 
             $this->xTemplate = new XTemplate($this->xTemplatePath);
             $this->xTemplate->assign("APP", $this->local_app_strings);
-            if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
+            if(isset($this->local_mod_strings)) {
+                $this->xTemplate->assign("MOD", $this->local_mod_strings);
+            }
             $this->xTemplate->assign("THEME", $this->local_theme);
             $this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
             $this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
@@ -897,7 +928,9 @@ 
 }
 
 function setUserVariable($localVarName,$varName, $value) {
-        if($this->is_dynamic ||  $localVarName == 'CELL')return;
+        if($this->is_dynamic ||  $localVarName == 'CELL') {
+            return;
+        }
         global $current_user;
         $current_user->setPreference($this->local_current_module."_".$localVarName."_".$varName, $value);
 }
@@ -921,7 +954,9 @@ 
 
 function getUserVariable($localVarName, $varName) {
     global $current_user;
-    if($this->is_dynamic ||  $localVarName == 'CELL')return;
+    if($this->is_dynamic ||  $localVarName == 'CELL') {
+        return;
+    }
     if(isset($_REQUEST[$this->getSessionVariableName($localVarName, $varName)])) {
 
             $this->setUserVariable($localVarName,$varName,$_REQUEST[$this->getSessionVariableName($localVarName, $varName)]);
@@ -1000,11 +1035,21 @@ 
         //$filter = array('id', 'full_name');
         $filter=array();
         $ret_array = $seed->create_new_list_query($this->query_orderby, $this->query_where, $filter, $params, 0, '', true, $seed, true);
-        if(!is_array($params)) $params = array();
-        if(!isset($params['custom_select'])) $params['custom_select'] = '';
-        if(!isset($params['custom_from'])) $params['custom_from'] = '';
-        if(!isset($params['custom_where'])) $params['custom_where'] = '';
-        if(!isset($params['custom_order_by'])) $params['custom_order_by'] = '';
+        if(!is_array($params)) {
+            $params = array();
+        }
+        if(!isset($params['custom_select'])) {
+            $params['custom_select'] = '';
+        }
+        if(!isset($params['custom_from'])) {
+            $params['custom_from'] = '';
+        }
+        if(!isset($params['custom_where'])) {
+            $params['custom_where'] = '';
+        }
+        if(!isset($params['custom_order_by'])) {
+            $params['custom_order_by'] = '';
+        }
         $main_query = $ret_array['select'] . $params['custom_select'] . $ret_array['from'] . $params['custom_from'] . $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
         SugarVCR::store($seed->module_dir,  $main_query);
         //ADDING VCR CONTROL
@@ -1065,8 +1110,7 @@ 
             {
                 $sort_order['session'] = $sort_order['session'] == 'asc' ? 'desc' : 'asc';
             }
-        }
-        else
+        } else
         {
             $sort_order['session'] = null;
         }
@@ -1098,7 +1142,7 @@ 
         if(!empty($this->response)){
             $response =& $this->response;
             echo 'cached';
-        }else{
+        } else{
             $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
             $this->response =& $response;
         }
@@ -1106,7 +1150,9 @@ 
         $row_count = $response['row_count'];
         $next_offset = $response['next_offset'];
         $previous_offset = $response['previous_offset'];
-        if(!empty($response['current_offset']))$current_offset = $response['current_offset'];
+        if(!empty($response['current_offset'])) {
+            $current_offset = $response['current_offset'];
+        }
         global $list_view_row_count;
         $list_view_row_count = $row_count;
         $this->processListNavigation('dyn_list_view', $html_var, $current_offset, $next_offset, $previous_offset, $row_count, $sugarbean,$subpanel_def);
@@ -1117,7 +1163,9 @@ 
     function getBaseURL($html_varName) {
         static $cache = array();
 
-        if(!empty($cache[$html_varName]))return $cache[$html_varName];
+        if(!empty($cache[$html_varName])) {
+            return $cache[$html_varName];
+        }
         $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount','current_query_by_page');
         if(!empty($this->base_URL)) {
             return $this->base_URL;
@@ -1137,10 +1185,11 @@ 
                 {
                     if(is_array($value)) {
                         foreach($value as $valuename=>$valuevalue) {
-                            if(substr_count($baseurl, '?') > 0)
-                                $baseurl	.= "&{$name}[]=".$valuevalue;
-                            else
-                                $baseurl	.= "?{$name}[]=".$valuevalue;
+                            if(substr_count($baseurl, '?') > 0) {
+                                                            $baseurl	.= "&{$name}[]=".$valuevalue;
+                            } else {
+                                                            $baseurl	.= "?{$name}[]=".$valuevalue;
+                            }
                         }
                     } else {
                         $value = urlencode($value);
@@ -1159,9 +1208,15 @@ 
                 if(substr_count($baseurl, '?') == 0) {
                     $baseurl .= '?';
                 }
-                if(isset($_REQUEST['action'])) $baseurl.= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $baseurl .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $baseurl .= '&module='.$_REQUEST['module'];
+                if(isset($_REQUEST['action'])) {
+                    $baseurl.= '&action='.$_REQUEST['action'];
+                }
+                if(isset($_REQUEST['record'])) {
+                    $baseurl .= '&record='.$_REQUEST['record'];
+                }
+                if(isset($_REQUEST['module'])) {
+                    $baseurl .= '&module='.$_REQUEST['module'];
+                }
             }
 
             $baseurl .= "&".ListView::getSessionVariableName($html_varName,"offset")."=";
@@ -1188,11 +1243,13 @@ 
 
         $start_record = $current_offset + 1;
 
-        if(!is_numeric($col_count))
-            $col_count = 20;
+        if(!is_numeric($col_count)) {
+                    $col_count = 20;
+        }
 
-        if($row_count == 0)
-            $start_record = 0;
+        if($row_count == 0) {
+                    $start_record = 0;
+        }
 
         $end_record = $start_record + $this->records_per_page;
         // back up the the last page.
@@ -1200,10 +1257,11 @@ 
             $end_record = $row_count+1;
         }
         // Determine the start location of the last page
-        if($row_count == 0)
-            $number_pages = 0;
-        else
-            $number_pages = floor(($row_count - 1) / $this->records_per_page);
+        if($row_count == 0) {
+                    $number_pages = 0;
+        } else {
+                    $number_pages = floor(($row_count - 1) / $this->records_per_page);
+        }
 
         $last_offset = $number_pages * $this->records_per_page;
 
@@ -1263,7 +1321,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $start_URL)){
                         $onClick = "\"$start_URL;\"";
-                    }else{
+                    } else{
                         $onClick ="'location.href=\"$start_URL\";'";
                     }
                     $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_START'])."</button>";
@@ -1271,7 +1329,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $previous_URL)){
                         $onClick = "\"$previous_URL;\"";
-                    }else{
+                    } else{
                         $onClick = "'location.href=\"$previous_URL\";'";
                     }
                     $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
@@ -1295,7 +1353,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $next_URL)){
                         $onClick = "\"$next_URL;\"";
-                    }else{
+                    } else{
                         $onClick ="'location.href=\"$next_URL\";'";
                     }
                     $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_NEXT'])."</button>";
@@ -1303,7 +1361,7 @@ 
                     $onClick = '';
                     if(0 != preg_match('/javascript.*/', $end_URL)){
                         $onClick = "\"$end_URL;\"";
-                    }else{
+                    } else{
                         $onClick = "'location.href=\"$end_URL\";'";
                     }
                     $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end","border='0' align='absmiddle'",null,null,'.gif',$this->local_app_strings['LNK_LIST_END'])."</button>";
@@ -1452,18 +1510,17 @@ 
                     //attempt to get the query to recreate this subpanel
                     if(!empty($this->response)){
                         $response =& $this->response;
-                    }else{
+                    } else{
                         $response = SugarBean::get_union_related_list($sugarbean,$this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page,$this->query_limit,$subpanel_def);
                         $this->response = $response;
                     }
                     //if query is present, then pass it in as parameter
                     if (isset($response['query']) && !empty($response['query'])){
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def, $response['query']);
-                    }else{
+                    } else{
                         $html_text .= $subpanelTiles->get_buttons($subpanel_def);
                     }
-                }
-                else {
+                } else {
                     $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  nowrap>$select_link&nbsp;$export_link&nbsp;$delete_link&nbsp;$selected_objects_span";
                 }
                 $html_text .= "</td>\n<td nowrap align=\"right\">".$start_link."&nbsp;&nbsp;".$previous_link."&nbsp;&nbsp;<span class='pageNumbers'>(".$start_record." - ".$end_record." ".$this->local_app_strings['LBL_LIST_OF']." ".$row_count.")</span>&nbsp;&nbsp;".$next_link."&nbsp;&nbsp;".$end_link."</td></tr></table>\n";
@@ -1491,9 +1548,15 @@ 
             }
             if($_SERVER['REQUEST_METHOD'] == 'POST') {
                 $this->base_URL .= '?';
-                if(isset($_REQUEST['action'])) $this->base_URL .= '&action='.$_REQUEST['action'];
-                if(isset($_REQUEST['record'])) $this->base_URL .= '&record='.$_REQUEST['record'];
-                if(isset($_REQUEST['module'])) $this->base_URL .= '&module='.$_REQUEST['module'];
+                if(isset($_REQUEST['action'])) {
+                    $this->base_URL .= '&action='.$_REQUEST['action'];
+                }
+                if(isset($_REQUEST['record'])) {
+                    $this->base_URL .= '&record='.$_REQUEST['record'];
+                }
+                if(isset($_REQUEST['module'])) {
+                    $this->base_URL .= '&module='.$_REQUEST['module'];
+                }
             }
             $this->base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
         }
@@ -1624,8 +1687,7 @@ 
             {
                 $ROW_COLOR = 'oddListRow';
                 $BG_COLOR =  $odd_bg;
-            }
-            else
+            } else
             {
                 $ROW_COLOR = 'evenListRow';
                 $BG_COLOR =  $even_bg;
@@ -1641,8 +1703,7 @@ 
                 $this->xTemplate->assign('VALUE', $aItem);
                 $this->xTemplate->assign('INDEX', $count);
 
-            }
-            else
+            } else
             {
     //AED -- some modules do not have their additionalDetails.php established. Add a check to ensure require_once does not fail
     // Bug #2786
@@ -1658,7 +1719,9 @@ 
                     $results = $ad_function($fields);
                     $results['string'] = str_replace(array("&#039", "'"), '\&#039', $results['string']); // no xss!
 
-                    if(trim($results['string']) == '') $results['string'] = $app_strings['LBL_NONE'];
+                    if(trim($results['string']) == '') {
+                        $results['string'] = $app_strings['LBL_NONE'];
+                    }
                     $fields[$results['fieldToAddTo']] = $fields[$results['fieldToAddTo']].'</a>';
                 }
 
@@ -1782,12 +1845,21 @@ 
 	                $cell_width = empty($widget_args['width']) ? '' : $widget_args['width'];
 	                $this->xTemplate->assign('HEADER_CELL', $widget_contents);
 	                static $count;
-	            if(!isset($count))$count = 0; else $count++;
-                    if($col_count == 0 || $column_name == 'name') $footable = 'data-toggle="true"';
-                    else {
+	            if(!isset($count)) {
+	                $count = 0;
+	            } else {
+	                $count++;
+	            }
+                    if($col_count == 0 || $column_name == 'name') {
+                        $footable = 'data-toggle="true"';
+                    } else {
                         $footable = 'data-hide="phone"';
-                        if ($col_count > 2) $footable = 'data-hide="phone,phonelandscape"';
-                        if ($col_count > 4) $footable = 'data-hide="phone,phonelandscape,tablet"';
+                        if ($col_count > 2) {
+                            $footable = 'data-hide="phone,phonelandscape"';
+                        }
+                        if ($col_count > 4) {
+                            $footable = 'data-hide="phone,phonelandscape,tablet"';
+                        }
                     }
                     $this->xTemplate->assign('FOOTABLE', $footable);
 	                $this->xTemplate->assign('CELL_COUNT', $count);
@@ -1919,7 +1991,7 @@ 
         $sortStr = translate('LBL_ALT_SORT');
         if($upDown == '_down'){
             $sortStr = translate('LBL_ALT_SORT_DESC');
-        }elseif($upDown == '_up'){
+        } elseif($upDown == '_up'){
             $sortStr = translate('LBL_ALT_SORT_ASC');
         }
         return " width='$width' height='$height' align='absmiddle' alt='$sortStr'>";
@@ -1933,8 +2005,9 @@ 
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
-        return $result;
+        if(!empty($result)) {
+                return $result;
+        }
 
         // No cache hit.  Calculate the value and return.
         $result = getimagesize($image);
@@ -1950,8 +2023,9 @@ 
 
         // Check the cache
         $result = sugar_cache_retrieve($cache_key);
-        if(!empty($result))
-        return $result;
+        if(!empty($result)) {
+                return $result;
+        }
 
         // No cache hit.  Calculate the value and return.
         $result = getimagesize($image);
@@ -1984,12 +2058,10 @@ 
 		if($orderBy == 'amount')
 		{
 			$this->xTemplateAssign('amount_arrow', $imgArrow);
-		}
-		else if($orderBy == 'amount_usdollar')
+		} else if($orderBy == 'amount_usdollar')
 		{
 			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
-		}
-		else
+		} else
 		{
 			$this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
 		}
@@ -2019,8 +2091,7 @@ 
             {
                 $list_field['label'] = translate($key,$child_focus->module_dir);
                 $this->list_field_defs[$i]['label'] = preg_replace('/:$/','',$list_field['label']);
-            }
-            else
+            } else
             {
                 $this->list_field_defs[$i]['label'] ='&nbsp;';
             }
@@ -2050,8 +2121,7 @@ 
  function getLocalSessionVariable($localVarName,$varName) {
     if(isset($_SESSION[$localVarName."_".$varName])) {
         return $_SESSION[$localVarName."_".$varName];
-    }
-    else{
+    } else{
         return "";
     }
  }
@@ -2059,7 +2129,9 @@ 
  /* Set to true if you want Additional Details to appear in the listview
   */
  function setAdditionalDetails($value = true, $function = '') {
-    if(!empty($function)) $this->additionalDetailsFunction = $function;
+    if(!empty($function)) {
+        $this->additionalDetailsFunction = $function;
+    }
     $this->_additionalDetails = $value;
  }
 

include/utils.php

Braces +2 added lines, -4 removed lines

@@ -415,8 +415,7 @@ 
     if ($runningUser == null) {  // matches null, false and ""
         if (is_windows()) {
             $runningUser = getenv('USERDOMAIN').'\\'.getenv('USERNAME');
-        }
-        else {
+        } else {
             $usr = posix_getpwuid(posix_geteuid());
             $runningUser = $usr['name'];
         }
@@ -4410,8 +4409,7 @@ 
     if(file_exists(SugarThemeRegistry::current()->getImagePath().DIRECTORY_SEPARATOR.'icon_'.$iconFileName.'.svg')) {
         $iconName = "icon_{$iconFileName}.svg";
         $iconFound = SugarThemeRegistry::current()->getImageURL($iconName, false);
-    }
-    else {
+    } else {
         $iconName = "icon_{$iconFileName}.gif";
         $iconFound = SugarThemeRegistry::current()->getImageURL($iconName, false);
     }

include/SugarTheme/SugarTheme.php

Braces +213 added lines, -156 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.
@@ -46,8 +48,9 @@ 
  * theme basis.
  ********************************************************************************/
 
-if(!defined('JSMIN_AS_LIB'))
+if(!defined('JSMIN_AS_LIB')) {
     define('JSMIN_AS_LIB', true);
+}
 
 require_once("include/SugarTheme/cssmin.php");
 require_once("jssource/jsmin.php");
@@ -299,10 +302,11 @@ 
                 if ( property_exists(__CLASS__,$key) ) {
                     // For all arrays ( except colors and fonts ) you can just specify the items
                     // to change instead of all of the values
-                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                        $this->$key = array_merge($this->$key,$value);
-                    else
-                        $this->$key = $value;
+                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) ) {
+                                            $this->$key = array_merge($this->$key,$value);
+                    } else {
+                                            $this->$key = $value;
+                    }
                 }
             }
         }
@@ -310,23 +314,28 @@ 
             if ( property_exists(__CLASS__,$key) ) {
                 // For all arrays ( except colors and fonts ) you can just specify the items
                 // to change instead of all of the values
-                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                    $this->$key = array_merge($this->$key,$value);
-                else
-                    $this->$key = $value;
+                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) ) {
+                                    $this->$key = array_merge($this->$key,$value);
+                } else {
+                                    $this->$key = $value;
+                }
             }
         }
         if ( !inDeveloperMode() ) {
             if ( is_file($cachedfile = sugar_cached($this->getFilePath().'/pathCache.php'))) {
                 $caches = unserialize(file_get_contents($cachedfile));
-                if ( isset($caches['jsCache']) )
-                    $this->_jsCache       = $caches['jsCache'];
-                if ( isset($caches['cssCache']) )
-                    $this->_cssCache      = $caches['cssCache'];
-                if ( isset($caches['imageCache']) )
-                    $this->_imageCache    = $caches['imageCache'];
-                if ( isset($caches['templateCache']) )
-                    $this->_templateCache = $caches['templateCache'];
+                if ( isset($caches['jsCache']) ) {
+                                    $this->_jsCache       = $caches['jsCache'];
+                }
+                if ( isset($caches['cssCache']) ) {
+                                    $this->_cssCache      = $caches['cssCache'];
+                }
+                if ( isset($caches['imageCache']) ) {
+                                    $this->_imageCache    = $caches['imageCache'];
+                }
+                if ( isset($caches['templateCache']) ) {
+                                    $this->_templateCache = $caches['templateCache'];
+                }
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
 			if(!empty($GLOBALS['sugar_config']['use_sprites']) && is_file($cachedfile)) {
@@ -378,17 +387,18 @@ 
         // clear out the cache on destroy if we are asked to
         if ( $this->_clearCacheOnDestroy ) {
 
-            if (is_file("$cachedir/pathCache.php"))
-                unlink("$cachedir/pathCache.php");
-			if (is_file("$cachedir/spriteCache.php"))
-				unlink("$cachedir/spriteCache.php");
+            if (is_file("$cachedir/pathCache.php")) {
+                            unlink("$cachedir/pathCache.php");
+            }
+			if (is_file("$cachedir/spriteCache.php")) {
+							unlink("$cachedir/spriteCache.php");
+			}
 
             if(strlen($cachedir)>1) {
                 rmdir_recursive($cachedir.'/modules');
             }
 
-        }
-        elseif ( !inDeveloperMode() ) {
+        } elseif ( !inDeveloperMode() ) {
             // only update the caches if they have been changed in this request
             if ( count($this->_jsCache) != $this->_initialCacheSize['jsCache']
                     || count($this->_cssCache) != $this->_initialCacheSize['cssCache']
@@ -437,8 +447,9 @@ 
         $key
         )
     {
-        if ( isset($this->$key) )
-            return $this->$key;
+        if ( isset($this->$key) ) {
+                    return $this->$key;
+        }
     }
 
     public function __isset($key){
@@ -611,38 +622,44 @@ 
 		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
 			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
+			if(file_exists("cache/sprites/default/sprites.css")) {
+							$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
+			}
 
 			// theme specific sprites
-			if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
+			if(file_exists("cache/sprites/{$this->dirName}/sprites.css")) {
+							$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
+			}
 
 			// parent sprites
 			if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
-					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
+				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css")) {
+									$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
+				}
 			}
 
 			// repeatable sprites
-			if(file_exists("cache/sprites/Repeatable/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
+			if(file_exists("cache/sprites/Repeatable/sprites.css")) {
+							$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
+			}
 		}
 
         // for BC during upgrade
         if ( !empty($this->colors) ) {
-            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors))
-                $color = $_SESSION['authenticated_user_theme_color'];
-            else
-                $color = $this->colors[0];
+            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors)) {
+                            $color = $_SESSION['authenticated_user_theme_color'];
+            } else {
+                            $color = $this->colors[0];
+            }
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('colors.'.$color.'.css').'" id="current_color_style" />';
         }
 
         if ( !empty($this->fonts) ) {
-            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts))
-                $font = $_SESSION['authenticated_user_theme_font'];
-            else
-                $font = $this->fonts[0];
+            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts)) {
+                            $font = $_SESSION['authenticated_user_theme_font'];
+            } else {
+                            $font = $this->fonts[0];
+            }
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('fonts.'.$font.'.css').'" id="current_font_style" />';
         }
 
@@ -673,23 +690,24 @@ 
         $templateName
         )
     {
-        if ( isset($this->_templateCache[$templateName]) )
-            return $this->_templateCache[$templateName];
+        if ( isset($this->_templateCache[$templateName]) ) {
+                    return $this->_templateCache[$templateName];
+        }
 
         $templatePath = '';
-        if (is_file('custom/'.$this->getTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
-        elseif (is_file($this->getTemplatePath().'/'.$templateName))
-            $templatePath = $this->getTemplatePath().'/'.$templateName;
-        elseif (isset($this->parentTheme)
+        if (is_file('custom/'.$this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
+        } elseif (is_file($this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getTemplatePath().'/'.$templateName;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '')
-            $templatePath = $filename;
-        elseif (is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
-        elseif (is_file($this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '') {
+                    $templatePath = $filename;
+        } elseif (is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
+        } elseif (is_file($this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
+        } else {
             $GLOBALS['log']->warn("Template $templateName not found");
             return false;
         }
@@ -734,15 +752,17 @@ 
 		// trap deprecated use of image extension
 		if(is_null($ext)) {
 			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
-				$imageName .= '.gif';
+			if(count($imageNameExp) == 1) {
+							$imageName .= '.gif';
+			}
 		} else {
 			$imageName .= $ext;
 		}
 
 		// trap alt attributes in other_attributes
-		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
-			$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
+		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes)) {
+					$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
+		}
 		// sprite handler, makes use of own caching mechanism
 		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 			// get sprite metadata
@@ -764,8 +784,9 @@ 
 		// img caching
 		if(empty($cached_results[$imageName])) {
 			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
-				return false;
+			if ( empty($imageURL) ) {
+							return false;
+			}
             if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
@@ -793,8 +814,9 @@ 
 	public function getSpriteMeta($imageName) {
 
 		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
-			return $this->_spriteCache[$imageName];
+	    if(isset($this->_spriteCache[$imageName])) {
+	    			return $this->_spriteCache[$imageName];
+	    }
 
 			// sprite keys are base on imageURL
 		$imageURL = $this->getImageURL($imageName,false);
@@ -846,8 +868,9 @@ 
 			$attr .= ' class="spr_'.$class.'"';
 		}
 
-		if($title)
-			$attr .= ' title="'.$title.'"';
+		if($title) {
+					$attr .= ' title="'.$title.'"';
+		}
 
 		// use </span> instead of /> to prevent weird UI results
 		$GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
@@ -901,35 +924,37 @@ 
         $addJSPath = true
         ){
         if ( isset($this->_imageCache[$imageName]) ) {
-            if ( $addJSPath )
-                return getJSPath($this->_imageCache[$imageName]);
-            else
-                return $this->_imageCache[$imageName];
+            if ( $addJSPath ) {
+                            return getJSPath($this->_imageCache[$imageName]);
+            } else {
+                            return $this->_imageCache[$imageName];
+            }
         }
         $imagePath = '';
-        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (isset($this->parentTheme)
+        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-		elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
-			$imagePath = $filename;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '') {
+					$imagePath = $filename;
+		} else {
             $GLOBALS['log']->warn("Image $imageName not found");
             return false;
         }
 
         $this->_imageCache[$imageName] = $imagePath;
 
-        if ( $addJSPath )
-            return getJSPath($imagePath);
+        if ( $addJSPath ) {
+                    return getJSPath($imagePath);
+        }
 
         return $imagePath;
     }
@@ -945,14 +970,16 @@ 
         )
     {
         // return now if the extension matches that of which we are looking for
-        if ( is_file($imageName) )
-            return $imageName;
+        if ( is_file($imageName) ) {
+                    return $imageName;
+        }
         $pathParts = pathinfo($imageName);
-        foreach ( $this->imageExtensions as $extension )
-            if ( isset($pathParts['extension']) )
+        foreach ( $this->imageExtensions as $extension ) {
+                    if ( isset($pathParts['extension']) )
                 if ( ( $extension != $pathParts['extension'] )
                         && is_file($pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension) )
                     return $pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension;
+        }
 
         return '';
     }
@@ -968,10 +995,11 @@ 
     public function getCSSURL($cssFileName, $returnURL = true)
     {
         if ( isset($this->_cssCache[$cssFileName]) && is_file(sugar_cached($this->_cssCache[$cssFileName])) ) {
-            if ( $returnURL )
-                return getJSPath("cache/".$this->_cssCache[$cssFileName]);
-            else
-                return sugar_cached($this->_cssCache[$cssFileName]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_cssCache[$cssFileName]);
+            } else {
+                            return sugar_cached($this->_cssCache[$cssFileName]);
+            }
         }
 
         $cssFileContents = '';
@@ -979,13 +1007,15 @@ 
         $fullFileName = $this->getCSSPath().'/'.$cssFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '')
-            $cssFileContents .= file_get_contents($filename);
-        else {
-            if (is_file($defaultFileName))
-                $cssFileContents .= file_get_contents($defaultFileName);
-            if (is_file('custom/'.$defaultFileName))
-                $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '') {
+                    $cssFileContents .= file_get_contents($filename);
+        } else {
+            if (is_file($defaultFileName)) {
+                            $cssFileContents .= file_get_contents($defaultFileName);
+            }
+            if (is_file('custom/'.$defaultFileName)) {
+                            $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
         }
         if (is_file($fullFileName)) {
             $cssFileContents .= file_get_contents($fullFileName);
@@ -1009,10 +1039,11 @@ 
         // if this is the style.css file, prepend the base.css and calendar-win2k-cold-1.css
         // files before the theme styles
         if ( $cssFileName == 'style.css' && !isset($this->parentTheme) ) {
-            if ( inDeveloperMode() )
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
-            else
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+            if ( inDeveloperMode() ) {
+                            $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
+            } else {
+                            $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+            }
         }
 
         // minify the css
@@ -1025,8 +1056,9 @@ 
 
         $this->_cssCache[$cssFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1042,10 +1074,11 @@ 
     public function getJSURL($jsFileName, $returnURL = true)
     {
         if ( isset($this->_jsCache[$jsFileName]) && is_file(sugar_cached($this->_jsCache[$jsFileName])) ) {
-            if ( $returnURL )
-                return getJSPath("cache/".$this->_jsCache[$jsFileName]);
-            else
-                return sugar_cached($this->_jsCache[$jsFileName]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_jsCache[$jsFileName]);
+            } else {
+                            return sugar_cached($this->_jsCache[$jsFileName]);
+            }
         }
 
         $jsFileContents = '';
@@ -1056,15 +1089,19 @@ 
                 && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
            $jsFileContents .= file_get_contents($filename);
        } else {
-            if (is_file($defaultFileName))
-                $jsFileContents .= file_get_contents($defaultFileName);
-            if (is_file('custom/'.$defaultFileName))
-                $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            if (is_file($defaultFileName)) {
+                            $jsFileContents .= file_get_contents($defaultFileName);
+            }
+            if (is_file('custom/'.$defaultFileName)) {
+                            $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
+        }
+        if (is_file($fullFileName)) {
+                    $jsFileContents .= file_get_contents($fullFileName);
+        }
+        if (is_file('custom/'.$fullFileName)) {
+                    $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         }
-        if (is_file($fullFileName))
-            $jsFileContents .= file_get_contents($fullFileName);
-        if (is_file('custom/'.$fullFileName))
-            $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         if (empty($jsFileContents)) {
             $GLOBALS['log']->warn("Javascript File $jsFileName not found");
             return false;
@@ -1085,8 +1122,9 @@ 
 
         $this->_jsCache[$jsFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1111,7 +1149,9 @@ 
         $imageArray = array();
         foreach ( $pathsToSearch as $path )
         {
-            if (!is_dir($path)) $path = "custom/$path";
+            if (!is_dir($path)) {
+                $path = "custom/$path";
+            }
             if (is_dir($path) && is_readable($path) && $dir = opendir($path)) {
                 while (($file = readdir($dir)) !== false) {
                     if ($file == ".."
@@ -1119,10 +1159,12 @@ 
                             || $file == ".svn"
                             || $file == "CVS"
                             || $file == "Attic"
-                            )
-                        continue;
-                    if ( !isset($imageArray[$file]) )
-                        $imageArray[$file] = $this->getImageURL($file,false);
+                            ) {
+                                            continue;
+                    }
+                    if ( !isset($imageArray[$file]) ) {
+                                            $imageArray[$file] = $this->getImageURL($file,false);
+                    }
                 }
                 closedir($dir);
             }
@@ -1224,8 +1266,9 @@ 
                 }
             }
         }
-        if (!$versionOk)
-            return false;
+        if (!$versionOk) {
+                    return false;
+        }
 
         $theme = new SugarTheme($themedef);
         self::$_themes[$theme->dirName] = $theme;
@@ -1240,8 +1283,9 @@ 
         $themeName
         )
     {
-        if ( self::exists($themeName) )
-            unset(self::$_themes[$themeName]);
+        if ( self::exists($themeName) ) {
+                    unset(self::$_themes[$themeName]);
+        }
     }
 
     /**
@@ -1253,8 +1297,9 @@ 
         $themeName
         )
     {
-        if ( isset(self::$_themes[$themeName]) )
-            return self::$_themes[$themeName];
+        if ( isset(self::$_themes[$themeName]) ) {
+                    return self::$_themes[$themeName];
+        }
     }
 
     /**
@@ -1264,8 +1309,9 @@ 
      */
     public static function current()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         return self::$_themes[self::$_currentTheme];
     }
@@ -1277,8 +1323,9 @@ 
      */
     public static function getDefault()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         if ( isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme']) ) {
             return self::get($GLOBALS['sugar_config']['default_theme']);
@@ -1309,8 +1356,9 @@ 
         $themeName
         )
     {
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         self::$_currentTheme = $themeName;
 
@@ -1347,8 +1395,9 @@ 
                             || $file == "default"
                             || !is_dir("./$dirPath".$file)
                             || !is_file("./{$dirPath}{$file}/themedef.php")
-                            )
-                        continue;
+                            ) {
+                                            continue;
+                    }
                     $themedef = array();
                     require("./{$dirPath}{$file}/themedef.php");
                     $themedef = array_merge($themedef,$themedefDefault);
@@ -1357,9 +1406,10 @@ 
                     // if so, then it will override the current one
                     if ( self::exists($themedef['dirName']) ) {
                         $existingTheme = self::get($themedef['dirName']);
-                        foreach ( SugarTheme::getThemeDefFields() as $field )
-                            if ( !isset($themedef[$field]) )
+                        foreach ( SugarTheme::getThemeDefFields() as $field ) {
+                                                    if ( !isset($themedef[$field]) )
                                 $themedef[$field] = $existingTheme->$field;
+                        }
                         self::remove($themedef['dirName']);
                     }
                     if ( isset($themedef['name']) ) {
@@ -1414,12 +1464,14 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if ( isset($GLOBALS['sugar_config']['disabled_themes']) ) {
+                    $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
-                continue;
+            if ( in_array($themename,$disabledThemes) ) {
+                            continue;
+            }
             $themelist[$themeobject->dirName] = $themeobject->name;
         }
         asort($themelist, SORT_STRING);
@@ -1438,12 +1490,14 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if ( isset($GLOBALS['sugar_config']['disabled_themes']) ) {
+                    $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
-                $themelist[$themeobject->dirName] = $themeobject->name;
+            if ( in_array($themename,$disabledThemes) ) {
+                            $themelist[$themeobject->dirName] = $themeobject->name;
+            }
         }
 
         return $themelist;
@@ -1458,8 +1512,9 @@ 
     {
         $themelist = array();
 
-        foreach ( self::$_themes as $themename => $themeobject )
-            $themelist[$themeobject->dirName] = $themeobject->name;
+        foreach ( self::$_themes as $themename => $themeobject ) {
+                    $themelist[$themeobject->dirName] = $themeobject->name;
+        }
 
         return $themelist;
     }
@@ -1473,8 +1528,9 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if (isset($GLOBALS['sugar_config']['disabled_themes']))
-            $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
+        if (isset($GLOBALS['sugar_config']['disabled_themes'])) {
+                    $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach (self::$_themes as $themename => $themeobject) {
             $themearray['name'] = $themeobject->name;
@@ -1495,8 +1551,9 @@ 
     {
         global $sugar_config;
 
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         $config = array();
 

include/SugarFields/Parsers/QuickCreateMetaParser.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.
@@ -62,8 +64,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();

include/SugarFields/Parsers/SearchFormMetaParser.php

Braces +1 added lines, -2 removed lines

@@ -347,8 +347,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();

include/SugarFields/Parsers/DetailViewMetaParser.php

Braces +3 added lines, -1 removed lines

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

include/SugarFields/Fields/Text/SugarFieldText.php

Braces +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
                 $editor = $tiny->getInstance($vardef['name'], 'email_compose_light');
             }
             $this->ss->assign("tinymce", $editor);
-        }else{
+        } else{
             $this->ss->assign("tinymce", $editor);
         }
     }