adamjakab / SuiteCRM

modules/Project/ProjectJjwg_MapsLogicHook.php

Braces +2 added lines, -1 removed lines

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

modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php

Braces +2 added lines, -1 removed lines

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

modules/Cases/CasesJjwg_MapsLogicHook.php

Braces +2 added lines, -1 removed lines

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

modules/Accounts/AccountsJjwg_MapsLogicHook.php

Braces +2 added lines, -1 removed lines

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

data/SugarBean.php

Braces +338 added lines, -325 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.
@@ -315,8 +317,9 @@ 
         global  $dictionary, $current_user;
         static $loaded_defs = array();
         $this->db = DBManagerFactory::getInstance();
-        if (empty($this->module_name))
-            $this->module_name = $this->module_dir;
+        if (empty($this->module_name)) {
+                    $this->module_name = $this->module_dir;
+        }
         if((false == $this->disable_vardefs && empty($loaded_defs[$this->object_name])) || !empty($GLOBALS['reload_vardefs']))
         {
             VardefManager::loadVardef($this->module_dir, $this->object_name);
@@ -339,12 +342,15 @@ 
                 $this->setupCustomFields($this->module_dir);
             }
             //load up field_arrays from CacheHandler;
-            if(empty($this->list_fields))
-                $this->list_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'list_fields');
-            if(empty($this->column_fields))
-                $this->column_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'column_fields');
-            if(empty($this->required_fields))
-                $this->required_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'required_fields');
+            if(empty($this->list_fields)) {
+                            $this->list_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'list_fields');
+            }
+            if(empty($this->column_fields)) {
+                            $this->column_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'column_fields');
+            }
+            if(empty($this->required_fields)) {
+                            $this->required_fields = $this->_loadCachedArray($this->module_dir, $this->object_name, 'required_fields');
+            }
 
             if(isset($GLOBALS['dictionary'][$this->object_name]) && !$this->disable_vardefs)
             {
@@ -361,8 +367,7 @@ 
             $loaded_defs[$this->object_name]['required_fields'] =& $this->required_fields;
             $loaded_defs[$this->object_name]['field_name_map'] =& $this->field_name_map;
             $loaded_defs[$this->object_name]['field_defs'] =& $this->field_defs;
-        }
-        else
+        } else
         {
             $this->column_fields =& $loaded_defs[$this->object_name]['column_fields'] ;
             $this->list_fields =& $loaded_defs[$this->object_name]['list_fields'];
@@ -400,8 +405,9 @@ 
      */
     function getObjectName()
     {
-        if ($this->object_name)
-            return $this->object_name;
+        if ($this->object_name) {
+                    return $this->object_name;
+        }
 
         // This is a quick way out. The generated metadata files have the table name
         // as the key. The correct way to do this is to override this function
@@ -459,8 +465,7 @@ 
         if (isset($dictionary[$this->getObjectName()]['audited']))
         {
             return $dictionary[$this->getObjectName()]['audited'];
-        }
-        else
+        } else
         {
             return false;
         }
@@ -598,8 +603,9 @@ 
      */
     function getFieldDefinition($name)
     {
-        if ( !isset($this->field_defs[$name]) )
-            return false;
+        if ( !isset($this->field_defs[$name]) ) {
+                    return false;
+        }
 
         return $this->field_defs[$name];
     }
@@ -657,8 +663,9 @@ 
      */
     public function unPopulateDefaultValues()
     {
-        if ( !is_array($this->field_defs) )
-            return;
+        if ( !is_array($this->field_defs) ) {
+                    return;
+        }
 
         foreach ($this->field_defs as $field => $value) {
 		    if( !empty($this->$field)
@@ -698,8 +705,9 @@ 
     }
 
     function populateDefaultValues($force=false){
-        if ( !is_array($this->field_defs) )
-            return;
+        if ( !is_array($this->field_defs) ) {
+                    return;
+        }
         foreach($this->field_defs as $field=>$value){
             if((isset($value['default']) || !empty($value['display_default'])) && ($force || empty($this->$field))){
                 $type = $value['type'];
@@ -717,10 +725,11 @@ 
                         }
                         break;
                     case 'multienum':
-                        if(empty($value['default']) && !empty($value['display_default']))
-                            $this->$field = $value['display_default'];
-                        else
-                            $this->$field = $value['default'];
+                        if(empty($value['default']) && !empty($value['display_default'])) {
+                                                    $this->$field = $value['display_default'];
+                        } else {
+                                                    $this->$field = $value['default'];
+                        }
                         break;
                     case 'bool':
                     	if(isset($this->$field)){
@@ -770,8 +779,7 @@ 
         {
             $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename. " does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
-        }
-        else
+        } else
         {
             if (isset($dictionary[$key]['relationships']))
             {
@@ -821,8 +829,7 @@ 
             if($iscustom)
             {
                 $filename='custom/modules/' . $module_dir . '/Ext/Vardefs/vardefs.ext.php';
-            }
-            else
+            } else
             {
                 if ($key == 'User')
                 {
@@ -830,8 +837,7 @@ 
                     // this must be done because the Employees/vardefs.php does an include_once on
                     // Users/vardefs.php
                     $filename='modules/Users/vardefs.php';
-                }
-                else
+                } else
                 {
                     $filename='modules/'. $module_dir . '/vardefs.php';
                 }
@@ -845,8 +851,7 @@ 
                 {
                     $dictionary = $GLOBALS['dictionary'];
                 }
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found" . $filename);
                 return;
@@ -857,8 +862,7 @@ 
         {
             $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename. " does not exist");
             display_notice("meta data absent for table ".$tablename." keyed to $key ");
-        }
-        else
+        } else
         {
             if (isset($dictionary[$key]['relationships']))
             {
@@ -884,8 +888,7 @@ 
                     if (Relationship::exists($rel_name,$db))
                     {
                         $GLOBALS['log']->debug('Skipping, reltionship already exists '.$rel_name);
-                    }
-                    else
+                    } else
                     {
                         $seed = BeanFactory::getBean("Relationships");
                         $keys = array_keys($seed->field_defs);
@@ -895,12 +898,10 @@ 
                             if ($key == "id")
                             {
                                 $toInsert[$key] = create_guid();
-                            }
-                            else if ($key == "relationship_name")
+                            } else if ($key == "relationship_name")
                             {
                                 $toInsert[$key] = $rel_name;
-                            }
-                            else if (isset($rel_def[$key]))
+                            } else if (isset($rel_def[$key]))
                             {
                                 $toInsert[$key] = $rel_def[$key];
                             }
@@ -916,8 +917,7 @@ 
                         $db->query($insert_string, true);
                     }
                 }
-            }
-            else
+            } else
             {
                 //todo
                 //log informational message stating no relationships meta was set for this bean.
@@ -986,10 +986,11 @@ 
             //if rel_name is provided, search the fieldef array keys by name.
             if (isset($fieldDefs[$rel_name]['type']) && $fieldDefs[$rel_name]['type'] == 'link')
             {
-                if ($class == "Link2")
-                    $this->$rel_name = new $class($rel_name, $this);
-                else
-                    $this->$rel_name = new $class($fieldDefs[$rel_name]['relationship'], $this, $fieldDefs[$rel_name]);
+                if ($class == "Link2") {
+                                    $this->$rel_name = new $class($rel_name, $this);
+                } else {
+                                    $this->$rel_name = new $class($fieldDefs[$rel_name]['relationship'], $this, $fieldDefs[$rel_name]);
+                }
 
                 if (empty($this->$rel_name) ||
                         (method_exists($this->$rel_name, "loadedSuccesfully") && !$this->$rel_name->loadedSuccesfully()))
@@ -1048,8 +1049,9 @@ 
     function get_linked_beans($field_name,$bean_name = '', $order_by = '', $begin_index = 0, $end_index = -1, $deleted=0, $optional_where="")
     {
         //if bean_name is Case then use aCase
-        if($bean_name=="Case")
-            $bean_name = "aCase";
+        if($bean_name=="Case") {
+                    $bean_name = "aCase";
+        }
 
         if($this->load_relationship($field_name)) {
             if ($this->$field_name instanceof Link) {
@@ -1057,19 +1059,20 @@ 
                 return array_values($this->$field_name->getBeans(new $bean_name(), $order_by, $begin_index, $end_index, $deleted, $optional_where));
             } else {
                 // Link2 style
-                if ($end_index != -1 || !empty($deleted) || !empty($optional_where) || !empty($order_by))
-                    return array_values($this->$field_name->getBeans(array(
+                if ($end_index != -1 || !empty($deleted) || !empty($optional_where) || !empty($order_by)) {
+                                    return array_values($this->$field_name->getBeans(array(
                         'where' => $optional_where,
                         'deleted' => $deleted,
                         'limit' => ($end_index - $begin_index),
                         'order_by' => $order_by
                     )));
-                else
-                    return array_values($this->$field_name->getBeans());
+                } else {
+                                    return array_values($this->$field_name->getBeans());
+                }
             }
+        } else {
+                    return array();
         }
-        else
-            return array();
     }
 
     /**
@@ -1131,8 +1134,7 @@ 
                            || is_bool($value_array['importable']) && $value_array['importable'] == true)) {
                         $importableFields[$key]=$value_array;
                     }
-                }
-                else {
+                } else {
 
                     //Expose the cooresponding id field of a relate field if it is only defined as a link so that users can relate records by id during import
                     if( isset($value_array['type']) && ($value_array['type'] == 'relate') && isset($value_array['id_name']) )
@@ -1217,8 +1219,7 @@ 
             if ($this->load_relationship($name))
             {
                 $this->$name->delete($id);
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->fatal("error loading relationship $name");
             }
@@ -1239,8 +1240,7 @@ 
         {
             $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name. " does not exist");
             display_notice("meta data absent for table ".$this->table_name." keyed to $key ");
-        }
-        else
+        } else
         {
             if(!$this->db->tableExists($this->table_name))
             {
@@ -1248,12 +1248,11 @@ 
                     if($this->bean_implements('ACL')){
                         if(!empty($this->acltype)){
                             ACLAction::addActions($this->getACLCategory(), $this->acltype);
-                        }else{
+                        } else{
                             ACLAction::addActions($this->getACLCategory());
                         }
                     }
-            }
-            else
+            } else
             {
                 echo "Table already exists : $this->table_name<br>";
             }
@@ -1281,10 +1280,13 @@ 
             $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name. " does not exist");
             echo "meta data absent for table ".$this->table_name."<br>\n";
         } else {
-            if(empty($this->table_name))return;
-            if ($this->db->tableExists($this->table_name))
-
+            if(empty($this->table_name)) {
+                return;
+            }
+            if ($this->db->tableExists($this->table_name)) {
+            
                 $this->db->dropTable($this);
+            }
             if ($this->db->tableExists($this->table_name. '_cstm'))
             {
                 $this->db->dropTableName($this->table_name. '_cstm');
@@ -1322,8 +1324,9 @@ 
             if (isset($def['type'])) {
                 $type=$def['type'];
             }
-            if(isset($def['dbType']))
-                $type .= $def['dbType'];
+            if(isset($def['dbType'])) {
+                            $type .= $def['dbType'];
+            }
 
             if($def['type'] == 'html' || $def['type'] == 'longhtml') {
                 $this->$key = SugarCleaner::cleanHtml($this->$key, true);
@@ -1373,7 +1376,9 @@ 
 
         $this->_checkOptimisticLocking($action, $isUpdate);
 
-        if(!empty($this->modified_by_name)) $this->old_modified_by_name = $this->modified_by_name;
+        if(!empty($this->modified_by_name)) {
+            $this->old_modified_by_name = $this->modified_by_name;
+        }
         if($this->update_modified_by)
         {
             $this->modified_user_id = 1;
@@ -1384,8 +1389,9 @@ 
                 $this->modified_by_name = $current_user->user_name;
             }
         }
-        if ($this->deleted != 1)
-            $this->deleted = 0;
+        if ($this->deleted != 1) {
+                    $this->deleted = 0;
+        }
         if(!$isUpdate)
         {
             if (empty($this->date_entered))
@@ -1607,7 +1613,7 @@ 
 
                 if(!$notify_mail->Send()) {
                     $GLOBALS['log']->fatal("Notifications: error sending e-mail (method: {$notify_mail->Mailer}), (error: {$notify_mail->ErrorInfo})");
-                }else{
+                } else{
                     $GLOBALS['log']->info("Notifications: e-mail successfully sent");
                 }
             }
@@ -1646,8 +1652,7 @@ 
         $xtpl = new XTemplate(get_notify_template_file($current_language));
         if($this->module_dir == "Cases") {
             $template_name = "Case"; //we should use Case, you can refer to the en_us.notify_template.html.
-        }
-        else {
+        } else {
             $template_name = $beanList[$this->module_dir]; //bug 20637, in workflow this->object_name = strange chars.
         }
 
@@ -1745,8 +1750,7 @@ 
             // if we should use relation data from properties (for REQUEST-independent calls)
             $rel_id = isset($this->new_rel_id) ? $this->new_rel_id : '';
             $rel_link = isset($this->new_rel_relname) ? $this->new_rel_relname : '';
-        }
-        else
+        } else
         {
             // if we should use relation data from REQUEST
             $rel_id = isset($_REQUEST['relate_id']) ? $_REQUEST['relate_id'] : '';
@@ -1765,8 +1769,7 @@ 
             if ($isRelationshipLoaded && !empty($this->$rel_link) && $this->$rel_link->getRelationshipObject() && $this->$rel_link->getRelationshipObject()->getLHSModule() == $this->$rel_link->getRelationshipObject()->getRHSModule() )
             {
                 $new_rel_link = $this->$rel_link->getRelationshipObject()->getLHSLink();
-            }
-            else
+            } else
             {
                 //Try to find the link in this bean based on the relationship
                 foreach ($this->field_defs as $key => $def)
@@ -1800,7 +1803,9 @@ 
             foreach ($this->relationship_fields as $id => $rel_name)
             {
 
-                if (in_array($id, $exclude)) continue;
+                if (in_array($id, $exclude)) {
+                    continue;
+                }
 
                 if(!empty($this->$id))
                 {
@@ -1853,8 +1858,10 @@ 
         foreach ($this->field_defs as $def)
         {
             if ($def ['type'] == 'relate' && isset ($def ['id_name']) && isset ($def ['link']) && isset ($def['save'])) {
-                if (in_array($def['id_name'], $exclude) || in_array($def['id_name'], $this->relationship_fields))
-                    continue; // continue to honor the exclude array and exclude any relationships that will be handled by the relationship_fields mechanism
+                if (in_array($def['id_name'], $exclude) || in_array($def['id_name'], $this->relationship_fields)) {
+                                    continue;
+                }
+                // continue to honor the exclude array and exclude any relationships that will be handled by the relationship_fields mechanism
 
                 $linkField = $def ['link'];
                 if (isset($this->field_defs[$linkField])) {
@@ -1911,12 +1918,14 @@ 
         {
             if (!empty($def['type']) && $def['type'] == "parent")
             {
-                if (empty($def['type_name']) || empty($def['id_name']))
-                    continue;
+                if (empty($def['type_name']) || empty($def['id_name'])) {
+                                    continue;
+                }
                 $typeField = $def['type_name'];
                 $idField = $def['id_name'];
-                if (in_array($idField, $exclude))
-                    continue;
+                if (in_array($idField, $exclude)) {
+                                    continue;
+                }
                 //Determine if the parent field has changed.
                 if (
                     //First check if the fetched row parent existed and now we no longer have one
@@ -2039,8 +2048,9 @@ 
 	{
 		global $disable_date_format;
 		global $timedate;
-		if (empty($timedate))
-			$timedate=TimeDate::getInstance();
+		if (empty($timedate)) {
+					$timedate=TimeDate::getInstance();
+		}
 
 		if(empty($this->field_defs))
 		{
@@ -2052,15 +2062,16 @@ 
 			if(!isset($this->processed_dates_times[$field]))
 			{
 				$this->processed_dates_times[$field] = '1';
-				if(empty($this->$field)) continue;
+				if(empty($this->$field)) {
+				    continue;
+				}
 				if($field == 'date_modified' || $field == 'date_entered')
 				{
 					$this->$field = $this->db->fromConvert($this->$field, 'datetime');
 					if(empty($disable_date_format)) {
 						$this->$field = $timedate->to_display_date_time($this->$field);
 					}
-				}
-				elseif(isset($this->field_name_map[$field]['type']))
+				} elseif(isset($this->field_name_map[$field]['type']))
 				{
 					$type = $this->field_name_map[$field]['type'];
 
@@ -2086,8 +2097,7 @@ 
 									$this->$rel_field = $timedate->to_display_time($mergetime);
 								}
 							}
-						}
-						else
+						} else
 						{
 							if(empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date($this->$field, false);
@@ -2098,8 +2108,7 @@ 
 						if($this->$field == '0000-00-00 00:00:00')
 						{
 							$this->$field = '';
-						}
-						else
+						} else
 						{
 							if(empty($disable_date_format)) {
 								$this->$field = $timedate->to_display_date_time($this->$field, true, true);
@@ -2188,7 +2197,9 @@ 
             switch($def['type']) {
                 case 'datetime':
                 case 'datetimecombo':
-                    if(empty($this->$field)) break;
+                    if(empty($this->$field)) {
+                        break;
+                    }
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
@@ -2200,7 +2211,9 @@ 
                     }
                     break;
                 case 'date':
-                    if(empty($this->$field)) break;
+                    if(empty($this->$field)) {
+                        break;
+                    }
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
@@ -2212,7 +2225,9 @@ 
                     }
                     break;
                 case 'time':
-                    if(empty($this->$field)) break;
+                    if(empty($this->$field)) {
+                        break;
+                    }
                     if ($this->$field == 'NULL') {
                     	$this->$field = '';
                     	break;
@@ -2301,7 +2316,9 @@ 
 
         $query .= $custom_join['join'];
         $query .= " WHERE $this->table_name.id = ".$this->db->quoted($id);
-        if ($deleted) $query .= " AND $this->table_name.deleted=0";
+        if ($deleted) {
+            $query .= " AND $this->table_name.deleted=0";
+        }
         $GLOBALS['log']->debug("Retrieve $this->object_name : ".$query);
         $result = $this->db->limitQuery($query,0,1,true, "Retrieving record by id $this->table_name:$id found ");
         if(empty($result))
@@ -2359,21 +2376,23 @@ 
             if (isset($def [ 'type' ]) && $def [ 'type' ] == 'relate' && isset ( $def [ 'id_name'] ) && isset ( $def [ 'link'] ) && isset ( $def[ 'save' ])) {
                 if (isset($this->$key)) {
                     $this->rel_fields_before_value[$key]=$this->$key;
-                    if (isset($this->$def [ 'id_name']))
-                        $this->rel_fields_before_value[$def [ 'id_name']]=$this->$def [ 'id_name'];
+                    if (isset($this->$def [ 'id_name'])) {
+                                            $this->rel_fields_before_value[$def [ 'id_name']]=$this->$def [ 'id_name'];
+                    }
+                } else {
+                                    $this->rel_fields_before_value[$key]=null;
                 }
-                else
-                    $this->rel_fields_before_value[$key]=null;
            }
         }
         if (isset($this->relationship_fields) && is_array($this->relationship_fields))
         {
             foreach ($this->relationship_fields as $rel_id=>$rel_name)
             {
-                if (isset($this->$rel_id))
-                    $this->rel_fields_before_value[$rel_id]=$this->$rel_id;
-                else
-                    $this->rel_fields_before_value[$rel_id]=null;
+                if (isset($this->$rel_id)) {
+                                    $this->rel_fields_before_value[$rel_id]=$this->$rel_id;
+                } else {
+                                    $this->rel_fields_before_value[$rel_id]=null;
+                }
             }
         }
 
@@ -2399,8 +2418,9 @@ 
         $nullvalue='';
         foreach($this->field_defs as $field=>$field_value)
         {
-            if(($field == 'user_preferences' && $this->module_dir == 'Users') || ($field == 'internal' && $this->module_dir == 'Cases') )
-                continue;
+            if(($field == 'user_preferences' && $this->module_dir == 'Users') || ($field == 'internal' && $this->module_dir == 'Cases') ) {
+                            continue;
+            }
             if(isset($row[$field]))
             {
                 $this->$field = $row[$field];
@@ -2408,8 +2428,7 @@ 
                 if(!empty($row[$owner])){
                     $this->$owner = $row[$owner];
                 }
-            }
-            else
+            } else
             {
                 $this->$field = $nullvalue;
             }
@@ -2453,10 +2472,11 @@ 
         //handle distinct clause
         $star = '*';
         if(substr_count(strtolower($query), 'distinct')){
-            if (!empty($this->seed) && !empty($this->seed->table_name ))
-                $star = 'DISTINCT ' . $this->seed->table_name . '.id';
-            else
-                $star = 'DISTINCT ' . $this->table_name . '.id';
+            if (!empty($this->seed) && !empty($this->seed->table_name )) {
+                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+            } else {
+                            $star = 'DISTINCT ' . $this->table_name . '.id';
+            }
 
         }
 
@@ -2477,10 +2497,11 @@ 
                 preg_match($pattern, $union_query, $matches);
                 if (!empty($matches)) {
                     if (stristr($matches[0], "distinct")) {
-                        if (!empty($this->seed) && !empty($this->seed->table_name ))
-                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
-                        else
-                            $star = 'DISTINCT ' . $this->table_name . '.id';
+                        if (!empty($this->seed) && !empty($this->seed->table_name )) {
+                                                    $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                        } else {
+                                                    $star = 'DISTINCT ' . $this->table_name . '.id';
+                        }
                     }
                 } // if
                 $replacement = 'SELECT count(' . $star . ') c FROM ';
@@ -2530,7 +2551,7 @@ 
             if(!empty($owner_where)){
                 if(empty($where)){
                     $where = $owner_where;
-                }else{
+                } else{
                     $where .= ' AND '.  $owner_where;
                 }
             }
@@ -2551,14 +2572,14 @@ 
     */
     public function process_order_by($order_by, $submodule = null, $suppress_table_name = false)
     {
-        if (empty($order_by))
-            return $order_by;
+        if (empty($order_by)) {
+                    return $order_by;
+        }
         //submodule is empty,this is for list object in focus
         if (empty($submodule))
         {
             $bean_queried = $this;
-        }
-        else
+        } else
         {
             //submodule is set, so this is for subpanel, use submodule
             $bean_queried = $submodule;
@@ -2653,8 +2674,7 @@ 
             if(empty($where))
             {
                 $where = $owner_where;
-            }
-            else
+            } else
             {
                 $where .= ' AND '.  $owner_where;
             }
@@ -2740,8 +2760,7 @@ 
             if(empty($entire_where))
             {
                 $entire_where = ' WHERE ' . $where;
-            }
-            else
+            } else
             {
                 $entire_where .= ' AND ' . $where;
             }
@@ -2781,16 +2800,15 @@ 
                             }
                             //call function from required file
                             $query_array = $shortcut_function_name($parameters);
-                        }else{
+                        } else{
                             //call function from parent bean
                             $query_array = $parentbean->$shortcut_function_name($parameters);
                         }
-                    }
-                    else
+                    } else
                     {
                         $query_array = $parentbean->$shortcut_function_name();
                     }
