adamjakab / SuiteCRM

include/ListView/ListViewData.php

Braces +47 added lines, -31 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.
@@ -84,8 +86,7 @@ 
             }
             $_SESSION[$this->var_order_by] = array('orderBy'=>$orderBy, 'direction'=> $direction);
             $_SESSION['lvd']['last_ob'] = $orderBy;
-        }
-		else {
+        } else {
             $userPreferenceOrder = $GLOBALS['current_user']->getPreference('listviewOrder', $this->var_name);
 			if(!empty($_SESSION[$this->var_order_by])) {
 				$orderBy = $_SESSION[$this->var_order_by]['orderBy'];
@@ -183,7 +184,7 @@ 
 	function getTotalCount($main_query){
 		if(!empty($this->count_query)){
 		    $count_query = $this->count_query;
-		}else{
+		} else{
 	        $count_query = $this->seed->create_list_count_query($main_query);
 	    }
 		$result = $this->db->query($count_query);
@@ -246,8 +247,7 @@ 
         // if $params tell us to override all ordering
         if(!empty($params['overrideOrder']) && !empty($params['orderBy'])) {
             $order = $this->getOrderBy(strtolower($params['orderBy']), (empty($params['sortOrder']) ? '' : $params['sortOrder'])); // retreive from $_REQUEST
-        }
-        else {
+        } else {
             $order = $this->getOrderBy(); // retreive from $_REQUEST
         }
 
@@ -274,8 +274,9 @@ 
         } else {
             $orderBy = $order['orderBy'] . ' ' . $order['sortOrder'];
             //wdong, Bug 25476, fix the sorting problem of Oracle.
-            if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code'])
-                $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+            if (isset($params['custom_order_by_override']['ori_code']) && $order['orderBy'] == $params['custom_order_by_override']['ori_code']) {
+                            $orderBy = $params['custom_order_by_override']['custom_code'] . ' ' . $order['sortOrder'];
+            }
         }
 
         if (empty($params['skipOrderSave'])) { // don't save preferences if told so
@@ -293,11 +294,21 @@ 
             $ret_array['inner_join'] = ' ' . implode(' ', $this->seed->listview_inner_join) . ' ';
         }
 
-		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['inner_join']. $ret_array['where'] . $params['custom_where'] . $ret_array['order_by'] . $params['custom_order_by'];
 		//C.L. - Fix for 23461
 		if(empty($_REQUEST['action']) || $_REQUEST['action'] != 'Popup') {
@@ -305,13 +316,14 @@ 
 		}
    		if($limit < -1) {
 			$result = $this->db->query($main_query);
-		}
-		else {
+		} else {
 			if($limit == -1) {
 				$limit = $this->getLimit();
             }
 			$dyn_offset = $this->getOffset();
-			if($dyn_offset > 0 || !is_int($dyn_offset))$offset = $dyn_offset;
+			if($dyn_offset > 0 || !is_int($dyn_offset)) {
+			    $offset = $dyn_offset;
+			}
 
             if(strcmp($offset, 'end') == 0){
             	$totalCount = $this->getTotalCount($main_query);
@@ -319,8 +331,7 @@ 
             }
             if($this->seed->ACLAccess('ListView')) {
                 $result = $this->db->limitQuery($main_query, $offset, $limit + 1);
-            }
-            else {
+            } else {
                 $result = array();
             }
 
@@ -388,7 +399,9 @@ 
                     if(!isset($post_retrieve[$rows[$rowIndex[0]]['parent_type']])) {
                         $post_retrieve[$rows[$rowIndex[0]]['parent_type']] = array();
                     }
-                    if(!empty($rows[$rowIndex[0]]['parent_id'])) $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    if(!empty($rows[$rowIndex[0]]['parent_id'])) {
+                        $post_retrieve[$rows[$rowIndex[0]]['parent_type']][] = array('child_id' => $id , 'parent_id'=> $rows[$rowIndex[0]]['parent_id'], 'parent_type' => $rows[$rowIndex[0]]['parent_type'], 'type' => 'parent');
+                    }
                 }
                 if(isset($post_retrieve)) {
                     $parent_fields = $seed->retrieve_parent_fields($post_retrieve);
@@ -416,7 +429,7 @@ 
 				}
 				if($idIndex[$row[$id_field]][0] == $dataIndex){
 				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
-				}else{
+				} else{
 				    $pageData['tag'][$dataIndex] = $pageData['tag'][$idIndex[$row[$id_field]][0]];
 				}
 				$data[$dataIndex] = $temp->get_list_view_data($filter_fields);
@@ -430,8 +443,7 @@ 
                 if($additionalDetailsAllow) {
                     if($this->additionalDetailsAjax) {
 					   $ar = $this->getAdditionalDetailsAjax($data[$dataIndex]['ID']);
-                    }
-                    else {
+                    } else {
                         $additionalDetailsFile = 'modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
                         if(file_exists('custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php')){
                         	$additionalDetailsFile = 'custom/modules/' . $this->seed->module_dir . '/metadata/additionalDetails.php';
@@ -456,7 +468,9 @@ 
 
 		if($offset > 0) {
 			$prevOffset = $offset - $limit;
-			if($prevOffset < 0)$prevOffset = 0;
+			if($prevOffset < 0) {
+			    $prevOffset = 0;
+			}
 		}
 		$totalCount = $count + $offset;
 
@@ -490,16 +504,19 @@ 
         	isset($_REQUEST["module"]) && $_REQUEST["module"] == "MergeRecords")
         {
             $queryString = "-advanced_search";
-        }
-        else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
+        } else if (isset($_REQUEST["searchFormTab"]) && $_REQUEST["searchFormTab"] == "basic_search")
         {
-            if($seed->module_dir == "Reports") $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
-            else $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
+            if($seed->module_dir == "Reports") {
+                $searchMetaData = SearchFormReports::retrieveReportsSearchDefs();
+            } else {
+                $searchMetaData = SearchForm::retrieveSearchDefs($seed->module_dir);
+            }
 
             $basicSearchFields = array();
 
-            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) )
-                $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
+            if( isset($searchMetaData['searchdefs']) && isset($searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search']) ) {
+                            $basicSearchFields = $searchMetaData['searchdefs'][$seed->module_dir]['layout']['basic_search'];
+            }
 
             foreach( $basicSearchFields as $basicSearchField)
             {
@@ -573,8 +590,7 @@ 
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = $endOffset;
-        }
-        else
+        } else
         {
             $queries['endPage'] = $queries['baseURL'];
             $queries['endPage'][$this->var_offset] = 'end';

include/utils/sugar_file_utils.php

Braces +27 added lines, -18 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,12 +58,14 @@ 
 function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
 	$mode = get_mode('dir_mode', $mode);
 
-	if ( sugar_is_dir($pathname,$mode) )
-	    return true;
+	if ( sugar_is_dir($pathname,$mode) ) {
+		    return true;
+	}
 
 	$result = false;
-	if(empty($mode))
-		$mode = 0777;
+	if(empty($mode)) {
+			$mode = 0777;
+	}
 	if(empty($context)) {
 		$result = @mkdir($pathname, $mode, $recursive);
 	} else {
@@ -82,8 +86,7 @@ 
    				return false;
    			}
 		}
-	}
-	else {
+	} else {
 		$errorMessage = "Cannot create directory $pathname cannot be touched";
 		if(is_null($GLOBALS['log'])) {
 			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
@@ -285,15 +288,16 @@ 
  * @return boolean   Returns TRUE on success or FALSE on failure.
  */
 function sugar_chmod($filename, $mode=null) {
-    if ( !is_int($mode) )
-        $mode = (int) $mode;
+    if ( !is_int($mode) ) {
+            $mode = (int) $mode;
+    }
 	if(!is_windows()){
 		if(!isset($mode)){
 			$mode = get_mode('file_mode', $mode);
 		}
         if(isset($mode) && $mode > 0){
 		   return @chmod($filename, $mode);
-		}else{
+		} else{
 	    	return false;
 		}
 	}
@@ -313,11 +317,11 @@ 
 	if(!is_windows()){
 		if(strlen($user)){
 			return chown($filename, $user);
-		}else{
+		} else{
 			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
 				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
 				return chown($filename, $user);
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -338,11 +342,11 @@ 
 	if(!is_windows()){
 		if(!empty($group)){
 			return chgrp($filename, $group);
-		}else{
+		} else{
 			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
 				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
 				return chgrp($filename, $group);
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -361,8 +365,9 @@ 
  * @return int - the mode either found in the config file or passed in via the input parameter
  */
 function get_mode($key = 'dir_mode', $mode=null) {
-	if ( !is_int($mode) )
-        $mode = (int) $mode;
+	if ( !is_int($mode) ) {
+	        $mode = (int) $mode;
+	}
     if(!class_exists('SugarConfig', true)) {
 		require 'include/SugarObjects/SugarConfig.php';
 	}
@@ -374,12 +379,16 @@ 
 }
 
 function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+		if(defined('TEMPLATE_URL')) {
+		    return is_dir($path, $mode);
+		}
 		return is_dir($path);
 }
 
 function sugar_is_file($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_file($path, $mode);
+		if(defined('TEMPLATE_URL')) {
+		    return is_file($path, $mode);
+		}
 		return is_file($path);
 }
 

include/TemplateHandler/TemplateHandler.php

Braces +32 added lines, -27 removed lines

@@ -84,7 +84,9 @@ 
         $cacheDir = create_cache_directory('modules/'. $module . '/');
         $d = dir($cacheDir);
         while($e = $d->read()){
-            if(!empty($view) && $e != $view )continue;
+            if(!empty($view) && $e != $view ) {
+                continue;
+            }
             $end =strlen($e) - 4;
             if(is_file($cacheDir . $e) && $end > 1 && substr($e, $end) == '.tpl'){
                 unlink($cacheDir . $e);
@@ -181,8 +183,9 @@ 
             $javascript->setFormName($view);
 
             $javascript->setSugarBean($sugarbean);
-            if ($view != "ConvertLead")
-                $javascript->addAllFields('', null,true);
+            if ($view != "ConvertLead") {
+                            $javascript->addAllFields('', null,true);
+            }
 
             $validatedFields = array();
             $javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty('LBL_ASSIGNED_TO'), 'false', '', 'assigned_user_id');
@@ -205,8 +208,7 @@ 
                         || isset($app_strings[$def['vname']])
                         || translate($def['vname'],$sugarbean->module_dir) != $def['vname']) {
                      $vname = $def['vname'];
-                  }
-                  else{
+                  } else{
                      $vname = "undefined";
                   }
                   $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
@@ -218,7 +220,7 @@ 
             $contents .= $javascript->getScript();
             $contents .= $this->createQuickSearchCode($defs, $defs2, $view, $module);
             $contents .= "{/literal}\n";
-        }else if(preg_match('/^SearchForm_.+/', $view)){
+        } else if(preg_match('/^SearchForm_.+/', $view)){
             global $dictionary, $beanList, $app_strings, $mod_strings;
             $mod = $beanList[$module];
 
@@ -320,10 +322,12 @@ 
     {
         $sqs_objects = array();
         require_once('include/QuickSearchDefaults.php');
-        if(isset($this) && $this instanceof TemplateHandler) //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
+        if(isset($this) && $this instanceof TemplateHandler) {
+            //If someone calls createQuickSearchCode as a static method (@see ImportViewStep3) $this becomes anoter object, not TemplateHandler
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults($this->getQSDLookup());
-        }else
+        }
+        } else
         {
             $qsd = QuickSearchDefaults::getQuickSearchDefaults(array());
         }
@@ -332,7 +336,7 @@ 
         	if(strpos($view, 'popup_query_form')){
         		$qsd->setFormName('popup_query_form');
             	$parsedView = 'advanced';
-        	}else{
+        	} else{
         		$qsd->setFormName('search_form');
             	$parsedView = preg_replace("/^SearchForm_/", "", $view);
         	}
@@ -350,8 +354,7 @@ 
 
                             if(!empty($f['name']) && !empty($f['id_name'])) {
                                 $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'],$f['id_name']);
-                            }
-                            else {
+                            } else {
                                 $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser();
                             }
                         } else if($matches[0] == 'Campaigns') {
@@ -387,13 +390,16 @@ 
                 } //if-else
             } //foreach
 
-            foreach ( $sqs_objects as $name => $field )
-               foreach ( $field['populate_list'] as $key => $fieldname )
+            foreach ( $sqs_objects as $name => $field ) {
+                           foreach ( $field['populate_list'] as $key => $fieldname )
                     $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_'.$parsedView;
-        }else{
+            }
+        } else{
             //Loop through the Meta-Data fields to see which ones need quick search support
             foreach($defs2 as $f) {
-                if(!isset($defs[$f['name']])) continue;
+                if(!isset($defs[$f['name']])) {
+                    continue;
+                }
 
                 $field = $defs[$f['name']];
                 if ($view == "ConvertLead")
@@ -404,13 +410,13 @@ 
                         $ida_suffix = "_".$lc_module.$lc_module."_ida";
                         if (preg_match('/'.$ida_suffix.'$/', $field['id_name']) > 0) {
                             $field['id_name'] = $module . $field['id_name'];
+                        } else {
+                                                    $field['id_name'] = $field['name'] . "_" . $field['id_name'];
+                        }
+                    } else {
+                        if (!empty($field['id_name'])) {
+                                                    $field['id_name'] = $module.$field['id_name'];
                         }
-                        else
-                            $field['id_name'] = $field['name'] . "_" . $field['id_name'];
-                    }
-                    else {
-                        if (!empty($field['id_name']))
-                            $field['id_name'] = $module.$field['id_name'];
                     }
                 }
 				$name = $qsd->form_name . '_' . $field['name'];
@@ -428,10 +434,9 @@ 
                             if($field['name'] == 'reports_to_name'){
                                 $sqs_objects[$name] = $qsd->getQSUser('reports_to_name','reports_to_id');
                              // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
-                            }elseif($field['name'] == 'assigned_user_name'){
+                            } elseif($field['name'] == 'assigned_user_name'){
                                  $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
-                             }
-                             else
+                             } else
                              {
                                  $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
 
@@ -462,9 +467,9 @@ 
                         if(!isset($field['field_list']) && !isset($field['populate_list'])) {
                             $sqs_objects[$name]['populate_list'] = array($field['name'], $field['id_name']);
                             // now handle quicksearches where the column to match is not 'name' but rather specified in 'rname'
-                            if (!isset($field['rname']))
-                                $sqs_objects[$name]['field_list'] = array('name', 'id');
-                            else
+                            if (!isset($field['rname'])) {
+                                                            $sqs_objects[$name]['field_list'] = array('name', 'id');
+                            } else
                             {
                                 $sqs_objects[$name]['field_list'] = array($field['rname'], 'id');
                                 $sqs_objects[$name]['order'] = $field['rname'];

include/MVC/View/SugarView.php

Braces +131 added lines, -105 removed lines

@@ -161,13 +161,17 @@ 
             echo $jsAlerts->getScript();
         }
 
-        if ($this->_getOption('show_subpanels') && !empty($_REQUEST['record'])) $this->_displaySubPanels();
+        if ($this->_getOption('show_subpanels') && !empty($_REQUEST['record'])) {
+            $this->_displaySubPanels();
+        }
 
         if ($this->action === 'Login') {
             //this is needed for a faster loading login page ie won't render unless the tables are closed
             ob_flush();
         }
-        if ($this->_getOption('show_footer')) $this->displayFooter();
+        if ($this->_getOption('show_footer')) {
+            $this->displayFooter();
+        }
         $GLOBALS['logic_hook']->call_custom_logic('', 'after_ui_footer');
         if ($this->_getOption('json_output'))
         {
@@ -186,11 +190,13 @@ 
                 'favicon' => $this->getFavicon(),
             );
 
-            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic)
-                $ajax_ret['moduleList'] = $this->displayHeader(true);
+            if(SugarThemeRegistry::current()->name == 'Classic' || SugarThemeRegistry::current()->classic) {
+                            $ajax_ret['moduleList'] = $this->displayHeader(true);
+            }
 
-            if(empty($this->responseTime))
-                $this->_calculateFooterMetrics();
+            if(empty($this->responseTime)) {
+                            $this->_calculateFooterMetrics();
+            }
             $ajax_ret['responseTime'] = $this->responseTime;
             $json = getJSONobj();
             echo $json->encode($ajax_ret);
@@ -214,8 +220,7 @@ 
 
         if ( !$this->suppressDisplayErrors ) {
             echo $errors;
-        }
-        else {
+        } else {
             return $errors;
         }
     }
@@ -329,24 +334,26 @@ 
         ob_end_clean();
 
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
-            $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
-        else
-            $module_favicon = false;
+        if(isset($GLOBALS['sugar_config']['default_module_favicon'])) {
+                    $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
+        } else {
+                    $module_favicon = false;
+        }
 
         $favicon = $this->getFavicon();
         $ss->assign('FAVICON_URL', $favicon['url']);
 
         // build the shortcut menu
         $shortcut_menu = array();
-        foreach ( $this->getMenu() as $key => $menu_item )
-            $shortcut_menu[$key] = array(
+        foreach ( $this->getMenu() as $key => $menu_item ) {
+                    $shortcut_menu[$key] = array(
                 "URL"         => $menu_item[0],
                 "LABEL"       => $menu_item[1],
                 "MODULE_NAME" => $menu_item[2],
                 "IMAGE"       => $themeObject
                     ->getImage($menu_item[2],"border='0' align='absmiddle'",null,null,'.gif',$menu_item[1]),
                 );
+        }
         $ss->assign("SHORTCUT_MENU",$shortcut_menu);
 
         // handle rtl text direction
@@ -370,8 +377,7 @@ 
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
-        }
-        else {
+        } else {
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
@@ -379,14 +385,14 @@ 
             if ( $width > 212 || $height > 40 ) {
                 $resizePctWidth  = ($width - 212)/212;
                 $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
-                    $resizeAmount = $width / 212;
-                else
-                    $resizeAmount = $height / 40;
+                if ( $resizePctWidth > $resizePctHeight ) {
+                                    $resizeAmount = $width / 212;
+                } else {
+                                    $resizeAmount = $height / 40;
+                }
                 $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
                 $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
-            }
-            else {
+            } else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
                 $ss->assign("COMPANY_LOGO_HEIGHT", $height);
             }
@@ -429,11 +435,12 @@ 
                 }
                 // and now the sublinks
                 if ( $linkattribute == 'submenu' && is_array($attributevalue) ) {
-                    foreach ($attributevalue as $submenulinkkey => $submenulinkinfo)
-                        $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
+                    foreach ($attributevalue as $submenulinkkey => $submenulinkinfo) {
+                                            $gcls[$key]['SUBMENU'][$submenulinkkey] = array(
                             "LABEL" => key($submenulinkinfo),
                             "URL"   => current($submenulinkinfo),
                         );
+                    }
                        if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
                            $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
@@ -445,8 +452,9 @@ 
 
         $ss->assign("SEARCH", isset($_REQUEST['query_string']) ? $_REQUEST['query_string'] : '');
 
-        if ($this->action == "EditView" || $this->action == "Login")
-            $ss->assign("ONLOAD", 'onload="set_focus()"');
+        if ($this->action == "EditView" || $this->action == "Login") {
+                    $ss->assign("ONLOAD", 'onload="set_focus()"');
+        }
 
         $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
 
@@ -506,8 +514,7 @@ 
                 foreach($frames as $key => $values){
                         $fullModuleList[$key] = $values;
                 }
-            }
-            elseif (isset($fullModuleList['iFrames'])) {
+            } elseif (isset($fullModuleList['iFrames'])) {
                 unset($fullModuleList['iFrames']);
             }
 
@@ -523,8 +530,7 @@ 
                     // We have a default value. Use it
                     if(isset($GLOBALS['sugar_config']['default_max_tabs'])){
                         $max_tabs = $GLOBALS['sugar_config']['default_max_tabs'];
-                    }
-                    else{
+                    } else{
                         $max_tabs = 8;
                     }
                 }
