adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.listview.php

Braces +17 added lines, -11 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.
@@ -115,8 +116,9 @@ 
         			MB_LISTVIEW => 'LBL_LISTVIEW' ,
         			) ;
         $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) ) {
+					$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+		}
 		$this->translatedViewType = $translatedViewType;
 
         if ($this->fromModuleBuilder)
@@ -131,8 +133,9 @@ 
                 {
                     $subpanelLabel = $this->subpanelLabel;
                     // If the subpanel title has changed, use that for the label instead
-                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] )
-                        $subpanelLabel = $_REQUEST['subpanel_title'];
+                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] ) {
+                                            $subpanelLabel = $_REQUEST['subpanel_title'];
+                    }
 
                     $ajax->addCrumb( $subpanelLabel, '' );
                     $this->translatedViewType = $subpanelLabel . "&nbsp;" . translate("LBL_SUBPANEL", "ModuleBuilder");
@@ -158,8 +161,9 @@ 
                 {
                     $subpanelLabel = $this->subpanelLabel;
                     // If the subpanel title has changed, use that for the label instead
-                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] )
-                        $subpanelLabel = $_REQUEST['subpanel_title'];
+                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] ) {
+                                            $subpanelLabel = $_REQUEST['subpanel_title'];
+                    }
 
                     $ajax->addCrumb( $subpanelLabel, '' );
                     $this->translatedViewType = $subpanelLabel . "&nbsp;" . translate("LBL_SUBPANEL", "ModuleBuilder");
@@ -241,12 +245,14 @@ 
         $history = $parser->getHistory () ;
 
         $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
-        if ($this->subpanel)
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->subpanel}\")" ;
+        if ($this->subpanel) {
+                    $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->subpanel}\")" ;
+        }
 
         $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'";
-        if ($this->subpanel)
-            $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"{$this->subpanel}\")'";
+        if ($this->subpanel) {
+                    $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"{$this->subpanel}\")'";
+        }
 
         $buttons = array ( ) ;
         $buttons [] = array ( 'id' =>'savebtn', 'name' => 'savebtn' , 'image' => $imageSave , 'text' => (! $this->fromModuleBuilder)?$GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVEPUBLISH' ]: $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVE' ], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");if (countListFields()==0) ModuleBuilder.layoutValidation.popup() ; else ModuleBuilder.handleSave(\"edittabs\" )'" ) ;

modules/ModuleBuilder/views/view.dashlet.php