-                }  else {
+                } else {
                     $related_field_name = $this_subpanel->get_data_source_name();
                     if (!$parentbean->load_relationship($related_field_name)){
                         unset ($parentbean->$related_field_name);
@@ -2806,8 +2824,7 @@ 
                     if(empty($where_definition))
                     {
                         $where_definition = $table_where;
-                    }
-                    else
+                    } else
                     {
                         $where_definition .= ' AND ' . $table_where;
                     }
@@ -2898,8 +2915,7 @@ 
         {
             $subpanel_def->load_sub_subpanels();
             $subpanel_list=$subpanel_def->sub_subpanels;
-        }
-        else
+        } else
         {
             $subpanel_list[]=$subpanel_def;
         }
@@ -2926,7 +2942,7 @@ 
                         }
                         //call function from required file
                         $tmp_final_query =  $shortcut_function_name($parameters);
-                    }else{
+                    } else{
                         //call function from parent bean
                         $tmp_final_query =  $parentbean->$shortcut_function_name($parameters);
                     }
@@ -2954,8 +2970,9 @@ 
                 $query_fields = $GLOBALS['db']->getSelectFieldsFromQuery($subquery['select']);
                 foreach($query_fields as $field => $select)
                 {
-                    if (!in_array($field, $all_fields))
-                        $all_fields[] = $field;
+                    if (!in_array($field, $all_fields)) {
+                                            $all_fields[] = $field;
+                    }
                 }
                 $subqueries[$i]['query_fields'] = $query_fields;
             }