@@ -633,7 +639,9 @@ 
                         );
                 }
             }
-            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $ss->assign('lock_homepage', true);
+            if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+                $ss->assign('lock_homepage', true);
+            }
             $ss->assign("groupTabs",$groupTabs);
             $ss->assign("shortcutTopMenu",$shortcutTopMenu);
             $ss->assign('USE_GROUP_TABS',$usingGroupTabs);
@@ -676,8 +684,9 @@ 
         global $mod_strings;
         $mod_strings = $bakModStrings;
         $headerTpl = $themeObject->getTemplate('header.tpl');
-        if (inDeveloperMode() )
-            $ss->clear_compiled_tpl($headerTpl);
+        if (inDeveloperMode() ) {
+                    $ss->clear_compiled_tpl($headerTpl);
+        }
 
         if ($retModTabs)
         {
@@ -716,8 +725,9 @@ 
         global $gridline, $request_string, $modListHeader, $dashletData, $authController, $locale, $currentModule, $import_bean_map, $image_path, $license;
         global $user_unique_key, $server_unique_key, $barChartColors, $modules_exempt_from_availability_check, $dictionary, $current_language, $beanList, $beanFiles, $sugar_build, $sugar_codename;
         global $timedate, $login_error; // cn: bug 13855 - timedate not available to classic views.
-        if (!empty($this->module))
-            $currentModule = $this->module;
+        if (!empty($this->module)) {
+                    $currentModule = $this->module;
+        }
         require_once ($file);
     }
 
