adamjakab / SuiteCRM

modules/ModuleBuilder/parsers/relationships/UndeployedRelationships.php

Braces +10 added lines, -9 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.
@@ -270,8 +271,7 @@ 
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
 
-        }
-        else
+        } else
         {
             //Bug42170================================
             $appStrings = $module->getAppListStrings () ;
@@ -333,8 +333,9 @@ 
             $appStrings = $module->getAppListStrings () ;
             foreach(getTypeDisplayList() as $key)
             {
-                if (isset($appStrings[$key][ $module->key_name ]))
-                    unset($appStrings[$key][ $module->key_name ]);
+                if (isset($appStrings[$key][ $module->key_name ])) {
+                                    unset($appStrings[$key][ $module->key_name ]);
+                }
             }
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
@@ -351,8 +352,9 @@ 
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...
-        if ($relationship->getType () == MB_MANYTOMANY)
-            return false ;
+        if ($relationship->getType () == MB_MANYTOMANY) {
+                    return false ;
+        }
         
         $successful = true ;
         $layoutAdditions = $relationship->buildFieldsToLayouts () ;
@@ -371,8 +373,7 @@ 
                     if (($actionAdd) ? $parser->addField ( array ( 'name' => $fieldName ) ) : $parser->removeField ( $fieldName ))
                     {
                         $parser->handleSave ( false ) ;
-                    } 
-                    else
+                    } else
                     {
                         $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": couldn't " . (($actionAdd) ? "add" : "remove") . " $fieldName on $view layout for undeployed module $deployedModuleName" ) ;
                         $successful = false ;

modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php

Braces +11 added lines, -7 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.
@@ -243,8 +244,9 @@ 
         
         foreach ( $module->field_defs as $field )
         {
-            if ($field [ 'type' ] == 'relate' && isset ( $field [ 'module' ] ) && $field [ 'module' ] == $sourceModuleName)
-                return $field [ 'name' ] ;
+            if ($field [ 'type' ] == 'relate' && isset ( $field [ 'module' ] ) && $field [ 'module' ] == $sourceModuleName) {
+                            return $field [ 'name' ] ;
+            }
         }
         return null ;
     }