@@ -2969,8 +2986,7 @@ 
                     if (!isset($subquery['query_fields'][$field]))
                     {
                         $subquery['select'] .= " NULL $field,";
-                    }
-                    else
+                    } else
                     {
                         $subquery['select'] .= " {$subquery['query_fields'][$field]},";
                     }
@@ -2992,12 +3008,10 @@ 
                 if (!empty($subquery['params']['distinct']) && !empty($subpanel_def->table_name))
                 {
                     $query_rows = "( SELECT count(DISTINCT ". $subpanel_def->table_name . ".id)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
-                }
-                elseif ($select_position !== false && $distinct_position!= false)
+                } elseif ($select_position !== false && $distinct_position!= false)
                 {
                     $query_rows = "( ".substr_replace($query_array['select'],"SELECT count(",$select_position,6). ")" .  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
-                }
-                else
+                } else
                 {
                     //resort to default behavior.
                     $query_rows = "( SELECT count(*)".  $subquery['from_min'].$query_array['join']. $subquery['where'].' )';
@@ -3011,8 +3025,7 @@ 
                         if (empty($subquery['where']))
                         {
                             $subquerystring.=" WHERE " .$subquery['secondary_where'];
-                        }
-                        else
+                        } else
                         {
                             $subquerystring.=" AND " .$subquery['secondary_where'];
                         }