Braces +16 added lines, -12 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.
@@ -52,10 +53,11 @@ 
     {
         $this->editModule = $_REQUEST [ 'view_module' ] ;
         $this->editLayout = $_REQUEST [ 'view' ] ;
-        if(isset ( $_REQUEST [ 'view_package' ] ) && ! empty ( $_REQUEST [ 'view_package' ] ))
-            $this->editPackage = $_REQUEST [ 'view_package' ];
-        else
-            $this->editPackage = null;
+        if(isset ( $_REQUEST [ 'view_package' ] ) && ! empty ( $_REQUEST [ 'view_package' ] )) {
+                    $this->editPackage = $_REQUEST [ 'view_package' ];
+        } else {
+                    $this->editPackage = null;
+        }
 
         $this->fromModuleBuilder = isset ( $_REQUEST [ 'MB' ] ) || (isset($_REQUEST['view_package']) && $_REQUEST['view_package'] && $_REQUEST['view_package'] != 'studio') ;
 
@@ -121,7 +123,7 @@ 
 
             $ViewLabel = ($this->editLayout == MB_DASHLET) ? 'LBL_DASHLETLISTVIEW' : 'LBL_DASHLETSEARCHVIEW';
             $ajax->addCrumb ( translate ($ViewLabel, 'ModuleBuilder' ), '' ) ;
-        }else{
+        } else{
             $ajax->addCrumb ( translate($this->editModule), 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '")' ) ;
             $ajax->addCrumb ( translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&view_module=' . $this->editModule . '")');
             $ajax->addCrumb ( translate('LBL_DASHLET', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=dashlet&view_module=' . $this->editModule . '")' );
@@ -182,8 +184,9 @@ 
 
 
         $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
-        if (isset($this->searchlayout))
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
+        if (isset($this->searchlayout)) {
+                    $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
+        }
 
         $buttons = array ( ) ;
         if (! $this->fromModuleBuilder)
@@ -221,10 +224,11 @@ 
     {
         global $app_list_strings ;
 
-        if ($this->fromModuleBuilder)
-            $title = $this->editModule ;
-        else
-            $title =  $app_list_strings [ 'moduleList' ] [ $this->editModule ] ;
+        if ($this->fromModuleBuilder) {
+                    $title = $this->editModule ;
+        } else {
+                    $title =  $app_list_strings [ 'moduleList' ] [ $this->editModule ] ;
+        }
         
         return $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_EDIT' ] . ':&nbsp;' . $title ;
     }

modules/ModuleBuilder/views/view.history.php

Braces +4 added lines, -3 removed lines

@@ -103,8 +103,9 @@ 
         {
             $dbDate = $timedate->fromTimestamp($ts)->asDb();
             $displayTS = $timedate->to_display_date_time ( $dbDate ) ;
-            if ($page * $this->pageSize + $i + 1 == $count)
-                $displayTS = translate("LBL_MB_DEFAULT_LAYOUT");
+            if ($page * $this->pageSize + $i + 1 == $count) {
+                            $displayTS = translate("LBL_MB_DEFAULT_LAYOUT");
+            }
             $snapshots [ $ts ] = $displayTS ;
             $ts = $this->history->getNext () ;
         }
@@ -151,7 +152,7 @@ 
         {
         	require_once ("modules/ModuleBuilder/views/view.dashlet.php") ;
         	$view = new ViewDashlet ( ) ;
-        }  else if ($this->layout == 'popuplist' || $this->layout == 'popupsearch')
+        } else if ($this->layout == 'popuplist' || $this->layout == 'popupsearch')
         {
         	require_once ("modules/ModuleBuilder/views/view.popupview.php") ;
         	$view = new ViewPopupview ( ) ;

modules/ModuleBuilder/views/view.modulefields.php

Braces +26 added lines, -18 removed lines

@@ -143,7 +143,7 @@ 
             {
                 include($this->mbModule->path .'/language/'.$current_language.'.lang.php');
                 $this->mbModule->setModStrings($current_language,$mod_strings);
-            }elseif(file_exists($this->mbModule->path. '/language/en_us.lang.php')){
+            } elseif(file_exists($this->mbModule->path. '/language/en_us.lang.php')){
                 include($this->mbModule->path .'/language/en_us.lang.php');
                 $this->mbModule->setModStrings('en_us',$mod_strings);
             }
@@ -169,7 +169,7 @@ 
                 if($k != $module_name)
                 {
                     $titleLBL[$k]=translate("LBL_".strtoupper($k),'ModuleBuilder');
-                }else{
+                } else{
                     $titleLBL[$k]=$k;
                 }
                 foreach($v as $field => $def)
@@ -229,12 +229,15 @@ 
         $def
         )
     {
-        if(!empty($def['parent_id']))
-            unset($def['parent_id']);
-        if(!empty($def['parent_type']))
-            unset($def['parent_type']);
-        if(!empty($def['currency_id']))
-            unset($def['currency_id']);
+        if(!empty($def['parent_id'])) {
+                    unset($def['parent_id']);
+        }
+        if(!empty($def['parent_type'])) {
+                    unset($def['parent_type']);
+        }
+        if(!empty($def['currency_id'])) {
+                    unset($def['currency_id']);
+        }
         return $def;
     }
 	
@@ -245,23 +248,28 @@ 
     	if (isset($def['studio'])) {
             if (is_array($def [ 'studio' ]))
             {
-    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
-                    return true;
-    			if (isset($def['studio']['required']) && $def['studio']['required'])
-                    return true;
+    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true) {
+    			                    return true;
+    			}
+    			if (isset($def['studio']['required']) && $def['studio']['required']) {
+    			                    return true;
+    			}
                     
     		} else
     		{
-    			if ($def['studio'] == 'visible')
-                    return true;
-                if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] )
-                    return false;
+    			if ($def['studio'] == 'visible') {
+    			                    return true;
+    			}
+                if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] ) {
+                                    return false;
+                }
             }
         }
     	if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
 		{
-    		if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
-		  return true;
+    		if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id')) {
+    				  return true;
+    		}
 		}
 		
 		return false;

modules/ModuleBuilder/views/view.modulefield.php

Braces +49 added lines, -31 removed lines

@@ -66,14 +66,17 @@ 
         )
     {
         $fv = new FieldViewer();
-        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name']))$_REQUEST['field'] = $_REQUEST['name'];
+        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name'])) {
+            $_REQUEST['field'] = $_REQUEST['name'];
+        }
         $field_name = '';