@@ -389,10 +391,11 @@ 
         
         foreach ( $layoutAdditions as $deployedModuleName => $fieldName )
         {
-            if (! in_array ( strtolower ( $deployedModuleName ), $invalidModules ))
-                foreach ( array ( MB_EDITVIEW , MB_DETAILVIEW ) as $view )
+            if (! in_array ( strtolower ( $deployedModuleName ), $invalidModules )) {
+                            foreach ( array ( MB_EDITVIEW , MB_DETAILVIEW ) as $view )
                 {
                     $GLOBALS [ 'log' ]->info ( get_class ( $this ) . ": adding $fieldName to $view layout for module $deployedModuleName" ) ;
+            }
                     $parser = new GridLayoutMetaDataParser ( $view, $deployedModuleName ) ;
                     $parser->addField ( array ( 'name' => $fieldName ) ) ;
                     $parser->handleSave ( false ) ;
@@ -411,8 +414,9 @@ 
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...
-        if ($relationship->getType () == MB_MANYTOMANY)
-            return false ;
+        if ($relationship->getType () == MB_MANYTOMANY) {
+                    return false ;
+        }
         
         $successful = true ;
         $layoutAdditions = $relationship->buildFieldsToLayouts () ;

modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php

Braces +6 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -51,8 +53,9 @@ 
     static function newRelationship ($definition = array())
     {
         // handle the case where a relationship_type is not provided - set it to Many-To-Many as this was the usual type in ModuleBuilder
-        if (! isset ( $definition [ 'relationship_type' ] ))
-            $definition [ 'relationship_type' ] = MB_MANYTOMANY ;
+        if (! isset ( $definition [ 'relationship_type' ] )) {
+                    $definition [ 'relationship_type' ] = MB_MANYTOMANY ;
+        }
             
     	if (!empty ($definition['for_activities']) && $definition['for_activities'] == true) {
         	require_once 'modules/ModuleBuilder/parsers/relationships/ActivitiesRelationship.php';

modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php

Braces +9 added lines, -5 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.
@@ -93,8 +95,9 @@ 
      */
     function buildSubpanelDefinitions ()
     {        
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
         
         $source = "";
         if ($this->rhs_module == $this->lhs_module)
@@ -142,8 +145,9 @@ 
      */
     function buildFieldsToLayouts ()
     {
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
  
         return array( $this->rhs_module =>$this->getValidDBName($this->relationship_name . "_name")); // this must match the name of the relate field from buildVardefs
     }

modules/ModuleBuilder/parsers/relationships/ManyToOneRelationship.php

Braces +6 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -113,8 +115,9 @@ 
      */
     function buildFieldsToLayouts ()
     {
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
  
         return array( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ) ; // this must match the name of the relate field from buildVardefs
     }

modules/ModuleBuilder/parsers/relationships/ActivitiesRelationship.php

Braces +9 added lines, -5 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.
@@ -173,16 +175,18 @@ 
      */
     function buildFieldsToLayouts ()
     {
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
 
         return array( $this->rhs_module => $this->relationship_name . "_name" ) ; // this must match the name of the relate field from buildVardefs
     }
 
  	function buildSubpanelDefinitions ()
     {
-        if ($this->relationship_only || isset(ActivitiesRelationship::$subpanelsAdded[$this->lhs_module]))
-            return array () ;
+        if ($this->relationship_only || isset(ActivitiesRelationship::$subpanelsAdded[$this->lhs_module])) {
+                    return array () ;
+        }
 
         ActivitiesRelationship::$subpanelsAdded[$this->lhs_module] = true;
         $relationshipName = substr($this->relationship_name, 0, strrpos($this->relationship_name, '_'));

modules/ModuleBuilder/parsers/parser.dropdown.php

Braces +16 added lines, -9 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.
@@ -74,10 +76,11 @@ 
 		if(array_key_exists($emptyMarker, $dropdown)){
             $output=array();
             foreach($dropdown as $key => $value){
-                if($emptyMarker===$key)
-                    $output['']='';
-                else
-                    $output[$key]=$value;
+                if($emptyMarker===$key) {
+                                    $output['']='';
+                } else {
+                                    $output[$key]=$value;
+                }
 		}
             $dropdown=$output;
 		}
@@ -89,7 +92,7 @@ 
 			//Can't use synch on selected lang as we want to overwrite values, not just keys
 			$module->mblanguage->appListStrings[$selected_lang.'.lang.php'][$dropdown_name] = $dropdown;
 			$module->mblanguage->save($module->key_name); // tyoung - key is required parameter as of
-		}else{
+		} else{
 			$contents = return_custom_app_list_strings_file_contents($selected_lang);
 			$my_list_strings = return_app_list_strings_language($selected_lang);
 			if($selected_lang == $GLOBALS['current_language']){
@@ -97,7 +100,9 @@ 
 	        }
 			//write to contents
 			$contents = str_replace("?>", '', $contents);
-			if(empty($contents))$contents = "<?php";
+			if(empty($contents)) {
+			    $contents = "<?php";
+			}
 	        //add new drop down to the bottom
 	        if(!empty($params['use_push'])){
 	        	//this is for handling moduleList and such where nothing should be deleted or anything but they can be renamed
@@ -111,7 +116,7 @@ 
 		        		$contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']['$key']=" . var_export_helper($value) . ";";
 	        		}
 	        	}
-	        }else{
+	        } else{
 	        	//Now synch up the keys in other langauges to ensure that removed/added Drop down values work properly under all langs.
 	        	$this->synchDropDown($dropdown_name, $dropdown, $selected_lang, $dir);
 	        	$contents = $this->getNewCustomContents($dropdown_name, $dropdown, $selected_lang);
@@ -207,7 +212,9 @@ 
     function getNewCustomContents($dropdown_name, $dropdown, $lang) {
     	$contents = return_custom_app_list_strings_file_contents($lang);
         $contents = str_replace("?>", '', $contents);
-		if(empty($contents))$contents = "<?php";
+		if(empty($contents)) {
+		    $contents = "<?php";
+		}
     	$contents = preg_replace($this->getPatternMatch($dropdown_name), "\n", $contents);
 	    $contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']=" . var_export_helper($dropdown) . ";";
 	    return $contents;

modules/ModuleBuilder/parsers/parser.modifysubpanel.php

Braces +11 added lines, -6 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.
@@ -114,10 +115,12 @@ 
         $this->defaults = array ( ) ;
         foreach ( $this->listViewDefs as $key => $def )
         {
-            if (! empty ( $def [ 'usage' ] ) && strcmp ( $def [ 'usage' ], 'query_only' ) == 0)
-                continue ;
-            if (! empty ( $def [ 'vname' ] ))
-                $def [ 'label' ] = $def [ 'vname' ] ;
+            if (! empty ( $def [ 'usage' ] ) && strcmp ( $def [ 'usage' ], 'query_only' ) == 0) {
+                            continue ;
+            }
+            if (! empty ( $def [ 'vname' ] )) {
+                            $def [ 'label' ] = $def [ 'vname' ] ;
+            }
             $this->defaults [ $key ] = $def ;
         }
         return $this->defaults ;
@@ -144,11 +147,13 @@ 
             foreach ( $this->subPanelParentModule->field_defs as $key => $fieldDefinition )
             {
                 $fieldName = strtolower ( $key ) ;
-                if (! isset ( $lowerFieldList [ $fieldName ] )) // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
+                if (! isset ( $lowerFieldList [ $fieldName ] )) {
+                    // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
                 {
                     if ((empty ( $fieldDefinition [ 'source' ] ) || $fieldDefinition [ 'source' ] == 'db' || $fieldDefinition [ 'source' ] == 'custom_fields') && $fieldDefinition [ 'type' ] != 'id' && strcmp ( $fieldName, 'deleted' ) != 0 || (isset ( $def [ 'name' ] ) && strpos ( $def [ 'name' ], "_name" ) != false) || ! empty ( $def [ 'custom_type' ] ) && (empty ( $fieldDefinition [ 'dbType' ] ) || $fieldDefinition [ 'dbType' ] != 'id') && (empty ( $fieldDefinition [ 'dbtype' ] ) || $fieldDefinition [ 'dbtype' ] != 'id') || (! empty ( $fieldDefinition [ 'studio' ] ) && $fieldDefinition [ 'studio' ] == 'visible'))
                     {
                         $label = (isset ( $fieldDefinition [ 'vname' ] )) ? $fieldDefinition [ 'vname' ] : (isset ( $fieldDefinition [ 'label' ] ) ? $fieldDefinition [ 'label' ] : $fieldDefinition [ 'name' ]) ;
+                }
                         $this->availableFields [ $fieldName ] = array ( 'width' => '10' , 'label' => $label ) ;
                     }
                 }

modules/ModuleBuilder/parsers/parser.modifylayoutview.php

Braces +14 added lines, -20 removed lines

@@ -1,6 +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.
@@ -80,12 +81,10 @@ 
         {
             $this->_sourceFile = $this->_workingFile;
             $this->usingWorkingFile = true;
-        }
-        else if (is_file($this->_customFile))
+        } else if (is_file($this->_customFile))
         {
             $this->_sourceFile = $this->_customFile;
-        }
-        else if (! is_file($this->_sourceFile))
+        } else if (! is_file($this->_sourceFile))
         {
             // if we don't have ANY defined metadata then improvise as best we can
             if (strtolower($this->_view) == 'quickcreate')
@@ -97,8 +96,7 @@ 
                     $this->_sourceFile = "custom/" . $this->_sourceFile;
                 }
                 $this->_sourceView = 'EditView';
-            }
-            else
+            } else
             {
                 $this->_fatalError('parser.modifylayout.php->init(): no metadata for '.$this->_module.' '.$this->_view);
             }
@@ -171,8 +169,7 @@ 
         {
         	TemplateHandler::clearCache($this->_module,"form_SubPanelQuickCreate_{$this->_module}.tpl");
         	TemplateHandler::clearCache($this->_module,"form_DCQuickCreate_{$this->_module}.tpl");
-        } 
-        else 
+        } else 
         {
         	TemplateHandler::clearCache($this->_module,"{$this->_view}.tpl");
         }
@@ -236,8 +233,7 @@ 
                 if ($slotComponents ['3'] == 'name' && isset($origFieldDefs [$value]) && is_array($origFieldDefs [$value]))
                 {
                     $this->_viewdefs ['panels'] [$panelID] [$rowID] [$colID] = $origFieldDefs [$value];
-                }
-                else
+                } else
                 {
                     $property = $slotComponents ['3'];
                     if ($value == '(filler)')
@@ -341,8 +337,7 @@ 
                     foreach ($row as $col_id => $col) {
                         if ($col['name'] == '(filler)') {
                             $this->_viewdefs['panels'][$loop_panelID][$row_id][$col_id] = NULL;
-                        }
-                        elseif ($col['name'] == '(empty)') {
+                        } elseif ($col['name'] == '(empty)') {
                             unset($this->_viewdefs['panels'][$loop_panelID][$row_id][$col_id]);
                         }
                     }
@@ -401,8 +396,7 @@ 
             {
                 $label = isset($def['vname']) ? $def['vname'] : $def['name'];
                 $modelFields [$field] = array('name' => $field, 'label' => $label);
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->debug( get_class($this)."->_getModelFields(): skipping $field from modelFields as it fails the test for inclusion");
             }
@@ -414,8 +408,9 @@ 
     function _parseData ($panels)
     {
         $fields = array();
-        if (empty($panels))
-        return;
+        if (empty($panels)) {
+                return;
+        }
 
         // Fix for a flexibility in the format of the panel sections - if only one panel, then we don't have a panel level defined, it goes straight into rows
         // See EditView2 for similar treatment
@@ -506,8 +501,7 @@ 
                         if (is_array($fieldDef))
                         {
                             $fieldName = $fieldDef ['name'];
-                        }
-                        else
+                        } else
                         {
                             $fieldName = $fieldDef;
                         }