@@ -3055,8 +3068,7 @@ 
             {
                 $submodule->assign_display_fields($submodule->module_dir);
                 $response['list'] = array($submodule);
-            }
-            else
+            } else
         {
                 $response['list'] = array();
             }
@@ -3121,8 +3133,7 @@ 
             if(empty($where))
             {
                 $where = $owner_where;
-            }
-            else
+            } else
             {
                 $where .= ' AND '.  $owner_where;
             }
@@ -3169,8 +3180,7 @@ 
         if(empty($filter))
         {
             $ret_array['select'] = " SELECT $distinct $this->table_name.* ";
-        }
-        else
+        } else
         {
             $ret_array['select'] = " SELECT $distinct $this->table_name.id ";
         }
@@ -3184,8 +3194,7 @@ 
         {
             $ret_array['secondary_select']=& $ret_array['select'];
             $ret_array['secondary_from'] = & $ret_array['from'];
-        }
-        else
+        } else
         {
             $ret_array['secondary_select'] = '';
         }
@@ -3230,17 +3239,15 @@ 
                     if(isset($this->field_defs[$field]))
                     {
                         $fields[$field]= $this->field_defs[$field];
-                    }
-                    else
+                    } else
                     {
                         $fields[$field] = array('force_exists'=>true);
                     }
                 }
-            }else{
+            } else{
                 $fields = 	$filter;
             }
-        }
-        else
+        } else
         {
             $fields = 	$this->field_defs;
         }
@@ -3256,8 +3263,9 @@ 
 			$this->field_defs[$field]['source'] == 'non-db')
 		{
 			$addrelatefield = $this->get_relationship_field($field);
-			if ($addrelatefield)
-				$addrelate[$addrelatefield] = true;
+			if ($addrelatefield) {
+							$addrelate[$addrelatefield] = true;
+			}
 		}
 		if(!empty($this->field_defs[$field]['id_name'])){
 			$addrelate[$this->field_defs[$field]['id_name']] = true;
@@ -3279,15 +3287,15 @@ 
             {
                 if(!empty($filter) && isset($filter[$field]['force_exists']) && $filter[$field]['force_exists'])
                 {
-                    if ( isset($filter[$field]['force_default']) )
-                        $ret_array['select'] .= ", {$filter[$field]['force_default']} $field ";
-                    else
-                    //spaces are a fix for length issue problem with unions.  The union only returns the maximum number of characters from the first select statement.
+                    if ( isset($filter[$field]['force_default']) ) {
+                                            $ret_array['select'] .= ", {$filter[$field]['force_default']} $field ";
+                    } else {
+                                        //spaces are a fix for length issue problem with unions.  The union only returns the maximum number of characters from the first select statement.
                         $ret_array['select'] .= ", '                                                                                                                                                                                                                                                              ' $field ";
+                    }
                 }
                 continue;
-            }
-            else
+            } else
             {
                 $data = $this->field_defs[$field];
             }
@@ -3307,8 +3315,9 @@ 
                     }
                 }
 		
-            	if (!$process_field)
-                	continue;
+            	if (!$process_field) {
+            	                	continue;
+            	}
             }
 
             if(  (!isset($data['source']) || $data['source'] == 'db') && (!empty($alias) || !empty($filter) ))
@@ -3387,16 +3396,14 @@ 
                     if(empty($join_type))
                     {
                         $params['join_type'] = ' LEFT JOIN ';
-                    }
-                    else
+                    } else
                     {
                         $params['join_type'] = $join_type;
                     }
                     if(isset($data['join_name']))
                     {
                         $params['join_table_alias'] = $data['join_name'];
-                    }
-                    else
+                    } else
                     {
                         $params['join_table_alias']	= 'jt' . $jtcount;
 
@@ -3404,8 +3411,7 @@ 
                     if(isset($data['join_link_name']))
                     {
                         $params['join_table_link_alias'] = $data['join_link_name'];
-                    }
-                    else
+                    } else
                     {
                         $params['join_table_link_alias'] = 'jtl' . $jtcount;
                     }
@@ -3445,8 +3451,7 @@ 
                                 if(isset($rel_mod->field_defs['assigned_user_id']))
                                 {
                                     $ret_array['secondary_select'].= " , ".	$params['join_table_alias'] . ".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
-                                }
-                                else
+                                } else
                                 {
                                     if(isset($rel_mod->field_defs['created_by']))
                                     {
@@ -3459,8 +3464,7 @@ 
                         if(isset($data['db_concat_fields']))
                         {
                             $ret_array['secondary_select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
-                        }
-                        else
+                        } else
                         {
                             if(!isset($data['relationship_fields']))
                             {
@@ -3473,7 +3477,9 @@ 
                         }
                         $count_used =0;
                         foreach($used_join_key as $used_key) {
-                            if($used_key == $join['rel_key']) $count_used++;
+                            if($used_key == $join['rel_key']) {
+                                $count_used++;
+                            }
                         }
                         if($count_used <= 1) {//27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
                             // add rel_key only if it was not aready added
@@ -3487,7 +3493,9 @@ 
                         {
                             foreach($data['relationship_fields'] as $r_name=>$alias_name)
                             {
-                                if(!empty( $secondarySelectedFields[$alias_name]))continue;
+                                if(!empty( $secondarySelectedFields[$alias_name])) {
+                                    continue;
+                                }
                                 $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'].'.'. $r_name .' ' . $alias_name;
                                 $secondarySelectedFields[$alias_name] = true;
                             }
@@ -3500,14 +3508,12 @@ 
                                 $ret_array['secondary_where'] = $params['join_table_link_alias'] . '.' . $join['rel_key']. "='" .$parentbean->id . "'";
                             }
                         }
-                    }
-                    else
+                    } else
                     {
                         if(isset($data['db_concat_fields']))
                         {
                             $ret_array['select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
-                        }
-                        else
+                        } else
                         {
                             $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
                         }
@@ -3534,8 +3540,7 @@ 
                                 if(isset($rel_mod->field_defs['assigned_user_id']))
                                 {
                                     $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.assigned_user_id ' .  $field . '_owner';
-                                }
-                                else
+                                } else
                                 {
                                     $ret_array['select'] .= ' , ' .$params['join_table_alias'] . '.created_by ' .  $field . '_owner';
                                 }
@@ -3570,20 +3575,22 @@ 
 	                       $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
 
 				// For relationship fields replace their alias by the corresponsding link table and r_name
-				if(isset($data['relationship_fields']))
-					foreach($data['relationship_fields'] as $r_name=>$alias_name)
+				if(isset($data['relationship_fields'])) {
+									foreach($data['relationship_fields'] as $r_name=>$alias_name)
 					{
 						$db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
+				}
 						$where = preg_replace('/' . $alias_name . '/', $db_field, $where);
 					}
                     	}