-        if(!empty($this->view_object_map['field_name']))
-            $field_name = $this->view_object_map['field_name'];
-        elseif(!empty($_REQUEST['field']))
-            $field_name = $_REQUEST['field'];
-        else
-            $field_name = '';
+        if(!empty($this->view_object_map['field_name'])) {
+                    $field_name = $this->view_object_map['field_name'];
+        } elseif(!empty($_REQUEST['field'])) {
+                    $field_name = $_REQUEST['field'];
+        } else {
+                    $field_name = '';
+        }
 
         $action = 'saveField'; // tyoung bug 17606: default action is to save as a dynamic field; but for standard OOB
                                // fields we override this so don't create a new dynamic field instead of updating the existing field
@@ -81,16 +84,18 @@ 
         $isClone = false;
         if(!empty($this->view_object_map['is_clone']) && $this->view_object_map['is_clone']
             && (strcmp($field_name, "name") != 0)   // bug #35767, do not allow cloning of name field
-            )
-            $isClone = true;
+            ) {
+                    $isClone = true;
+        }
 		/*
 		$field_types =  array('varchar'=>'YourField', 'int'=>'Integer', 'float'=>'Decimal','bool'=>'Checkbox','enum'=>'DropDown',
 				'date'=>'Date', 'phone' => 'Phone', 'currency' => 'Currency', 'html' => 'HTML', 'radioenum' => 'Radio',
 				'relate' => 'Relate', 'address' => 'Address', 'text' => 'TextArea', 'url' => 'Link');
 		*/
 		$field_types = $GLOBALS['mod_strings']['fieldTypes'];
-		if (isset($field_types['encrypt']))
-		  unset($field_types['encrypt']);
+		if (isset($field_types['encrypt'])) {
+				  unset($field_types['encrypt']);
+		}
         $field_name_exceptions = array(
             //bug 22264: Field name must not be an SQL keyword.
             //Taken from SQL Server's list of reserved keywords; http://msdn.microsoft.com/en-us/library/aa238507(SQL.80).aspx
@@ -163,12 +168,13 @@ 
             }
           
             if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))
-                    $vardef['type'] = $_REQUEST['type'];
+                if(!empty($_REQUEST['type'])) {
+                                    $vardef['type'] = $_REQUEST['type'];
+                }
                     $fv->ss->assign('hideLevel', 0);
-            }elseif(isset($vardef['custom_module'])){
+            } elseif(isset($vardef['custom_module'])){
                 $fv->ss->assign('hideLevel', 2);
-            }else{
+            } else{
                 $action = 'saveSugarField'; // tyoung - for OOB fields we currently only support modifying the label
                 $fv->ss->assign('hideLevel', 3);
             }
@@ -196,10 +202,14 @@ 
             	}
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
-                    if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
+                    if(!empty($def['studio']) && $def['studio'] == "false") {
+                        continue;
+                    }
+                    //bug51866 
                     $enumFields[$field] = translate($def['vname'], $moduleName);
-                    if (substr($enumFields[$field], -1) == ":")
-                        $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
+                    if (substr($enumFields[$field], -1) == ":") {
+                                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
+                    }
                 }
             }
             $fv->ss->assign( 'allowAutoInc', $allowAutoInc);   
@@ -209,8 +219,9 @@ 
                 $fv->ss->assign('lbl_value', htmlentities(translate($vardef['vname'], $moduleName), ENT_QUOTES, 'UTF-8'));
             }
             $fv->ss->assign('module', $module);
-            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent')) {
+            				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            }
 
             $edit_or_add = 'editField' ;
 
@@ -232,14 +243,16 @@ 
             }
 
             if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))$vardef['type'] = $_REQUEST['type'];
+                if(!empty($_REQUEST['type'])) {
+                    $vardef['type'] = $_REQUEST['type'];
+                }
                     $fv->ss->assign('hideLevel', 0);
-            }else{
+            } else{
                 if(!empty($module->mbvardefs->vardef['fields'][$vardef['name']])){
                     $fv->ss->assign('hideLevel', 1);
-                }elseif(isset($vardef['custom_module'])){
+                } elseif(isset($vardef['custom_module'])){
                     $fv->ss->assign('hideLevel', 2);
-                }else{
+                } else{
                     $fv->ss->assign('hideLevel', 3); // tyoung bug 17350 - effectively mark template derived fields as readonly
                 }
             }