@@ -747,8 +757,9 @@ 
             if ( typeof(SUGAR.themes) == 'undefined' ) SUGAR.themes = {};
         </script>
 EOQ;
-        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
-            echo getVersionedScript('modules/Sync/headersync.js');
+        if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client']) {
+                    echo getVersionedScript('modules/Sync/headersync.js');
+        }
     }
 
     /**
@@ -849,8 +860,9 @@ 
 
 			echo $this->_getModLanguageJS();
 
-            if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
-                echo getVersionedScript('modules/Sync/headersync.js');
+            if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client']) {
+                            echo getVersionedScript('modules/Sync/headersync.js');
+            }
 
 
             //echo out the $js_vars variables as javascript variables
@@ -917,8 +929,9 @@ 
 			}
 		}
 		$ss->assign("BOTTOMLINKS",$bottomLinksStr);
-        if (SugarConfig::getInstance()->get('calculate_response_time', false))
-            $ss->assign('STATISTICS',$this->_getStatistics());
+        if (SugarConfig::getInstance()->get('calculate_response_time', false)) {
+                    $ss->assign('STATISTICS',$this->_getStatistics());
+        }
 
         // Under the License referenced above, you are required to leave in all copyright statements in both
         // the code and end-user application.
@@ -956,8 +969,7 @@ 
             $ss->assign("COMPANY_LOGO_MD5", $company_logo_attributes[0]);
             $ss->assign("COMPANY_LOGO_WIDTH", $company_logo_attributes[1]);
             $ss->assign("COMPANY_LOGO_HEIGHT", $company_logo_attributes[2]);
-        }
-        else {
+        } else {
             // Always need to md5 the file
             $ss->assign("COMPANY_LOGO_MD5", md5_file($companyLogoURL));
 
@@ -965,14 +977,14 @@ 
             if ( $width > 212 || $height > 40 ) {
                 $resizePctWidth  = ($width - 212)/212;
                 $resizePctHeight = ($height - 40)/40;
-                if ( $resizePctWidth > $resizePctHeight )
-                    $resizeAmount = $width / 212;
-                else
-                    $resizeAmount = $height / 40;
+                if ( $resizePctWidth > $resizePctHeight ) {
+                                    $resizeAmount = $width / 212;
+                } else {
+                                    $resizeAmount = $height / 40;
+                }
                 $ss->assign("COMPANY_LOGO_WIDTH", round($width * (1/$resizeAmount)));
                 $ss->assign("COMPANY_LOGO_HEIGHT", round($height * (1/$resizeAmount)));
-            }
-            else {
+            } else {
                 $ss->assign("COMPANY_LOGO_WIDTH", $width);
                 $ss->assign("COMPANY_LOGO_HEIGHT", $height);
             }
@@ -1030,8 +1042,9 @@ 
 
     protected function _buildModuleList()
     {
-        if (!empty($GLOBALS['current_user']) && empty($GLOBALS['modListHeader']))
-            $GLOBALS['modListHeader'] = query_module_access_list($GLOBALS['current_user']);
+        if (!empty($GLOBALS['current_user']) && empty($GLOBALS['modListHeader'])) {
+                    $GLOBALS['modListHeader'] = query_module_access_list($GLOBALS['current_user']);
+        }
     }
 
     /**
@@ -1051,7 +1064,9 @@ 
             return $this->options['show_all'];
         } elseif (!empty($this->options) && isset($this->options[$option])) {
             return $this->options[$option];
-        } else return $default;
+        } else {
+            return $default;
+        }
     }
 
     /**
@@ -1088,10 +1103,11 @@ 
 
     public function renderJavascript()
     {
-        if ($this->action !== 'Login')
-            $this->_displayJavascript();
-        else
-            $this->_displayLoginJS();
+        if ($this->action !== 'Login') {
+                    $this->_displayJavascript();
+        } else {
+                    $this->_displayLoginJS();
+        }
     }
 
     private function _calculateFooterMetrics()
@@ -1198,8 +1214,9 @@ 
     {
         global $current_language, $current_user, $mod_strings, $app_strings, $module_menu;
 
-        if ( empty($module) )
-            $module = $this->module;
+        if ( empty($module) ) {
+                    $module = $this->module;
+        }
 
         //Need to make sure the mod_strings match the requested module or Menus may fail
         $curr_mod_strings = $mod_strings;
@@ -1220,13 +1237,14 @@ 
                 $GLOBALS['mod_strings']['LNK_NEW_RECORD'],"{$GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL']}$module" ,$module );
             $module_menu[] = array("index.php?module=$module&action=index", $GLOBALS['mod_strings']['LNK_LIST'],
                 $module, $module);
-            if ( ($this->bean instanceOf SugarBean) && !empty($this->bean->importable) )
-                if ( !empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]) )
+            if ( ($this->bean instanceOf SugarBean) && !empty($this->bean->importable) ) {
+                            if ( !empty($mod_strings['LNK_IMPORT_'.strtoupper($module)]) )
                     $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
                         $mod_strings['LNK_IMPORT_'.strtoupper($module)], "Import", $module);
-                else
-                    $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
+            } else {
+                                    $module_menu[] = array("index.php?module=Import&action=Step1&import_module=$module&return_module=$module&return_action=index",
                         $app_strings['LBL_IMPORT'], "Import", $module);
+                }
         }
         if (file_exists('custom/application/Ext/Menus/menu.ext.php')) {
             require('custom/application/Ext/Menus/menu.ext.php');
@@ -1251,22 +1269,25 @@ 
 		$defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
 		
         // Need to figure out what tab this module belongs to, most modules have their own tabs, but there are exceptions.
-        if ( !empty($_REQUEST['module_tab']) )
-            return $_REQUEST['module_tab'];
-        elseif ( isset($moduleTabMap[$this->module]) )
-            return $moduleTabMap[$this->module];
+        if ( !empty($_REQUEST['module_tab']) ) {
+                    return $_REQUEST['module_tab'];
+        } elseif ( isset($moduleTabMap[$this->module]) ) {
+                    return $moduleTabMap[$this->module];
+        }
         // Special cases
-        elseif ( $this->module == 'MergeRecords' )
-            return !empty($_REQUEST['merge_module']) ? $_REQUEST['merge_module'] : $_REQUEST['return_module'];
-        elseif ( $this->module == 'Users' && $this->action == 'SetTimezone' )
-            return $defaultTab;
+        elseif ( $this->module == 'MergeRecords' ) {
+                    return !empty($_REQUEST['merge_module']) ? $_REQUEST['merge_module'] : $_REQUEST['return_module'];
+        } elseif ( $this->module == 'Users' && $this->action == 'SetTimezone' ) {
+                    return $defaultTab;
+        }
         // Default anonymous pages to be under Home
-        elseif ( !isset($app_list_strings['moduleList'][$this->module]) )
-            return $defaultTab;
-        elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" )
-        	return $defaultTab;
-        else
-            return $this->module;
+        elseif ( !isset($app_list_strings['moduleList'][$this->module]) ) {
+                    return $defaultTab;
+        } elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" ) {
+                	return $defaultTab;
+        } else {
+                    return $this->module;
+        }
     }
 
    /**
@@ -1317,7 +1338,10 @@ 
         if($show_help || $this->type == 'list') {
             $theTitle .= "<span class='utils'>";
             $createImageURL = SugarThemeRegistry::current()->getImageURL('create-record.gif');
-            if($this->type == 'list') $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>';$url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
+            if($this->type == 'list') {
+                $theTitle .= '<a href="#" class="btn btn-success showsearch"><span class=" glyphicon glyphicon-search" aria-hidden="true"></span></a>';
+            }
+            $url = ajaxLink("index.php?module=$module&action=EditView&return_module=$module&return_action=DetailView");
             if($show_help) {
                 $theTitle .= <<<EOHTML
 &nbsp;
@@ -1349,14 +1373,14 @@ 
         if(file_exists('custom/' .$coreMetaPath )){
             $metadataFile = 'custom/' . $coreMetaPath;
             $foundViewDefs = true;
-        }else{
+        } else{
             if(file_exists('custom/modules/'.$this->module.'/metadata/metafiles.php')){
                 require_once('custom/modules/'.$this->module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$this->module][$viewDef])){
                     $metadataFile = $metafiles[$this->module][$viewDef];
                     $foundViewDefs = true;
                 }
-            }elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
+            } elseif(file_exists('modules/'.$this->module.'/metadata/metafiles.php')){
                 require_once('modules/'.$this->module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$this->module][$viewDef])){
                     $metadataFile = $metafiles[$this->module][$viewDef];
@@ -1391,9 +1415,9 @@ 
                 if(!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
                     $params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->get_summary_text()."</a>";
                     $params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
+                } else {
+                                    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
                 }
-                else
-                    $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
                 break;
             case 'DetailView':
                 $beanName = $this->bean->get_summary_text();
@@ -1417,10 +1441,11 @@ 
     	global $current_user;
     	global $app_strings;
 
-    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
-    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
-    	else
-    		$firstParam = $this->module;
+    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module])) {
+    	    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
+    	} else {
+    	    		$firstParam = $this->module;
+    	}
 
     	$iconPath = $this->getModuleTitleIconPath($this->module);
     	if($this->action == "ListView" || $this->action == "index") {
@@ -1436,8 +1461,7 @@ 
 			} else {
 				return $firstParam;
 			}
-    	}
-    	else {
+    	} else {
 		    if (!empty($iconPath) && !$browserTitle) {
 				//return "<a href='index.php?module={$this->module}&action=index'>$this->module</a>";
 			} else {
@@ -1451,8 +1475,7 @@ 
     	$iconPath = "";
     	if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
-    	}
-    	else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
+    	} else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
     		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
     	}
     	return $iconPath;
@@ -1469,11 +1492,13 @@ 
         global $app_strings;
 
         $browserTitle = $app_strings['LBL_BROWSER_TITLE'];
-        if ( $this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login') )
-            return $browserTitle;
+        if ( $this->module == 'Users' && ($this->action == 'SetTimezone' || $this->action == 'Login') ) {
+                    return $browserTitle;
+        }
         $params = $this->_getModuleTitleParams(true);
-        foreach ($params as $value )
-            $browserTitle = strip_tags($value) . ' &raquo; ' . $browserTitle;
+        foreach ($params as $value ) {
+                    $browserTitle = strip_tags($value) . ' &raquo; ' . $browserTitle;
+        }
 
         return $browserTitle;
     }
@@ -1487,8 +1512,7 @@ 
     {
     	if(SugarThemeRegistry::current()->directionality == "ltr") {
         	return "<span class='pointer'>&raquo;</span>";
-        }
-        else {
+        } else {
         	return "<span class='pointer'>&laquo;</span>";
         }
     }
@@ -1510,8 +1534,7 @@ 
         }
         if ( empty($sugar_config['disableAjaxUI']) ) {
             $config_js[] = "SUGAR.config.disableAjaxUI = false;";
-        }
-        else{
+        } else{
             $config_js[] = "SUGAR.config.disableAjaxUI = true;";
         }
         if ( !empty($sugar_config['addAjaxBannedModules']) ){
@@ -1581,18 +1604,21 @@ 
     protected function getFavicon()
     {
         // get favicon
-        if(isset($GLOBALS['sugar_config']['default_module_favicon']))
-            $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
-        else
-            $module_favicon = false;
+        if(isset($GLOBALS['sugar_config']['default_module_favicon'])) {
+                    $module_favicon = $GLOBALS['sugar_config']['default_module_favicon'];
+        } else {
+                    $module_favicon = false;
+        }
 
         $themeObject = SugarThemeRegistry::current();
 
         $favicon = '';
-        if ( $module_favicon )
-            $favicon = $themeObject->getImageURL($this->module.'.gif',false);
-        if ( !sugar_is_file($favicon) || !$module_favicon )
-            $favicon = $themeObject->getImageURL('sugar_icon.ico',false);
+        if ( $module_favicon ) {
+                    $favicon = $themeObject->getImageURL($this->module.'.gif',false);
+        }
+        if ( !sugar_is_file($favicon) || !$module_favicon ) {
+                    $favicon = $themeObject->getImageURL('sugar_icon.ico',false);
+        }
 
         $extension = pathinfo($favicon, PATHINFO_EXTENSION);
         switch ($extension)

include/MVC/Controller/ControllerFactory.php

Braces +5 added lines, -5 removed lines

@@ -57,23 +57,23 @@
 			require_once('custom/modules/'.$module.'/controller.php');
 			if(class_exists($customClass)){
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if(class_exists($class)){
 				$controller = new $class();
 			}
-		}elseif(file_exists('modules/'.$module.'/controller.php')){
+		} elseif(file_exists('modules/'.$module.'/controller.php')){
 			require_once('modules/'.$module.'/controller.php');
 			if(class_exists($customClass)){
 				$controller = new $customClass();
-			}else if(class_exists($class)){
+			} else if(class_exists($class)){
 				$controller = new $class();
 			}
-		}else{
+		} else{
 			if(file_exists('custom/include/MVC/Controller/SugarController.php')){
 				require_once('custom/include/MVC/Controller/SugarController.php');
 			}
 			if(class_exists('CustomSugarController')){
 				$controller = new CustomSugarController();
-			}else{
+			} else{
 			$controller = new SugarController();
 			}
 		}

include/MVC/Controller/SugarController.php

Braces +52 added lines, -46 removed lines

@@ -171,11 +171,13 @@ 
 	 *
 	 */
 	public function setup($module = ''){
-		if(empty($module) && !empty($_REQUEST['module']))
-			$module = $_REQUEST['module'];
+		if(empty($module) && !empty($_REQUEST['module'])) {
+					$module = $_REQUEST['module'];
+		}
 		//set the module
-		if(!empty($module))
-			$this->setModule($module);
+		if(!empty($module)) {
+					$this->setModule($module);
+		}
 
 		if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
 			$this->target_module = $_REQUEST['target_module'];
@@ -199,18 +201,24 @@ 
 	 *
 	 */
 	private function loadPropertiesFromRequest(){
-		if(!empty($_REQUEST['action']))
-			$this->action = $_REQUEST['action'];
-		if(!empty($_REQUEST['record']))
-			$this->record = $_REQUEST['record'];
-		if(!empty($_REQUEST['view']))
-			$this->view = $_REQUEST['view'];
-		if(!empty($_REQUEST['return_module']))
-			$this->return_module = $_REQUEST['return_module'];
-		if(!empty($_REQUEST['return_action']))
-			$this->return_action = $_REQUEST['return_action'];
-		if(!empty($_REQUEST['return_id']))
-			$this->return_id = $_REQUEST['return_id'];
+		if(!empty($_REQUEST['action'])) {
+					$this->action = $_REQUEST['action'];
+		}
+		if(!empty($_REQUEST['record'])) {
+					$this->record = $_REQUEST['record'];
+		}
+		if(!empty($_REQUEST['view'])) {
+					$this->view = $_REQUEST['view'];
+		}
+		if(!empty($_REQUEST['return_module'])) {
+					$this->return_module = $_REQUEST['return_module'];
+		}
+		if(!empty($_REQUEST['return_action'])) {
+					$this->return_action = $_REQUEST['return_action'];
+		}
+		if(!empty($_REQUEST['return_id'])) {
+					$this->return_id = $_REQUEST['return_id'];
+		}
 	}
 
 	/**
@@ -235,8 +243,9 @@ 
 				$this->bean = new $class();
 				if(!empty($this->record)){
 					$this->bean->retrieve($this->record);
-					if($this->bean)
-						$GLOBALS['FOCUS'] = $this->bean;
+					if($this->bean) {
+											$GLOBALS['FOCUS'] = $this->bean;
+					}
 				}
 			}
 		}
@@ -250,7 +259,7 @@ 
 		if(!$$var){
 			if($merge && !empty($this->$var)){
 				$$var = $this->$var;
-			}else{
+			} else{
 				$$var = array();
 			}
 			if(file_exists('include/MVC/Controller/'. $var . '.php')){
@@ -293,13 +302,11 @@ 
             if(!empty($this->view))
             {
                 $this->processView();
-            }
-            elseif(!empty($this->redirect_url))
+            } elseif(!empty($this->redirect_url))
             {
             			$this->redirect();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->handleException($e);
         }
@@ -321,8 +328,7 @@ 
         {
             $logicHook->setBean($this->bean);
             $logicHook->call_custom_logic($this->bean->module_dir, "handle_exception", $e);
-        }
-        else
+        } else
         {
             $logicHook->call_custom_logic('', "handle_exception", $e);
         }
@@ -384,7 +390,7 @@ 
             }
 
 			$this->redirect();
-		}else{
+		} else{
 			$this->no_access();
 		}
 	}
@@ -491,8 +497,9 @@ 
 	 */
 	protected function redirect(){
 
-		if(!empty($this->redirect_url))
-			SugarApplication::redirect($this->redirect_url);
+		if(!empty($this->redirect_url)) {
+					SugarApplication::redirect($this->redirect_url);
+		}
 	}
 
 	////////////////////////////////////////////////////////
@@ -586,7 +593,7 @@ 
 				sugar_cleanup(true);
 			}
 			$this->bean->mark_deleted($_REQUEST['record']);