-                    }else{
+                    } else{
                         $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.'.$data['rname'], $where);
 
 			// For relationship fields replace their alias by the corresponsding link table and r_name
-			if(isset($data['relationship_fields']))
-				foreach($data['relationship_fields'] as $r_name=>$alias_name)
+			if(isset($data['relationship_fields'])) {
+							foreach($data['relationship_fields'] as $r_name=>$alias_name)
 					$where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.'.$r_name, $where);
+			}
                     }
                     if(!$table_joined)
                     {
@@ -3600,8 +3607,7 @@ 
             if(isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id']))
             {
                 $ret_array['select'] .= ", $this->table_name.assigned_user_id ";
-            }
-            else if(isset($this->field_defs['created_by']) &&  empty($selectedFields[$this->table_name.'.created_by']))
+            } else if(isset($this->field_defs['created_by']) &&  empty($selectedFields[$this->table_name.'.created_by']))
             {
                 $ret_array['select'] .= ", $this->table_name.created_by ";
             }
@@ -3623,14 +3629,15 @@ 
         if($show_deleted == 0)
         {
             $where_auto = "$this->table_name.deleted=0";
-        }else if($show_deleted == 1)
+        } else if($show_deleted == 1)
         {
             $where_auto = "$this->table_name.deleted=1";
         }
-        if($where != "")
-            $ret_array['where'] = " where ($where) AND $where_auto";
-        else
-            $ret_array['where'] = " where $where_auto";
+        if($where != "") {
+                    $ret_array['where'] = " where ($where) AND $where_auto";
+        } else {
+                    $ret_array['where'] = " where $where_auto";
+        }
 
         //make call to process the order by clause
         $order_by = $this->process_order_by($order_by);
@@ -3660,8 +3667,9 @@ 
 			if (isset($value['relationship_fields']) && 
 				in_array($field, $value['relationship_fields']) &&
                 (!isset($value['link_type']) || $value['link_type'] != 'relationship_info')
-            )
-				return $field_def;
+            ) {
+							return $field_def;
+			}
 		}
 
 		return false;
@@ -3709,24 +3717,23 @@ 
                         if(isset($field_def['db_concat_fields']))
                         {
                             $queries[$child_info['parent_type']] .= ' , ' . $this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']) . ' parent_name';
-                        }
-                        else
+                        } else
                         {
                             $queries[$child_info['parent_type']] .= ' , name parent_name';
                         }
                         if(isset($templates[$child_info['parent_type']]->field_defs['assigned_user_id']))
                         {
                             $queries[$child_info['parent_type']] .= ", assigned_user_id parent_name_owner , '{$child_info['parent_type']}' parent_name_mod";;
-                        }else if(isset($templates[$child_info['parent_type']]->field_defs['created_by']))
+                        } else if(isset($templates[$child_info['parent_type']]->field_defs['created_by']))
                         {
                             $queries[$child_info['parent_type']] .= ", created_by parent_name_owner, '{$child_info['parent_type']}' parent_name_mod";
                         }
                         $queries[$child_info['parent_type']] .= " FROM " . $templates[$child_info['parent_type']]->table_name ." WHERE id IN ('{$child_info['parent_id']}'";
-                    }
-                    else
+                    } else
                     {
-                        if(empty($parent_child_map[$child_info['parent_id']]))
-                        $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
+                        if(empty($parent_child_map[$child_info['parent_id']])) {
+                                                $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
+                        }
                     }
                     $parent_child_map[$child_info['parent_id']][] = $child_info['child_id'];
                 }
@@ -3799,8 +3806,7 @@ 
                     $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
                 }
             }
-        }
-        else
+        } else
         {
             if((empty($limit) || $limit == -1))
             {
@@ -3817,8 +3823,7 @@ 
         if(!empty($limit) && $limit != -1 && $limit != -99)
         {
             $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
-        }
-        else
+        } else
         {
             $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
         }
@@ -3835,7 +3840,9 @@ 
             while ($max_per_page == -99 || ($index < $row_offset + $max_per_page))
             {
                 $row = $db->fetchByAssoc($result);
-                if (empty($row)) break;
+                if (empty($row)) {
+                    break;
+                }
 
                 //instantiate a new class each time. This is because php5 passes
                 //by reference by default so if we continually update $this, we will
@@ -3855,11 +3862,10 @@ 
                         }
 
                         $GLOBALS['log']->debug("$temp->object_name({$row['id']}): ".$field." = ".$temp->$field);
-                    }else if (isset($row[$this->table_name .'.'.$field]))
+                    } else if (isset($row[$this->table_name .'.'.$field]))
                     {
                         $temp->$field = $row[$this->table_name .'.'.$field];
-                    }
-                    else
+                    } else
                     {
                         $temp->$field = "";
                     }
@@ -3867,7 +3873,9 @@ 
 
                 $temp->check_date_relationships_load();
                 $temp->fill_in_additional_list_fields();
-                if($temp->hasCustomFields()) $temp->custom_fields->fill_relationships();
+                if($temp->hasCustomFields()) {
+                    $temp->custom_fields->fill_relationships();
+                }
                 $temp->call_custom_logic("process_record");
 
                 // fix defect #44206. implement the same logic as sugar_currency_format
@@ -3914,8 +3922,9 @@ 
         if (!$is_count_query)
         {
             $count_query = SugarBean::create_list_count_query($query);
-        } else
-            $count_query=$query;
+        } else {
+                    $count_query=$query;
+        }
 
         $result = $this->db->query($count_query, true, "Error running count query for $this->object_name List: ");
         $row_num = 0;
@@ -3988,8 +3997,7 @@ 
                 $row_offset = (floor(($rows_found -1) / $limit)) * $limit;
 
             }
-        }
-        else
+        } else
         {
             if((empty($limit) || $limit == -1))
             {
@@ -4011,8 +4019,7 @@ 
             if(!empty($limit) && $limit != -1 && $limit != -99)
             {
                 $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $parent_bean->object_name list: ");
-            }
-            else
+            } else
             {
                 $result = $db->query($query,true,"Error retrieving $this->object_name list: ");
             }
@@ -4058,13 +4065,11 @@ 
                             {
                                 $current_bean->$field = $this->convertField($row[$field], $value);
                                 unset($row[$field]);
-                            }
-                            else if (isset($row[$this->table_name .'.'.$field]))
+                            } else if (isset($row[$this->table_name .'.'.$field]))
                             {
                                 $current_bean->$field = $this->convertField($row[$this->table_name .'.'.$field], $value);
                                 unset($row[$this->table_name .'.'.$field]);
-                            }
-                            else
+                            } else
                             {
                                 $current_bean->$field = "";
                                 unset($row[$field]);
@@ -4088,8 +4093,7 @@ 
                             {
                                 $execute_function[] = 	$value['function_class'];
                                 $execute_function[] = 	$value['function_name'];
-                            }
-                            else
+                            } else
                             {
                                 $execute_function	= $value['function_name'];
                             }
@@ -4102,8 +4106,7 @@ 
                                         $can_execute = false;
                                     } else if($param == '$this') {
                                         $execute_params[] = $this;
-                                    }
-                                    else
+                                    } else
                                     {
                                         $execute_params[] = $this->$param;
                                     }
@@ -4114,13 +4117,11 @@ 
                                         $can_execute = false;
                                     } else if($param == '$this') {
                                         $execute_params[] = $current_bean;
-                                    }
-                                    else
+                                    } else
                                     {
                                         $execute_params[] = $current_bean->$param;
                                     }
-                                }
-                                else
+                                } else
                                 {
                                     $can_execute = false;
                                 }