@@ -256,10 +269,12 @@ 
             $fv->ss->assign('package', $package);
             $fv->ss->assign('MB','1');
 
-            if(isset($vardef['vname']))
-                $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
-			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            if(isset($vardef['vname'])) {
+                            $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
+            }
+			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent')) {
+							$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+			}
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
@@ -270,8 +285,9 @@ 
                     {
                         $enumFields[$field] = isset($module->mblanguage->strings[$current_language][$def['vname']]) ?
                             $this->mbModule->mblanguage->strings[$current_language][$def['vname']] : translate($field);
-                        if (substr($enumFields[$field], -1) == ":")
-                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                        if (substr($enumFields[$field], -1) == ":") {
+                                                    $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                        }
                     }
                 }
             }
@@ -296,9 +312,11 @@ 
 		}
 		
         if((!empty($vardef['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
-           || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) // bug #35767, do not allow cloning of name field
+           || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) {
+            // bug #35767, do not allow cloning of name field
             {
                $fv->ss->assign('no_duplicate', true);
+        }
             }
 
         $fv->ss->assign('action',$action);

modules/ModuleBuilder/views/view.home.php

Braces +3 added lines, -1 removed lines

@@ -67,7 +67,9 @@
 		$smarty->assign('assistant',$assistant);
 		//initialize Assistant's display property.
 		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
+		if(!$userPref) {
+		    $userPref="na";
+		}
 		$smarty->assign('userPref',$userPref);
 		$ajax = new AjaxCompose();
 		$ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));

modules/ModuleBuilder/parsers/StandardField.php

Braces +32 added lines, -23 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.
@@ -60,8 +61,9 @@ 
             $bean_name = get_valid_bean_name($this->module);
             $dictionary = array($bean_name => array("fields" => array($field => array())));
             include("$this->base_path/sugarfield_$field.php");
-            if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field]))
-                $this->custom_def = $dictionary[$bean_name]["fields"][$field];
+            if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field])) {
+                            $this->custom_def = $dictionary[$bean_name]["fields"][$field];
+            }
     	}
     }
 
@@ -71,8 +73,9 @@ 
         {
             $dictionary = array();
             include("modules/{$this->module}/vardefs.php");
-            if (!empty($dictionary[$beanList[$this->module]]) && isset($dictionary[$beanList[$this->module]]["fields"][$field]))
-                $this->base_def = $dictionary[$beanList[$this->module]]["fields"][$field];
+            if (!empty($dictionary[$beanList[$this->module]]) && isset($dictionary[$beanList[$this->module]]["fields"][$field])) {
+                            $this->base_def = $dictionary[$beanList[$this->module]]["fields"][$field];
+            }
         }
     }
     
@@ -86,13 +89,15 @@ 
         global $dictionary, $beanList;
         
         
-        if (empty($beanList[$this->module]))
-            return false;
+        if (empty($beanList[$this->module])) {
+                    return false;
+        }
 
         $bean_name = get_valid_bean_name($this->module);
 
-        if (empty($dictionary[$bean_name]) || empty($dictionary[$bean_name]["fields"][$field->name]))
-            return false;
+        if (empty($dictionary[$bean_name]) || empty($dictionary[$bean_name]["fields"][$field->name])) {
+                    return false;
+        }
 
         $currdef = $dictionary[$bean_name]["fields"][$field->name];
 
@@ -120,8 +125,9 @@ 
            
         	if ($property == "action" || $property == "label_value" || $property == "label"
             	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
-            ) 
-            	continue;
+            ) {
+        	            	continue;
+        	}
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
@@ -134,26 +140,29 @@ 
             }
             
             //Remove any orphaned entries
-            if (isset($this->custom_def[$property]) && !isset($newDef[$property]))
-            	unset($this->custom_def[$property]);
+            if (isset($this->custom_def[$property]) && !isset($newDef[$property])) {
+                        	unset($this->custom_def[$property]);
+            }
 
             //Handle overrides of out of the box definitions with empty
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
             {
                 //Switch on type of the property to find what the correct 'empty' is.
-                if(is_string($this->base_def[$property]))
-                    $this->custom_def[$property] = "";
-                else if(is_array($this->base_def[$property]))
-                    $this->custom_def[$property] = array();
-                else if(is_bool($this->base_def[$property]))
-                    $this->custom_def[$property] = false;
-                else
-                    $this->custom_def[$property] = null;
+                if(is_string($this->base_def[$property])) {
+                                    $this->custom_def[$property] = "";
+                } else if(is_array($this->base_def[$property])) {
+                                    $this->custom_def[$property] = array();
+                } else if(is_bool($this->base_def[$property])) {
+                                    $this->custom_def[$property] = false;
+                } else {
+                                    $this->custom_def[$property] = null;
+                }
             }
         }
         