-		}else{
+		} else{
 			sugar_die("A record number must be specified to delete");
 		}
 	}
@@ -652,7 +659,7 @@ 
             unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']);//after massupdate, the page should redirect to no offset page
             $storeQuery->saveFromRequest($_REQUEST['module']);
             $_REQUEST = array('return_module' => $temp_req['return_module'], 'return_action' => $temp_req['return_action']);//for post_massupdate, to go back to original page.
-		}else{
+		} else{
 			sugar_die("You must massupdate at least one record");
 		}
 	}
@@ -711,8 +718,7 @@ 
 
 		        if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
 		            echo $dashlet->$requestedMethod();
-		        }
-		        else {
+		        } else {
 		            echo 'no method';
 		        }
 		    }
@@ -734,15 +740,13 @@ 
 		    if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
 		        $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
 		        $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
-		    }
-		    else { // display options
+		    } else { // display options
 		        $json = getJSONobj();
 		        return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
 		                                                 'body'  => $dashlet->displayOptions())));
 
 		    }
-		}
-		else {
+		} else {
 		    return '0';
 		}
 	}
@@ -824,13 +828,14 @@ 
 						$this->_processed = true;
 						$this->no_access();
 					}
-				}else{
+				} else{
 					$this->_processed = true;
 					$this->no_access();
 				}
 			}