@@ -4181,8 +4182,7 @@ 
             if(isset($post_retrieve))
             {
                 $parent_fields = $this->retrieve_parent_fields($post_retrieve);
-            }
-            else
+            } else
             {
                 $parent_fields = array();
             }
@@ -4201,8 +4201,7 @@ 
                     $previous_offset++;
                 }
             }
-        }
-        else
+        } else
         {
             $row_found 	= 0;
             $parent_fields = array();
@@ -4271,8 +4270,9 @@ 
 
         $response = Array();
         $response['bean'] = $this;
-        if (empty($total_rows))
-            $total_rows=0;
+        if (empty($total_rows)) {
+                    $total_rows=0;
+        }
         $response['row_count'] = $total_rows;
         $response['next_offset'] = $next_offset;
         $response['previous_offset'] = $previous_offset;
@@ -4315,8 +4315,7 @@ 
                 {
                     $bean->$field = $row[$field];
                     $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): ".$field." = ".$bean->$field);
-                }
-                else
+                } else
                 {
                     $bean->$field = '';
                 }
@@ -4333,8 +4332,11 @@ 
             $list[] = $bean;
         }
         //}
-        if (isset($list)) return $list;
-        else return null;
+        if (isset($list)) {
+            return $list;
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -4398,10 +4400,12 @@ 
             $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
         }
-		if(!empty($this->field_defs['created_by']) && !empty($this->created_by))
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id))
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+		if(!empty($this->field_defs['created_by']) && !empty($this->created_by)) {
+				$this->created_by_name = get_assigned_user_name($this->created_by);
+		}
+		if(!empty($this->field_defs['modified_user_id']) && !empty($this->modified_user_id)) {
+				$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+		}
 
 		if(!empty($this->field_defs['parent_name'])){
 			$this->fill_in_additional_parent_fields();
@@ -4416,7 +4420,7 @@ 
 
         if(!empty($this->parent_id) && !empty($this->last_parent_id) && $this->last_parent_id == $this->parent_id){
             return false;
-        }else{
+        } else{
             $this->parent_name = '';
         }
         if(!empty($this->parent_type)) {
@@ -4446,8 +4450,9 @@ 
         {
             $list=$this->$linkFieldName->get();
             $this->$idField = '' ; // match up with null value in $this->populateFromRow()
-            if (!empty($list))
-                $this->$idField = $list[0];
+            if (!empty($list)) {
+                            $this->$idField = $list[0];
+            }
         }
     }
 
@@ -4456,11 +4461,13 @@ 
     */
     function fill_in_relationship_fields(){
         global $fill_in_rel_depth;
-        if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0)
-            $fill_in_rel_depth = 0;
+        if(empty($fill_in_rel_depth) || $fill_in_rel_depth < 0) {
+                    $fill_in_rel_depth = 0;
+        }
 
-        if($fill_in_rel_depth > 1)
-            return;
+        if($fill_in_rel_depth > 1) {
+                    return;
+        }
 
         $fill_in_rel_depth++;
 
@@ -4502,13 +4509,13 @@ 
                     }
                     if(!empty($this->$id_name) && isset($this->$name))
                     {
-                        if(!isset($field['additionalFields']))
-                           $field['additionalFields'] = array();
+                        if(!isset($field['additionalFields'])) {
+                                                   $field['additionalFields'] = array();
+                        }
                         if(!empty($field['rname']))
                         {
                             $field['additionalFields'][$field['rname']]= $name;
-                        }
-                        else
+                        } else
                         {
                             $field['additionalFields']['name']= $name;
                         }
@@ -4543,8 +4550,7 @@ 
 		if(isset($_SESSION['show_deleted']))
 		{
 			$this->mark_undeleted($id);
-		}
-		else
+		} else
 		{
 			// call the custom business logic
 			$custom_logic_arguments['id'] = $id;
@@ -4806,8 +4812,7 @@ 
         if(!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1)
         {
             $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $template->object_name list: ");
-        }
-        else
+        } else
         {
             $result = $db->query($query, true);
         }
@@ -4876,8 +4881,7 @@ 
     if (!empty($limit))
     {
         $result = $db->limitQuery($query, $row_offset, $limit,true,"Error retrieving $this->object_name list: ");
-    }
-    else
+    } else
     {
         $result = $db->query($query, true);
     }
@@ -4923,8 +4927,7 @@ 
             if(empty($ids))
             {
                 $ids = "('" . $row['id'] . "'";
-            }
-            else
+            } else
             {
                 $ids .= ",'" . $row['id'] . "'";
             }
@@ -4932,7 +4935,7 @@ 
         if(empty($ids))
         {
             $ids = "('')";
-        }else{
+        } else{
             $ids .= ')';
         }
 
@@ -5004,10 +5007,12 @@ 
             if(isset($this->$field)){
 
                 // cn: bug 12270 - sensitive fields being passed arbitrarily in listViews
-                if(isset($sensitiveFields[$field]))
-                    continue;
-                if(!isset($cache[$field]))
-                    $cache[$field] = strtoupper($field);
+                if(isset($sensitiveFields[$field])) {
+                                    continue;
+                }
+                if(!isset($cache[$field])) {
+                                    $cache[$field] = strtoupper($field);
+                }
 
                 //Fields hidden by Dependent Fields
                 if (isset($value['hidden']) && $value['hidden'] === true) {
@@ -5024,18 +5029,17 @@ 
                     elseif(!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field]))
                     {
                         $return_array[$cache[$field]] = $mod_strings[$value['options']][$this->$field];
-                    }
-                    else{
+                    } else{
                         $return_array[$cache[$field]] = $this->$field;
                     }
                     //end bug 21672
 // tjy: no need to do this str_replace as the changes in 29994 for ListViewGeneric.tpl for translation handle this now
 //				}elseif(!empty($value['type']) && $value['type'] == 'multienum'&& empty($value['function'])){
 //					$return_array[strtoupper($field)] = str_replace('^,^', ', ', $this->$field );
-                }elseif(!empty($value['custom_module']) && $value['type'] != 'currency'){
+                } elseif(!empty($value['custom_module']) && $value['type'] != 'currency'){
 //					$this->format_field($value);
                     $return_array[$cache[$field]] = $this->$field;
-                }else{
+                } else{
                     $return_array[$cache[$field]] = $this->$field;
                 }
                 // handle "Assigned User Name"
@@ -5154,23 +5158,29 @@ 
     }
 
     function getRelatedFields($module, $id, $fields, $return_array = false){
-        if(empty($GLOBALS['beanList'][$module]))return '';
+        if(empty($GLOBALS['beanList'][$module])) {
+            return '';
+        }
         $object = BeanFactory::getObjectName($module);
 
         VardefManager::loadVardef($module, $object);
-        if(empty($GLOBALS['dictionary'][$object]['table']))return '';
+        if(empty($GLOBALS['dictionary'][$object]['table'])) {
+            return '';
+        }
         $table = $GLOBALS['dictionary'][$object]['table'];
         $query  = 'SELECT id';
         foreach($fields as $field=>$alias){
             if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])){
                 $query .= ' ,' .$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']) .  ' as ' . $alias ;
-            }else if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
+            } else if(!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
                 (empty($GLOBALS['dictionary'][$object]['fields'][$field]['source']) ||
                 $GLOBALS['dictionary'][$object]['fields'][$field]['source'] != "non-db"))
             {
                 $query .= ' ,' .$table . '.' . $field . ' as ' . $alias;
             }