-        if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"]))
-        	unset($this->custom_def["duplicate_merge_dom_value"]);
+        if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"])) {
+                	unset($this->custom_def["duplicate_merge_dom_value"]);
+        }
         
         $this->writeVardefExtension($bean_name, $field, $this->custom_def);
     }

modules/ModuleBuilder/parsers/relationships/OneToOneRelationship.php

Braces +11 added lines, -6 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.
@@ -122,16 +124,19 @@ 
      */
     function buildFieldsToLayouts ()
     {
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
  
-        if ($this->lhs_module == $this->rhs_module) // don't add in two fields on recursive relationships
+        if ($this->lhs_module == $this->rhs_module) {
+            // don't add in two fields on recursive relationships
             return array ( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") );
-        else
-            return array (
+        } else {
+                    return array (
                 $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ,
                 $this->rhs_module => $this->getValidDBName($this->relationship_name . "_name")
             ) ;
+        }
     }
 
 }

modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php

Braces +53 added lines, -38 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.
@@ -107,9 +109,10 @@ 
     function __construct ($definition)
     {
         // set any undefined attributes to the default value
-        foreach ( array ( 'readonly' , 'deleted' , 'relationship_only', 'for_activities', 'is_custom', 'from_studio' ) as $key )
-            if (! isset ( $definition [ $key ] ))
+        foreach ( array ( 'readonly' , 'deleted' , 'relationship_only', 'for_activities', 'is_custom', 'from_studio' ) as $key ) {
+                    if (! isset ( $definition [ $key ] ))
                 $definition [ $key ] = false ;
+        }
         
         foreach ( self::$definitionKeys as $key )
         {
@@ -297,8 +300,9 @@ 
      */
     protected function getSubpanelDefinition ($relationshipName , $sourceModule , $subpanelName, $titleKeyName = '', $source = "")
     {
-        if (empty($source)) 
-        	$source = $this->getValidDBName($relationshipName);
+        if (empty($source)) {
+                	$source = $this->getValidDBName($relationshipName);
+        }
     	$subpanelDefinition = array ( ) ;
         $subpanelDefinition [ 'order' ] = 100 ;
         $subpanelDefinition [ 'module' ] = $sourceModule ;
@@ -308,7 +312,7 @@ 
         $subpanelDefinition [ 'sort_by' ] = 'id' ;
 		if(!empty($titleKeyName)){
 			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
+		} else{
 			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
 		}
         $subpanelDefinition [ 'get_subpanel_data' ] = $source ;
@@ -338,12 +342,15 @@ 
         $vardef [ 'source' ] = 'non-db' ;
         $vardef [ 'module' ] = $sourceModule ;
         $vardef [ 'bean_name' ] = BeanFactory::getObjectName($sourceModule) ;
-        if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
-        if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
-        if (!empty($id_name))
-            $vardef['id_name'] = $id_name;
+        if ($right_side) {
+                	$vardef [ 'side' ] = 'right' ;
+        }
+        if (!empty($vname)) {
+                    $vardef [ 'vname' ] = $vname;
+        }
+        if (!empty($id_name)) {
+                    $vardef['id_name'] = $id_name;
+        }
 
         return $vardef ;
     }
@@ -365,12 +372,14 @@ 
         $vardef [ 'relationship' ] = $relationshipName ;
         $vardef [ 'source' ] = 'non-db' ;
 		$vardef ['reportable'] = false;
-        if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
-        else
-        	$vardef [ 'side' ] = 'left' ;
-        if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
+        if ($right_side) {
+                	$vardef [ 'side' ] = 'right' ;
+        } else {
+                	$vardef [ 'side' ] = 'left' ;
+        }
+        if (!empty($vname)) {
+                    $vardef [ 'vname' ] = $vname;
+        }
 
         return $vardef ;
     }
@@ -391,7 +400,7 @@ 
         $vardef [ 'source' ] = 'non-db' ;
 		if(!empty($vnameLabel)){
 			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
-		}else{
+		} else{
 			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
 		}
         
@@ -420,11 +429,10 @@ 
             $module = $mb->getPackageModule ( $parsedModuleName['packageName'] , $parsedModuleName['moduleName'] ) ;
             if (in_array( 'file' , array_keys ( $module->config [ 'templates' ] ) ) ){
                 $vardef [ 'rname' ] = 'document_name' ;
-            }elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
+            } elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
             	$vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
             }
