adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.package.php

Braces +7 added lines, -5 removed lines

@@ -73,8 +73,7 @@ 
 			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'],'');
  			$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
 			echo $ajax->getJavascript();
- 		}
- 		else {
+ 		} else {
  			
  			$name = (!empty($_REQUEST['package']))?$_REQUEST['package']:'';
 			$mb->getPackage($name);
@@ -114,11 +113,14 @@ 
 
 	 		$ajax = new AjaxCompose();
 	 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			if(empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
+			if(empty($name)) {
+			    $name = $mod_strings['LBL_NEW_PACKAGE'];
+			}
 	 		$ajax->addCrumb($name,'');
 	 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
-	 		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage')
-	 			$html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+	 		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage') {
+	 			 			$html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+	 		}
 	 		$ajax->addSection('center', translate('LBL_SECTION_PACKAGE', 'ModuleBuilder'), $html);
 			echo $ajax->getJavascript();
  		}

modules/ModuleBuilder/views/view.wizard.php

Braces +9 added lines, -6 removed lines

@@ -54,8 +54,9 @@ 
 
 	function __construct()
 	{
-		if ( isset ( $_REQUEST [ 'view' ] ) )
-			$this->view = $_REQUEST [ 'view' ] ;
+		if ( isset ( $_REQUEST [ 'view' ] ) ) {
+					$this->view = $_REQUEST [ 'view' ] ;
+		}
 
 		$this->editModule = (! empty ( $_REQUEST [ 'view_module' ] ) ) ? $_REQUEST [ 'view_module' ] : null ;
 		$this->buttons = array(); // initialize so that modules without subpanels for example don't result in this being unset and causing problems in the smarty->assign
@@ -114,8 +115,9 @@ 
 			$this->question = translate('LBL_QUESTION_EDIT') ;
 			$this->title = translate( 'LBL_STUDIO' );
 			global $current_user;
-			if (is_admin($current_user))
-				$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
+			if (is_admin($current_user)) {
+							$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
+			}
 
 			$this->help = 'studioHelp' ;
 		} else
@@ -177,10 +179,11 @@ 
 					$this->title = translate( 'LBL_EDIT' ) . " " . $module->name ;
 					$this->help = 'moduleHelp' ;
 					global $current_user;
-					if (is_admin($current_user))
-                        $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" " 
+					if (is_admin($current_user)) {
+					                        $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" " 
                         . "onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=resetmodule&view_module=$this->editModule');\" value=\"" 
                         . translate( 'LBL_RESET_MODULE' ) . '">' ;
+					}
 			}
 		}
 	}

modules/ModuleBuilder/views/view.dropdown.php

Braces +12 added lines, -9 removed lines

@@ -134,27 +134,30 @@
 			
 			// handle the case where we've saved a dropdown in one language, and now attempt to edit it for another language. The $name exists, but $my_list_strings[$name] doesn't
             // for now, we just treat it as if it was new. A better approach might be to use the first language version as a template for future languages
-            if (!isset($my_list_strings[$name]))
-                $my_list_strings[$name] = array () ;
+            if (!isset($my_list_strings[$name])) {
+                            $my_list_strings[$name] = array () ;
+            }
  
 			$selected_dropdown = (!empty($vardef['options']) && !empty($my_list_strings[$vardef['options']])) ? $my_list_strings[$vardef['options']] : $my_list_strings[$name];
 			$smarty->assign('ul_list', 'list = '.$json->encode(array_keys($selected_dropdown)));
 			$smarty->assign('dropdown_name', (!empty($vardef['options']) ? $vardef['options'] : $_REQUEST['dropdown_name']));
 			$smarty->assign('name', $_REQUEST['dropdown_name']);
 			$smarty->assign('options', $selected_dropdown);
-		}else{
+		} else{
 			$smarty->assign('ul_list', 'list = {}');
 			//we should try to find a name for this dropdown based on the field name.
 			$pre_pop_name = '';
-			if(!empty($_REQUEST['field']))
-				$pre_pop_name = $_REQUEST['field'];
+			if(!empty($_REQUEST['field'])) {
+							$pre_pop_name = $_REQUEST['field'];
+			}
 			//ensure this dropdown name does not already exist
 			$use_name = $pre_pop_name.'_list';
 			for($i = 0; $i < 100; $i++){
-				if(empty($my_list_strings[$use_name]))
-					break;
-				else
-					$use_name = $pre_pop_name.'_'.$i;
+				if(empty($my_list_strings[$use_name])) {
+									break;
+				} else {
+									$use_name = $pre_pop_name.'_'.$i;
+				}
 			}
 			$smarty->assign('prepopulated_name', $use_name);
 		}

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'));