-		}else
-			$this->_processed = false;
+		} else {
+					$this->_processed = false;
+		}
 	}
 
 	/**
@@ -865,8 +870,9 @@ 
         $this->loadMapping('entry_point_registry');
 
         if ( isset($this->entry_point_registry[$entryPoint]['auth'])
-                && !$this->entry_point_registry[$entryPoint]['auth'] )
-            return false;
+                && !$this->entry_point_registry[$entryPoint]['auth'] ) {
+                    return false;
+        }
         return true;
     }
 
@@ -879,8 +885,7 @@ 
 		$file = self::getActionFilename($this->do_action);
 		if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
 	        $action = $this->action_view_map[strtolower($this->do_action)];
-	    }
-	    else {
+	    } else {
 	        $action = $this->do_action;
 	    }
 	    // index actions actually maps to the view.list.php view
@@ -913,12 +918,13 @@ 
 			$GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
 			require_once($this->action_file_map[strtolower($this->do_action)]);
 			$this->_processed = true;
-		}elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
+		} elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
 			$GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
 			$this->view = $this->action_view_map[strtolower($this->do_action)];
 			$this->_processed = true;
-		}else
-			$this->no_action();
+		} else {
+					$this->no_action();
+		}
 	}
 
 	/**

include/javascript/getYUIComboFile.php

Braces +15 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if (empty($_REQUEST)) die();
+if (empty($_REQUEST)) {
+    die();
+}
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
@@ -58,20 +62,24 @@ 
 foreach ($_REQUEST as $param => $val)
 {
 	//No backtracking in the path
-	if (strpos($param, "..") !== false)
-        continue;
+	if (strpos($param, "..") !== false) {
+	        continue;
+	}
 
 	$version = explode("/", $param);
 	$version = $version[0];
-    if (empty($yui_path[$version])) continue;
+    if (empty($yui_path[$version])) {
+        continue;
+    }
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
 	$extension = substr($path, strrpos($path, "_") + 1);
 
 	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+	if (empty($types[$extension])) {
+		   continue;
+	}
 
 	if (empty($contentType))
     {

include/Dashlets/DashletGenericChart.php

Braces +59 added lines, -36 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.
@@ -121,10 +123,12 @@ 
         // load language files
         $this->loadLanguage($classname, 'modules/Charts/Dashlets/');
 
-        if ( empty($options['title']) )
-            $this->title = $this->dashletStrings['LBL_TITLE'];
-        if ( isset($options['autoRefresh']) )
-            $this->autoRefresh = $options['autoRefresh'];
+        if ( empty($options['title']) ) {
+                    $this->title = $this->dashletStrings['LBL_TITLE'];
+        }
+        if ( isset($options['autoRefresh']) ) {
+                    $this->autoRefresh = $options['autoRefresh'];
+        }
 
         $this->layoutManager = new LayoutManager();
         $this->layoutManager->setAttribute('context', 'Report');
@@ -140,8 +144,8 @@ 
     public function setRefreshIcon()
     {
     	$additionalTitle = '';
-        if($this->isRefreshable)
-
+        if($this->isRefreshable) {
+        
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
                 . $this->id
                 . '\',\'predefined_chart\'); return false;"><!--not_in_theme!-->'
@@ -154,6 +158,7 @@ 
                     translate('LBL_DASHLET_REFRESH', 'Home')
                 )
                 . '</a>';
+        }
         return $additionalTitle;
     }
 
@@ -200,25 +205,32 @@ 
 
         $options = array();
 
-        foreach($req as $name => $value)
-            if(!is_array($value)) $req[$name] = trim($value);
+        foreach($req as $name => $value) {
+                    if(!is_array($value)) $req[$name] = trim($value);
+        }
 
         foreach($this->_searchFields as $name => $params) {
             $widgetDef = $params;
-            if ( isset($this->getSeedBean()->field_defs[$name]) )
-                $widgetDef = $this->getSeedBean()->field_defs[$name];
-            if ( $widgetDef['type'] == 'date')           // special case date types
+            if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+            }
+            if ( $widgetDef['type'] == 'date') {
+                // special case date types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif ( $widgetDef['type'] == 'time')       // special case time types
+            } elseif ( $widgetDef['type'] == 'time') {
+                // special case time types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req['type_'.$widgetDef['name']], $timedate->get_time_format(), $timedate->dbTimeFormat);
-            elseif ( $widgetDef['type'] == 'datepicker') // special case datepicker types
+            } elseif ( $widgetDef['type'] == 'datepicker') {
+                // special case datepicker types
                 $options[$widgetDef['name']] = $timedate->swap_formats($req[$widgetDef['name']], $timedate->get_date_format(), $timedate->dbDayFormat);
-            elseif (!empty($req[$widgetDef['name']]))
-                $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            } elseif (!empty($req[$widgetDef['name']])) {
+                            $options[$widgetDef['name']] = $req[$widgetDef['name']];
+            }
         }
 
-        if (!empty($req['dashletTitle']))
-            $options['title'] = $req['dashletTitle'];
+        if (!empty($req['dashletTitle'])) {
+                    $options['title'] = $req['dashletTitle'];
+        }
 
         $options['autoRefresh'] = empty($req['autoRefresh']) ? '0' : $req['autoRefresh'];
 
@@ -241,19 +253,24 @@ 
                     $currentSearchFields[$name] = array();
 
                     $widgetDef = $params;
-                    if ( isset($this->getSeedBean()->field_defs[$name]) )
-                        $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    if ( isset($this->getSeedBean()->field_defs[$name]) ) {
+                                            $widgetDef = $this->getSeedBean()->field_defs[$name];
+                    }
 
-                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
+                    if($widgetDef['type'] == 'enum' || $widgetDef['type'] == 'singleenum') {
+                        $widgetDef['remove_blank'] = true;
+                    }
+                    // remove the blank option for the dropdown
 
-                    if ( empty($widgetDef['input_name0']) )
-                        $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    if ( empty($widgetDef['input_name0']) ) {
+                                            $widgetDef['input_name0'] = empty($this->$name) ? '' : $this->$name;
+                    }
                     $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], $this->getSeedBean()->module_dir);
-                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] )
-                        $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    if ( $currentSearchFields[$name]['label'] == $widgetDef['vname'] ) {
+                                            $currentSearchFields[$name]['label'] = translate($widgetDef['vname'], 'Charts');
+                    }
                     $currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->$name) ? '' : $this->$name));
-                }
-                else { // ability to create spacers in input fields
+                } else { // ability to create spacers in input fields
                     $currentSearchFields['blank' + $count]['label'] = '';
                     $currentSearchFields['blank' + $count]['input'] = '';
                     $count++;
@@ -289,8 +306,9 @@ 
      */
     protected function getSeedBean()
     {
-        if ( !($this->_seedBean instanceof SugarBean) )
-            $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        if ( !($this->_seedBean instanceof SugarBean) ) {
+                    $this->_seedBean = SugarModule::get($this->_seedName)->loadBean();
+        }
 
         return $this->_seedBean;
     }