-            if(!$return_array)$this->$alias = '';
+            if(!$return_array) {
+                $this->$alias = '';
+            }
         }
         if($query == 'SELECT id' || empty($id)){
             return '';
@@ -5181,8 +5191,7 @@ 
         {
             $query .= " , ".	$table  . ".assigned_user_id owner";
 
-        }
-        else if(isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
+        } else if(isset($GLOBALS['dictionary'][$object]['fields']['created_by']))
         {
             $query .= " , ".	$table . ".created_by owner";
 
@@ -5218,8 +5227,9 @@ 
         {
             if(isset($this->field_name_map[$field]) && empty($this->$field))
             {
-                if($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum')
-                $this->$field = $field;
+                if($this->field_name_map[$field]['type'] != 'date' && $this->field_name_map[$field]['type'] != 'enum') {
+                                $this->$field = $field;
+                }
                 if($this->field_name_map[$field]['type'] == 'date')
                 {
                     $this->$field = $timedate->to_display_date('1980-07-09');
@@ -5294,8 +5304,7 @@ 
             $query = "INSERT INTO $table (id, ". implode(',', array_keys($relate_values)) . ", date_modified) VALUES ('" . create_guid() . "', " . "'" . implode("', '", $relate_values) . "', ".$date_modified.")" ;
 
             $this->db->query($query, false, "Creating Relationship:" . $query);
-        }
-        else if ($do_update)
+        } else if ($do_update)
         {
             $conds = array();
             foreach($data_values as $key=>$value)
@@ -5374,10 +5383,12 @@ 
         if(!isset($this->processed) || $this->processed == false){
             //add some logic to ensure we do not get into an infinite loop
             if(!empty($this->logicHookDepth[$event])) {
-                if($this->logicHookDepth[$event] > $this->max_logic_depth)
-                    return;
-            }else
-                $this->logicHookDepth[$event] = 0;
+                if($this->logicHookDepth[$event] > $this->max_logic_depth) {
+                                    return;
+                }
+            } else {
+                            $this->logicHookDepth[$event] = 0;
+            }
 
             //we have to put the increment operator here
             //otherwise we may never increase the depth for that event in the case
@@ -5407,16 +5418,13 @@ 
         if ($this->custom_fields->avail_fields[$name]['ext1'])
         {
             $realKey = 'ext1';
-        }
-        elseif ($this->custom_fields->avail_fields[$name]['ext2'])
+        } elseif ($this->custom_fields->avail_fields[$name]['ext2'])
         {
             $realKey = 'ext2';
-        }
-        elseif ($this->custom_fields->avail_fields[$name]['ext3'])
+        } elseif ($this->custom_fields->avail_fields[$name]['ext3'])
         {
             $realKey = 'ext3';
-        }
-        else
+        } else
         {
             $GLOBALS['log']->fatal("SUGARBEAN: cannot find Real Key for custom field of type dropdown - cannot return Value.");
             return false;
@@ -5450,9 +5458,11 @@ 
 		/**
         if($is_owner == 'not_set')
 		*/
-    	if($is_owner === 'not_set') //eggsurplus: should be ===
+    	if($is_owner === 'not_set') {
+    	    //eggsurplus: should be ===
         {
             $not_set = true;
+    	}
             $is_owner = $this->isOwner($current_user->id);
         }
 		// DJM - OBS Customizations - May 2009
@@ -5503,8 +5513,9 @@ 
 			// DJM - OBS Customizations - END CHANGE
     	}
         //if we don't implent acls return true
-        if(!$this->bean_implements('ACL'))
-        return true;
+        if(!$this->bean_implements('ACL')) {
+                return true;
+        }
         $view = strtolower($view);
         switch ($view)
         {
@@ -5522,7 +5533,7 @@ 
                     $temp = new $class();
                     if(!empty($this->fetched_row) && !empty($this->fetched_row['id']) && !empty($this->fetched_row['assigned_user_id']) && !empty($this->fetched_row['created_by'])){
                         $temp->populateFromRow($this->fetched_row);
-                    }else{
+                    } else{
                         $temp->retrieve($this->id);
                     }
                     $is_owner = $temp->isOwner($current_user->id);
@@ -5601,10 +5612,11 @@ 
             }
             return false;
         } elseif (isset($this->assigned_user_id)) {
-            if($this->assigned_user_id == $user_id) return true;
+            if($this->assigned_user_id == $user_id) {
+                return true;
+            }
             return false;
-        }
-        else
+        } else
         {
             //other wise if there is a created_by that is the owner
             if(isset($this->created_by) && $this->created_by == $user_id)
@@ -5646,8 +5658,7 @@ 
         if($this->ACLAccess('DetailView'))
         {
             $array_assign['MAIN'] = 'a';
-        }
-        else
+        } else
         {
             $array_assign['MAIN'] = 'span';
         }
@@ -5666,20 +5677,20 @@ 
 
         foreach($this->field_defs as $field=>$data)
         {
-            if( !$dbOnly || !isset($data['source']) || $data['source'] == 'db')
-            if(!$stringOnly || is_string($this->$field))
+            if( !$dbOnly || !isset($data['source']) || $data['source'] == 'db') {
+                        if(!$stringOnly || is_string($this->$field))
             if($upperKeys)
             {
                                 if(!isset($cache[$field])){
                                     $cache[$field] = strtoupper($field);
+            }
                                 }
                 $arr[$cache[$field]] = $this->$field;
-            }
-            else
+            } else
             {
                 if(isset($this->$field)){
                     $arr[$field] = $this->$field;
-                }else{
+                } else{
                     $arr[$field] = '';
                 }
             }
@@ -5754,7 +5765,9 @@ 
 
         $this->fill_in_additional_list_fields();
 
-        if($this->hasCustomFields())$this->custom_fields->fill_relationships();
+        if($this->hasCustomFields()) {
+            $this->custom_fields->fill_relationships();
+        }
         $this->call_custom_logic("process_record");
     }
 
@@ -5847,7 +5860,10 @@ 
  */
     function decrypt_after_retrieve($value)
     {
-        if(empty($value)) return $value; // no need to decrypt empty
+        if(empty($value)) {
+            return $value;
+        }
+        // no need to decrypt empty
         require_once("include/utils/encryption_utils.php");
         return blowfishDecode($this->getEncryptKey(), $value);
     }
@@ -5874,16 +5890,14 @@ 
                     $_SESSION['o_lock_save'] = $saveform;
                     header('Location: index.php?module=OptimisticLock&action=LockResolve');
                     die();
-                }
-                else
+                } else
                 {
                     unset ($_SESSION['o_lock_object']);
                     unset ($_SESSION['o_lock_id']);
                     unset ($_SESSION['o_lock_dm']);
                 }
             }