-        }
-        else
+        } else
         {
             switch ( strtolower( $sourceModule ) )
             {
@@ -452,7 +460,7 @@ 
                     if ( isset ( $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
                     	if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
                     		$vardef [ 'rname' ] = 'document_name' ;
-                    	}elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
+                    	} elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
                     		 $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
                     	}
                     }
@@ -513,8 +521,9 @@ 
             // but as we need to display the true cardinality in Studio and ModuleBuilder we also record the actual relationship type
             // this property is only used by Studio/MB
             $properties [ 'true_relationship_type' ] = $relationshipType ;
-            if ($this->from_studio)
-                $properties [ 'from_studio' ] = true;
+            if ($this->from_studio) {
+                            $properties [ 'from_studio' ] = true;
+            }
 
             $rel_properties [ 'join_table' ] = $this->getValidDBName ( $relationshipName."_c" ) ;
             // a and b are in case the module relates to itself
@@ -525,8 +534,9 @@ 
         // set the extended properties if they exist = for now, many-to-many definitions do not have to contain a role_column even if role_column_value is set; we'll just create a likely name if missing
         if (isset ( $this->definition [ 'relationship_role_column_value' ] ))
         {
-            if (! isset ( $this->definition [ 'relationship_role_column' ] ))
-                $this->definition [ 'relationship_role_column' ] = 'relationship_role_column' ;
+            if (! isset ( $this->definition [ 'relationship_role_column' ] )) {
+                            $this->definition [ 'relationship_role_column' ] = 'relationship_role_column' ;
+            }
             $rel_properties [ 'relationship_role_column' ] = $this->definition [ 'relationship_role_column' ] ;
             $rel_properties [ 'relationship_role_column_value' ] = $this->definition [ 'relationship_role_column_value' ] ;
         }
@@ -575,8 +585,10 @@ 
                 $alternateKeys = array ( $rel_properties [ 'join_key_lhs' ] , $rel_properties [ 'join_key_rhs' ] ) ;
         }
         
-        if (count($alternateKeys)>0)
-            $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_alt' , 'type' => 'alternate_key' , 'fields' => $alternateKeys ) ; // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
+        if (count($alternateKeys)>0) {
+                    $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_alt' , 'type' => 'alternate_key' , 'fields' => $alternateKeys ) ;
+        }
+        // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
         
         return $properties ;
     }
@@ -623,8 +635,9 @@ 
         $canonicalTypes = array ( ) ;
         foreach ( array ( MB_ONETOONE , MB_ONETOMANY , MB_MANYTOMANY , MB_MANYTOONE) as $canonicalType )
         {
-            if ($type == preg_replace ( '/[^\w]+/i', '', strtolower ( $canonicalType ) ))
-                return $canonicalType ;
+            if ($type == preg_replace ( '/[^\w]+/i', '', strtolower ( $canonicalType ) )) {
+                            return $canonicalType ;
+            }
         }
         // ok, we give up...
         return MB_MANYTOMANY ;
@@ -633,16 +646,18 @@ 
     
     function getJoinKeyLHS()
     {
-        if (!isset($this->joinKeyLHS))
-        	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+        if (!isset($this->joinKeyLHS)) {
+                	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+        }
         
         return $this->joinKeyLHS;
     }
     
     function getJoinKeyRHS()
     {
-        if (!isset($this->joinKeyRHS))
-        	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+        if (!isset($this->joinKeyRHS)) {
+                	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+        }
     	
         return $this->joinKeyRHS;
     }
@@ -679,7 +694,7 @@ 
     		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
     			return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
     		}
-    	}else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+    	} else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
     		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
     		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
     			return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
@@ -689,14 +704,14 @@ 
     	if($left){
     		$titleKeyName = $this->getRightModuleSystemLabel();
     		$sourceModule = $this->rhs_module;
-    	}else{
+    	} else{
     		$titleKeyName = $this->getLeftModuleSystemLabel();
     		$sourceModule = $this->lhs_module;
     	}
     	
 		if(!empty($titleKeyName)){
 			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
+		} else{
 			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
 		}