@@ -412,9 +430,14 @@ 
         }
 
         //if(isset($sortby1[0]) && $sortby1[0]=='') unset($sortby1[0]);//the beginning of lead_source_dom is blank.
-        if(isset($sortby1[0]) && $sortby1[0]==array()) unset($sortby1[0]);//the beginning of month after search is blank.
+        if(isset($sortby1[0]) && $sortby1[0]==array()) {
+            unset($sortby1[0]);
+        }
+        //the beginning of month after search is blank.
 
-        if($ifsort2==false) $sortby2=array(0);
+        if($ifsort2==false) {
+            $sortby2=array(0);
+        }
 
         if($keycolname2!=null) {
             $sortby2 = array();
@@ -438,7 +461,9 @@ 
 
         foreach($sortby1 as $sort1) {
             foreach($sortby2 as $sort2) {
-                if($ifsort2) $a=0;
+                if($ifsort2) {
+                    $a=0;
+                }
                 foreach($data_set as $key => $value){
                     if($value[$keycolname1] == $sort1 && (!$ifsort2 || $value[$keycolname2]== $sort2)) {
                         if($translate1) {
@@ -461,15 +486,13 @@ 
                     if($translate1) {
                         $val[$keycolname1] = $app_list_strings[$keycolname1.'_dom'][$sort1];
                         $val[$keycolname1.'_dom_option'] = $sort1;
-                    }
-                    else {
+                    } else {
                         $val[$keycolname1] = $sort1;
                     }
                     if($translate2) {
                         $val[$keycolname2] = $app_list_strings[$keycolname2.'_dom'][$sort2];
                         $val[$keycolname2.'_dom_option'] = $sort2;
-                    }
-                    elseif($keycolname2!=null) {
+                    } elseif($keycolname2!=null) {
                         $val[$keycolname2] = $sort2;
                     }
                     array_push($data, $val);

include/Dashlets/DashletCacheBuilder.php

Braces +6 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.
@@ -73,8 +75,9 @@ 
                 if(is_file(preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file))) { // is there an associated meta data file?
                     $dashletFiles[$class]['meta'] = preg_replace('/(.*\/.*)(\.php)/Uis', '$1.meta$2', $file);
                     require($dashletFiles[$class]['meta']);
-                    if ( isset($dashletMeta[$class]['module']) )
-                        $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    if ( isset($dashletMeta[$class]['module']) ) {
+                                            $dashletFiles[$class]['module'] = $dashletMeta[$class]['module'];
+                    }
                 }
                 
                 $filesInDirectory = array();