-        }
-        else
+        } else
         {
             if(isset($_SESSION['o_lock_object']))	{ unset ($_SESSION['o_lock_object']); }
             if(isset($_SESSION['o_lock_id']))		{ unset ($_SESSION['o_lock_id']); }
@@ -5898,9 +5912,11 @@ 
     */
     private function _sendNotifications($check_notify){
         if($check_notify || (isset($this->notify_inworkflow) && $this->notify_inworkflow == true) // cn: bug 5795 - no invites sent to Contacts, and also bug 25995, in workflow, it will set the notify_on_save=true.
-           && !$this->isOwner($this->created_by) )  // cn: bug 42727 no need to send email to owner (within workflow)
+           && !$this->isOwner($this->created_by) ) {
+            // cn: bug 42727 no need to send email to owner (within workflow)
         {
             $admin = new Administration();
+        }
             $admin->retrieveSettings();
             $sendNotifications = false;
 
@@ -5908,13 +5924,11 @@ 
             {
                 $GLOBALS['log']->info("Notifications: user assignment has changed, checking if user receives notifications");
                 $sendNotifications = true;
-            }
-            elseif(isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
+            } elseif(isset($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == 1)
             {
                 // cn: bug 5795 Send Invites failing for Contacts
                 $sendNotifications = true;
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->info("Notifications: not sending e-mail, notify_on is set to OFF");
             }
@@ -6120,8 +6134,7 @@ 
             !empty($this->field_defs['email_addresses_non_primary']) && $this->field_defs['email_addresses_non_primary']['type'] == 'email')
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }

modules/Reminders/Reminder.php

Braces +6 added lines, -2 removed lines

@@ -105,7 +105,9 @@ 
     {
         $savedReminderIds = array();
         foreach ($remindersData as $reminderData) {
-            if (isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
+            if (isset($_POST['isDuplicate']) && $_POST['isDuplicate']) {
+                $reminderData->id = '';
+            }
             $reminderBean = BeanFactory::getBean('Reminders', $reminderData->id);
             $reminderBean->popup = $reminderData->popup;
             $reminderBean->email = $reminderData->email;
@@ -379,7 +381,9 @@ 
     {
         $ret = '';
         for ($i = 0; $i < strlen($timestr); $i++) {
-            if ($timestr[$i] != "'") $ret .= $timestr[$i];
+            if ($timestr[$i] != "'") {
+                $ret .= $timestr[$i];
+            }
         }
         return $ret;
     }

modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php

Braces +26 added lines, -19 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.
@@ -67,14 +69,17 @@ 
     {
         global $timedate;
 
-        if(empty($options['pbss_date_start']))
-            $options['pbss_date_start'] = $timedate->nowDbDate();
+        if(empty($options['pbss_date_start'])) {
+                    $options['pbss_date_start'] = $timedate->nowDbDate();
+        }
 
-        if(empty($options['pbss_date_end']))
-            $options['pbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        if(empty($options['pbss_date_end'])) {
+                    $options['pbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        }
 
-        if(empty($options['title']))
-            $options['title'] = translate('LBL_RGraph_PIPELINE_FORM_TITLE', 'Home');
+        if(empty($options['title'])) {
+                    $options['title'] = translate('LBL_RGraph_PIPELINE_FORM_TITLE', 'Home');
+        }
 
         parent::__construct($id,$options);
     }
@@ -86,11 +91,12 @@ 
     {
         global $app_list_strings;
 
-        if (!empty($this->pbss_sales_stages) && count($this->pbss_sales_stages) > 0)
-            foreach ($this->pbss_sales_stages as $key)
+        if (!empty($this->pbss_sales_stages) && count($this->pbss_sales_stages) > 0) {
+                    foreach ($this->pbss_sales_stages as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        }
 
         $this->_searchFields['pbss_sales_stages']['options'] = $app_list_strings['sales_stage_dom'];
         $this->_searchFields['pbss_sales_stages']['input_name0'] = $selected_datax;
@@ -265,15 +271,15 @@ 
                 $datax[$key] = $app_list_strings['sales_stage_dom'][$key];
                 $selected_datax[] = $key;
             }
-        }
-        else {
+        } else {
             $datax = $app_list_strings['sales_stage_dom'];
             $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
         }
 
         $result = $db->query($query);
-        while($row = $db->fetchByAssoc($result, false))
-            $temp_data[] = $row;
+        while($row = $db->fetchByAssoc($result, false)) {
+                    $temp_data[] = $row;
+        }
 
         // reorder and set the array based on the order of selected_datax
         foreach($selected_datax as $sales_stage){
@@ -348,10 +354,11 @@ 
 
     protected function resizeLabel($label)
     {
-        if(strlen($label) < $this->maxLabelSizeBeforeTotal)
-            return $label;
-        else
-            return substr($label,0,$this->maxLabelSizeBeforeTotal).$this->labelReplacementString;
+        if(strlen($label) < $this->maxLabelSizeBeforeTotal) {
+                    return $label;
+        } else {
+                    return substr($label,0,$this->maxLabelSizeBeforeTotal).$this->labelReplacementString;
+        }
 
     }
 

modules/Administration/Administration.php

Braces +15 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -106,10 +108,11 @@ 
         }
 
         while($row = $this->db->fetchByAssoc($result)) {
-            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
-                $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
-            else
-                $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password') {
+                            $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
+            } else {
+                            $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            }
             $this->settings[$row['category']] = true;
         }
         $this->settings[$category] = true;
@@ -120,8 +123,9 @@ 
             $oe->getSystemMailerSettings();
 
             foreach ($oe->field_defs as $def) {
-                if (strpos($def, "mail_") !== false)
-                    $this->settings[$def] = $oe->$def;
+                if (strpos($def, "mail_") !== false) {
+                                    $this->settings[$def] = $oe->$def;
+                }
             }
         }
 
@@ -165,13 +169,13 @@ 
         $row = $this->db->fetchByAssoc($result);
         $row_count = $row['the_count'];
 
-        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
-            $value = $this->encrpyt_before_save($value);
+        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password') {
+                    $value = $this->encrpyt_before_save($value);
+        }
 
         if( $row_count == 0){
             $result = $this->db->query("INSERT INTO config (value, category, name) VALUES ('$value','$category', '$key')");
-        }
-        else{
+        } else{
             $result = $this->db->query("UPDATE config SET value = '{$value}' WHERE category = '{$category}' AND name = '{$key}'");
         }
         sugar_cache_clear('admin_settings_cache');

include/InlineEditing/InlineEditing.php

Braces +31 added lines, -21 removed lines

@@ -75,7 +75,9 @@ 
             $vardef['type'] = 'varchar';
         }
 
-        if (isset($vardef['precision'])) unset($vardef['precision']);
+        if (isset($vardef['precision'])) {
+            unset($vardef['precision']);
+        }
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
@@ -115,8 +117,9 @@ 
         if (isset($vardef['function'])
             && ($vardef['function'] == 'getEmailAddressWidget'
                 || $vardef['function']['name'] == 'getEmailAddressWidget')
-        )
-            unset($vardef['function']);
+        ) {
+                    unset($vardef['function']);
+        }
 
         if (isset($vardef['name']) && ($vardef['name'] == 'date_modified')) {
             $vardef['name'] = 'aow_temp_date';
@@ -149,8 +152,9 @@ 
         }
 
         // hack to disable one of the js calls in this control
-        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown'))
-            $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown')) {
+                    $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        }
 
 
 
@@ -186,8 +190,9 @@ 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
 
     $fieldlist = array();
-    if (!isset($focus) || !($focus instanceof SugarBean))
-        require_once($beanFiles[$beanList[$module]]);
+    if (!isset($focus) || !($focus instanceof SugarBean)) {
+            require_once($beanFiles[$beanList[$module]]);
+    }
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields[$fieldname] = $focus->field_defs[$fieldname];
@@ -197,11 +202,13 @@ 
     foreach ($vardefFields as $name => $properties) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        }
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        }
     }
 
     // fill in function return values
@@ -209,8 +216,9 @@ 
         if (!empty($fieldlist[$fieldname]['function']['returns']) && $fieldlist[$fieldname]['function']['returns'] == 'html') {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
-                require_once($fieldlist[$fieldname]['function']['include']);
+            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include'])) {
+                            require_once($fieldlist[$fieldname]['function']['include']);
+            }
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
 
@@ -308,14 +316,14 @@ 
 
         if ($bean->field_defs[$field]['type'] == "multienum") {
             $bean->$field = encodeMultienumValue($value);
-        }else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
+        } else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
             $save_field = $bean->field_defs[$field]['id_name'];
             $bean->$save_field = $value;
             if ($bean->field_defs[$field]['type'] == 'parent') {
                 $bean->parent_type = $_REQUEST['parent_type'];
                 $bean->fill_in_additional_parent_fields(); // get up to date parent info as need it to display name
             }
-        }else{
+        } else{
             $bean->$field = $value;
         }
 
@@ -450,14 +458,15 @@ 
 
         //To fix github bug 880 (the rname was null and was causing a 500 error in the getFieldValueFromModule call to $fieldname
         $fieldName = 'name';//$vardef['name'];
-        if(!is_null($vardef['rname']))
-            $fieldName = $vardef['rname'];
+        if(!is_null($vardef['rname'])) {
+                    $fieldName = $vardef['rname'];
+        }
 
         if($vardef['ext2']){
 
             $value .= getFieldValueFromModule($fieldName,$vardef['ext2'],$record) . "</a>";
 
-        }else if(!empty($vardef['rname'])){
+        } else if(!empty($vardef['rname'])){
             $value .= getFieldValueFromModule($fieldName,$vardef['module'],$record) . "</a>";
 
         } else {
@@ -472,8 +481,9 @@ 
 function getFieldValueFromModule($fieldname, $module, $id)
 {
     //Github bug 880, if the fieldname is null, do no call from bean
-    if(is_null($fieldname))
-        return '';
+    if(is_null($fieldname)) {
+            return '';
+    }
 
     $bean = BeanFactory::getBean($module, $id);
     if (is_object($bean) && $bean->id != "") {
@@ -497,7 +507,7 @@ 
 
     if($bean->ACLAccess('EditView')) {
         return true;
-    }else {
+    } else {
         return false;
     }
 }