adamjakab / SuiteCRM

modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php

Indentation +13 added lines, -13 removed lines

@@ -104,13 +104,13 @@ 
                         
 
                         if (! empty ( $dictionary ) && ! empty ( $dictionary [ $name ] ) ) {
-                        	if (! empty ( $dictionary [ $name ] [ 'true_relationship_type' ] )) {
-                        		$definition [ 'relationship_type' ] = $dictionary [ $name ] [ 'true_relationship_type' ] ;
-                        	}
+                            if (! empty ( $dictionary [ $name ] [ 'true_relationship_type' ] )) {
+                                $definition [ 'relationship_type' ] = $dictionary [ $name ] [ 'true_relationship_type' ] ;
+                            }
                             if (! empty ( $dictionary [ $name ] [ 'from_studio' ] )) {
                                 $definition [ 'from_studio' ] = $dictionary [ $name ] [ 'from_studio' ] ;
                             }
-                        	$definition [ 'is_custom' ] = true;
+                            $definition [ 'is_custom' ] = true;
                         }
                             
                         
@@ -155,23 +155,23 @@ 
      */
     function delete ($rel_name)
     {
-    	//Remove any fields from layouts
+        //Remove any fields from layouts
         $rel = $this->get($rel_name);
         if (!empty($rel))
         {
             $this->removeFieldsFromDeployedLayout($rel);
         }
         require_once("ModuleInstall/ModuleInstaller.php");
-    	require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
-    	$mi = new ModuleInstaller();
-    	$mi->silent = true;
+        require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
+        $mi = new ModuleInstaller();
+        $mi->silent = true;
         $mi->id_name = 'custom' . $rel_name; // provide the moduleinstaller with a unique name for this relationship - normally this value is set to the package key...
-    	$mi->uninstall_relationship("custom/metadata/{$rel_name}MetaData.php");
+        $mi->uninstall_relationship("custom/metadata/{$rel_name}MetaData.php");
         $mi->uninstallLabels('custom/Extension/modules/relationships/language/',$rel->buildLabels());
         $mi->uninstallExtLabels($rel->buildLabels());
     	
-    	// now clear all caches so that our changes are visible
-    	Relationship::delete_cache();
+        // now clear all caches so that our changes are visible
+        Relationship::delete_cache();
         $mi->rebuild_tabledictionary();
         
         $MBmodStrings = $GLOBALS [ 'mod_strings' ];
@@ -313,7 +313,7 @@ 
         foreach ( $this->relationships as $name => $relationship )
         {
             $relationship->setFromStudio();
-        	$GLOBALS [ 'mod_strings' ] = $MBModStrings ;
+            $GLOBALS [ 'mod_strings' ] = $MBModStrings ;
             $installDefs = parent::build ( $basepath, "<basepath>",  array ($name => $relationship ) ) ;
 
             // and mark as built so that the next time we come through we'll know and won't build again
@@ -407,7 +407,7 @@ 
      * @param $relationship    The relationship that is getting deleted
      * return null
      */
-	private function removeFieldsFromDeployedLayout ($relationship)
+    private function removeFieldsFromDeployedLayout ($relationship)
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...

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

Spacing +130 added lines, -130 removed lines

@@ -1,6 +1,6 @@ 
 <?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.
@@ -40,23 +40,23 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php' ;
-require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipsInterface.php' ;
-require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php';
+require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipsInterface.php';
+require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php';
 
 
 class DeployedRelationships extends AbstractRelationships implements RelationshipsInterface
 {
 
-    function __construct ($moduleName)
+    function __construct($moduleName)
     {
-        $this->moduleName = $moduleName ;
-        $this->load () ;
+        $this->moduleName = $moduleName;
+        $this->load();
     }
 
-    static function findRelatableModules ($includeActivitiesSubmodules = true)
+    static function findRelatableModules($includeActivitiesSubmodules = true)
     {
-        return parent::findRelatableModules ( true ) ;
+        return parent::findRelatableModules(true);
     }
 
     /*
@@ -71,50 +71,50 @@ 
      * Instead we must obtain the true cardinality from a property we added to the relationship metadata when we created the relationship
      * This relationship metadata is accessed through the Table Dictionary
      */ 
-    function load ()
+    function load()
     {
         
-        $relationships = $this->getDeployedRelationships () ;
+        $relationships = $this->getDeployedRelationships();
         
-        if (! empty ( $relationships ))
+        if (!empty ($relationships))
         {
             // load the relationship definitions for all installed custom relationships into $dictionary
-            $dictionary = array ( ) ;
-            if (file_exists ( 'custom/application/Ext/TableDictionary/tabledictionary.ext.php' ))
+            $dictionary = array( );
+            if (file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php'))
             {
-                include ('custom/application/Ext/TableDictionary/tabledictionary.ext.php') ;
+                include ('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
             }
             
             $invalidModules = array();
-            $validModules = array_keys ( self::findRelatableModules () ) ;
+            $validModules = array_keys(self::findRelatableModules());
             
             // now convert the relationships array into an array of AbstractRelationship objects
-            foreach ( $relationships as $name => $definition )
+            foreach ($relationships as $name => $definition)
             {
-                if (($definition [ 'lhs_module' ] == $this->moduleName) || ($definition [ 'rhs_module' ] == $this->moduleName))
+                if (($definition ['lhs_module'] == $this->moduleName) || ($definition ['rhs_module'] == $this->moduleName))
                 {
-                    if (in_array ( $definition [ 'lhs_module' ], $validModules ) && in_array ( $definition [ 'rhs_module' ], $validModules )
-                        && ! in_array ( $definition [ 'lhs_module' ], $invalidModules ) && ! in_array ( $definition [ 'rhs_module' ], $invalidModules ))
+                    if (in_array($definition ['lhs_module'], $validModules) && in_array($definition ['rhs_module'], $validModules)
+                        && !in_array($definition ['lhs_module'], $invalidModules) && !in_array($definition ['rhs_module'], $invalidModules))
                     {
                         // identify the subpanels for this relationship - TODO: optimize this - currently does m x n scans through the subpanel list...
-                        $definition [ 'rhs_subpanel' ] = self::identifySubpanel ( $definition [ 'lhs_module' ], $definition [ 'rhs_module' ] ) ;
-                        $definition [ 'lhs_subpanel' ] = self::identifySubpanel ( $definition [ 'rhs_module' ], $definition [ 'lhs_module' ] ) ;
+                        $definition ['rhs_subpanel'] = self::identifySubpanel($definition ['lhs_module'], $definition ['rhs_module']);
+                        $definition ['lhs_subpanel'] = self::identifySubpanel($definition ['rhs_module'], $definition ['lhs_module']);
                         
                         // now adjust the cardinality with the true cardinality found in the relationships metadata (see method comment above)
                         
 
-                        if (! empty ( $dictionary ) && ! empty ( $dictionary [ $name ] ) ) {
-                        	if (! empty ( $dictionary [ $name ] [ 'true_relationship_type' ] )) {
-                        		$definition [ 'relationship_type' ] = $dictionary [ $name ] [ 'true_relationship_type' ] ;
+                        if (!empty ($dictionary) && !empty ($dictionary [$name])) {
+                        	if (!empty ($dictionary [$name] ['true_relationship_type'])) {
+                        		$definition ['relationship_type'] = $dictionary [$name] ['true_relationship_type'];
                         	}
-                            if (! empty ( $dictionary [ $name ] [ 'from_studio' ] )) {
-                                $definition [ 'from_studio' ] = $dictionary [ $name ] [ 'from_studio' ] ;
+                            if (!empty ($dictionary [$name] ['from_studio'])) {
+                                $definition ['from_studio'] = $dictionary [$name] ['from_studio'];
                             }
-                        	$definition [ 'is_custom' ] = true;
+                        	$definition ['is_custom'] = true;
                         }
                             
                         
-                        $this->relationships [ $name ] = RelationshipFactory::newRelationship ( $definition ) ;
+                        $this->relationships [$name] = RelationshipFactory::newRelationship($definition);
                     }
                 }
             }
@@ -134,9 +134,9 @@ 
     /*
      * Save this modules relationship definitions out to a working file
      */
-    function save ()
+    function save()
     {
-        parent::_save ( $this->relationships, "custom/working/modules/{$this->moduleName}" ) ;
+        parent::_save($this->relationships, "custom/working/modules/{$this->moduleName}");
     }
 
     /*
@@ -145,15 +145,15 @@ 
      * @param array definition  The 5.0 relationship definition
      * @return array            The definition updated to 5.1 format
      */
-    protected function _updateRelationshipDefinition ($definition)
+    protected function _updateRelationshipDefinition($definition)
     {
-        return $definition ;
+        return $definition;
     }
 
     /*
      * Use the module Loader to delete the relationship from the instance.
      */
-    function delete ($rel_name)
+    function delete($rel_name)
     {
     	//Remove any fields from layouts
         $rel = $this->get($rel_name);
@@ -162,23 +162,23 @@ 
             $this->removeFieldsFromDeployedLayout($rel);
         }
         require_once("ModuleInstall/ModuleInstaller.php");
-    	require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
+    	require_once ('modules/Administration/QuickRepairAndRebuild.php');
     	$mi = new ModuleInstaller();
     	$mi->silent = true;
-        $mi->id_name = 'custom' . $rel_name; // provide the moduleinstaller with a unique name for this relationship - normally this value is set to the package key...
+        $mi->id_name = 'custom'.$rel_name; // provide the moduleinstaller with a unique name for this relationship - normally this value is set to the package key...
     	$mi->uninstall_relationship("custom/metadata/{$rel_name}MetaData.php");
-        $mi->uninstallLabels('custom/Extension/modules/relationships/language/',$rel->buildLabels());
+        $mi->uninstallLabels('custom/Extension/modules/relationships/language/', $rel->buildLabels());
         $mi->uninstallExtLabels($rel->buildLabels());
     	
     	// now clear all caches so that our changes are visible
     	Relationship::delete_cache();
         $mi->rebuild_tabledictionary();
         
-        $MBmodStrings = $GLOBALS [ 'mod_strings' ];
-        $GLOBALS [ 'mod_strings' ] = return_module_language ( '', 'Administration' ) ;
-        $rac = new RepairAndClear ( ) ;
-        $rac->repairAndClearAll ( array ( 'clearAll', 'rebuildExtensions',  ), array ( $GLOBALS [ 'mod_strings' ] [ 'LBL_ALL_MODULES' ] ), true, false ) ;
-        $GLOBALS [ 'mod_strings' ] = $MBmodStrings;
+        $MBmodStrings = $GLOBALS ['mod_strings'];
+        $GLOBALS ['mod_strings'] = return_module_language('', 'Administration');
+        $rac = new RepairAndClear( );
+        $rac->repairAndClearAll(array('clearAll', 'rebuildExtensions',), array($GLOBALS ['mod_strings'] ['LBL_ALL_MODULES']), true, false);
+        $GLOBALS ['mod_strings'] = $MBmodStrings;
 
         //Bug 41070, supercedes the previous 40941 fix in this section
         if (isset($this->relationships[$rel_name]))
@@ -192,9 +192,9 @@ 
      * The set is made up of the relationships held in this class, plus all those already deployed in the application
      * @return array Set of all relevant relationships
      */
-    protected function getAllRelationships ()
+    protected function getAllRelationships()
     {
-        return array_merge ( $this->relationships, parent::getDeployedRelationships () ) ;
+        return array_merge($this->relationships, parent::getDeployedRelationships());
     }
 
     /*
@@ -204,28 +204,28 @@ 
      * @param string $sourceModuleName  Name of the primary module
      * @return string Name of the subpanel if found; null otherwise
      */
-    static private function identifySubpanel ($thisModuleName , $sourceModuleName)
+    static private function identifySubpanel($thisModuleName, $sourceModuleName)
     {
-        $module = get_module_info ( $thisModuleName ) ;
-        require_once ('include/SubPanel/SubPanelDefinitions.php') ;
-        $spd = new SubPanelDefinitions ( $module ) ;
-        $subpanelNames = $spd->get_available_tabs () ; // actually these are the displayed subpanels
+        $module = get_module_info($thisModuleName);
+        require_once ('include/SubPanel/SubPanelDefinitions.php');
+        $spd = new SubPanelDefinitions($module);
+        $subpanelNames = $spd->get_available_tabs(); // actually these are the displayed subpanels
         
-        foreach ( $subpanelNames as $key => $name )
+        foreach ($subpanelNames as $key => $name)
         {
-            $GLOBALS [ 'log' ]->debug ( $thisModuleName . " " . $name ) ;
+            $GLOBALS ['log']->debug($thisModuleName." ".$name);
             
-            $subPanel = $spd->load_subpanel ( $name ) ;
-            if ($subPanel && ! isset ( $subPanel->_instance_properties [ 'collection_list' ] ))
+            $subPanel = $spd->load_subpanel($name);
+            if ($subPanel && !isset ($subPanel->_instance_properties ['collection_list']))
             {
-                if ($sourceModuleName == $subPanel->_instance_properties [ 'module' ])
+                if ($sourceModuleName == $subPanel->_instance_properties ['module'])
                 {
-                    return $subPanel->_instance_properties [ 'subpanel_name' ] ;
+                    return $subPanel->_instance_properties ['subpanel_name'];
                 }
             }
         }
         
-        return null ;
+        return null;
     
     }
 
@@ -237,16 +237,16 @@ 
      * @return string Name of the relate field, if found; null otherwise    
      */
     
-    static private function identifyRelateField ($thisModuleName , $sourceModuleName)
+    static private function identifyRelateField($thisModuleName, $sourceModuleName)
     {
-        $module = get_module_info ( $thisModuleName ) ;
+        $module = get_module_info($thisModuleName);
         
-        foreach ( $module->field_defs as $field )
+        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 ;
+        return null;
     }
 
     /*
@@ -256,10 +256,10 @@ 
      * We can assume that both sides of the relationship are deployed modules as this is only called within the context of DeployedRelationships
      * @param AbstractRelationship $relationship The relationship to be enforced
      */
-    public function enforceRelationshipOnly ($relationship)
+    public function enforceRelationshipOnly($relationship)
     {
-        $lhs = $relationship->lhs_module ;
-        $rhs = $relationship->rhs_module ;
+        $lhs = $relationship->lhs_module;
+        $rhs = $relationship->rhs_module;
         // if the lhs_module already has a subpanel or relate field sourced from the rhs_module, 
     // or the rhs_module already has a subpanel or relate field sourced from the lhs_module,
     // then set "relationship_only" in the relationship
@@ -279,46 +279,46 @@ 
      * We use the Extension mechanism to do this for DeployedRelationships
      * All metadata is placed in the modules Ext directory, and then Rebuild is called to activate them
      */
-    function build ($basepath = null, $installDefPrefix = null, $relationships = null)
+    function build($basepath = null, $installDefPrefix = null, $relationships = null)
     {
-        $basepath = "custom/Extension/modules" ;
+        $basepath = "custom/Extension/modules";
         
-        $this->activitiesToAdd = false ;
+        $this->activitiesToAdd = false;
         
         // and mark all as built so that the next time we come through we'll know and won't build again
-        foreach ( $this->relationships as $name => $relationship )
+        foreach ($this->relationships as $name => $relationship)
         {
-            $definition = $relationship->getDefinition () ;
+            $definition = $relationship->getDefinition();
             // activities will always appear on the rhs only - lhs will be always be this module in MB
-            if (strtolower ( $definition [ 'rhs_module' ] ) == 'activities')
+            if (strtolower($definition ['rhs_module']) == 'activities')
             {
-                $this->activitiesToAdd = true ;
-                $relationshipName = $definition [ 'relationship_name' ] ;
-                foreach ( self::$activities as $activitiesSubModuleLower => $activitiesSubModuleName )
+                $this->activitiesToAdd = true;
+                $relationshipName = $definition ['relationship_name'];
+                foreach (self::$activities as $activitiesSubModuleLower => $activitiesSubModuleName)
                 {
-                    $definition [ 'rhs_module' ] = $activitiesSubModuleName ;
-                    $definition [ 'for_activities' ] = true ;
-                    $definition [ 'relationship_name' ] = $relationshipName . '_' . $activitiesSubModuleLower ;
-                    $this->relationships [ $definition [ 'relationship_name' ] ] = RelationshipFactory::newRelationship ( $definition ) ;
+                    $definition ['rhs_module'] = $activitiesSubModuleName;
+                    $definition ['for_activities'] = true;
+                    $definition ['relationship_name'] = $relationshipName.'_'.$activitiesSubModuleLower;
+                    $this->relationships [$definition ['relationship_name']] = RelationshipFactory::newRelationship($definition);
                 }
-                unset ( $this->relationships [ $name ] ) ;
+                unset ($this->relationships [$name]);
             }
         }
         
-        $GLOBALS [ 'log' ]->info ( get_class ( $this ) . "->build(): installing relationships" ) ;
+        $GLOBALS ['log']->info(get_class($this)."->build(): installing relationships");
 
-        $MBModStrings = $GLOBALS [ 'mod_strings' ] ;
-        $adminModStrings = return_module_language ( '', 'Administration' ) ; // required by ModuleInstaller
+        $MBModStrings = $GLOBALS ['mod_strings'];
+        $adminModStrings = return_module_language('', 'Administration'); // required by ModuleInstaller
             
-        foreach ( $this->relationships as $name => $relationship )
+        foreach ($this->relationships as $name => $relationship)
         {
             $relationship->setFromStudio();
-        	$GLOBALS [ 'mod_strings' ] = $MBModStrings ;
-            $installDefs = parent::build ( $basepath, "<basepath>",  array ($name => $relationship ) ) ;
+        	$GLOBALS ['mod_strings'] = $MBModStrings;
+            $installDefs = parent::build($basepath, "<basepath>", array($name => $relationship));
 
             // and mark as built so that the next time we come through we'll know and won't build again
-            $relationship->setReadonly () ;
-            $this->relationships [ $name ] = $relationship ;
+            $relationship->setReadonly();
+            $this->relationships [$name] = $relationship;
 
             // now install the relationship - ModuleInstaller normally only does this as part of a package load where it installs the relationships defined in the manifest. However, we don't have a manifest or a package, so...
             
@@ -332,43 +332,43 @@ 
             // and rather than building a full manifest file to carry them, we manually add these installDefs to the ModuleInstaller, and then
             // individually call the appropriate ModuleInstaller->install_...() methods to take our relationship out of our staging area and expand it out to the individual module Ext areas       
 
-            $GLOBALS [ 'mod_strings' ] = $adminModStrings ;
-            require_once 'ModuleInstall/ModuleInstaller.php' ;
-            $mi = new ModuleInstaller ( ) ;
+            $GLOBALS ['mod_strings'] = $adminModStrings;
+            require_once 'ModuleInstall/ModuleInstaller.php';
+            $mi = new ModuleInstaller( );
 
-            $mi->id_name = 'custom' . $name ; // provide the moduleinstaller with a unique name for this relationship - normally this value is set to the package key...
-            $mi->installdefs = $installDefs ;
-            $mi->base_dir = $basepath ;
-            $mi->silent = true ;
+            $mi->id_name = 'custom'.$name; // provide the moduleinstaller with a unique name for this relationship - normally this value is set to the package key...
+            $mi->installdefs = $installDefs;
+            $mi->base_dir = $basepath;
+            $mi->silent = true;
 
             
-            VardefManager::clearVardef () ;
+            VardefManager::clearVardef();
 
-            $mi->install_relationships () ;
-            $mi->install_languages () ;
-            $mi->install_vardefs () ;
-            $mi->install_layoutdefs () ;
+            $mi->install_relationships();
+            $mi->install_languages();
+            $mi->install_vardefs();
+            $mi->install_layoutdefs();
             $mi->install_extensions();
 
         }
         
         // Run through the module installer to rebuild the relationships once after everything is done.
-        require_once 'ModuleInstall/ModuleInstaller.php' ;
-        $mi = new ModuleInstaller ( ) ;
+        require_once 'ModuleInstall/ModuleInstaller.php';
+        $mi = new ModuleInstaller( );
         $mi->silent = true;
         $mi->rebuild_relationships();
 
         // now clear all caches so that our changes are visible
-        require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
-        $rac = new RepairAndClear ( ) ;
-        $rac->repairAndClearAll ( array ( 'clearAll' ), array ( $GLOBALS [ 'mod_strings' ] [ 'LBL_ALL_MODULES' ] ), true, false ) ;
+        require_once ('modules/Administration/QuickRepairAndRebuild.php');
+        $rac = new RepairAndClear( );
+        $rac->repairAndClearAll(array('clearAll'), array($GLOBALS ['mod_strings'] ['LBL_ALL_MODULES']), true, false);
 
-        $GLOBALS [ 'mod_strings' ] = $MBModStrings ; // finally, restore the ModuleBuilder mod_strings
+        $GLOBALS ['mod_strings'] = $MBModStrings; // finally, restore the ModuleBuilder mod_strings
 
         // save out the updated definitions so that we keep track of the change in built status
-        $this->save () ;
+        $this->save();
         
-        $GLOBALS [ 'log' ]->info ( get_class ( $this ) . "->build(): finished relationship installation" ) ;
+        $GLOBALS ['log']->info(get_class($this)."->build(): finished relationship installation");
 
     }
 
@@ -379,23 +379,23 @@ 
      * @param array $layoutAdditions  An array of module => fieldname
      * return null
      */
-    protected function saveFieldsToLayouts ($basepath , $dummy , $relationshipName , $layoutAdditions)
+    protected function saveFieldsToLayouts($basepath, $dummy, $relationshipName, $layoutAdditions)
     {
-        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
+        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php';
         
         // these modules either lack editviews/detailviews or use custom mechanisms for the editview/detailview. In either case, we don't want to attempt to add a relate field to them
         // would be better if GridLayoutMetaDataParser could handle this gracefully, so we don't have to maintain this list here
-        $invalidModules = array ( 'emails' , 'kbdocuments' ) ;
+        $invalidModules = array('emails', 'kbdocuments');
         
-        foreach ( $layoutAdditions as $deployedModuleName => $fieldName )
+        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 ) ;
+                    $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);
                 }
         }
     }
@@ -407,29 +407,29 @@ 
      * @param $relationship    The relationship that is getting deleted
      * return null
      */
-	private function removeFieldsFromDeployedLayout ($relationship)
+	private function removeFieldsFromDeployedLayout($relationship)
     {
         
         // 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 () ;
+        $successful = true;
+        $layoutAdditions = $relationship->buildFieldsToLayouts();
         
-        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
-        foreach ( $layoutAdditions as $deployedModuleName => $fieldName )
+        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php';
+        foreach ($layoutAdditions as $deployedModuleName => $fieldName)
         {
-            foreach ( array ( MB_EDITVIEW , MB_DETAILVIEW ) as $view )
+            foreach (array(MB_EDITVIEW, MB_DETAILVIEW) as $view)
             {
-                $parser = new GridLayoutMetaDataParser ( $view, $deployedModuleName ) ;
-                $parser->removeField ( $fieldName );
-                $parser->handleSave ( false ) ;
+                $parser = new GridLayoutMetaDataParser($view, $deployedModuleName);
+                $parser->removeField($fieldName);
+                $parser->handleSave(false);
              
             }
         }
         
-        return $successful ;
+        return $successful;
     }
 
 }

modules/ModuleBuilder/parsers/relationships/RelationshipsInterface.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -42,17 +42,17 @@ 
 interface RelationshipsInterface
 {
 
-    static public function findRelatableModules () ;
+    static public function findRelatableModules();
     
-    public function load () ;
+    public function load();
 
 //  public function build () ;
     
-    public function getRelationshipList ();
+    public function getRelationshipList();
     
-    public function get ($relationshipName) ;
+    public function get($relationshipName);
 
-    public function add ($relationship) ;
+    public function add($relationship);
 
 //    public function delete ($relationshipName) ;
     

Braces +3 added lines, -1 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.

modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php

Indentation +3 added lines, -3 removed lines

@@ -54,9 +54,9 @@
         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';
-        	return new ActivitiesRelationship ($definition);
+        if (!empty ($definition['for_activities']) && $definition['for_activities'] == true) {
+            require_once 'modules/ModuleBuilder/parsers/relationships/ActivitiesRelationship.php';
+            return new ActivitiesRelationship ($definition);
         }
         
         switch ( strtolower ( $definition [ 'relationship_type' ] ))

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 class RelationshipFactory
 {
@@ -48,36 +48,36 @@ 
      * Construct a new relationship of type as provided by the $definition
      * @param array $definition Complete definition of the relationship, as specified by AbstractRelationship::keys
      */
-    static function newRelationship ($definition = array())
+    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';
-        	return new ActivitiesRelationship ($definition);
+        	return new ActivitiesRelationship($definition);
         }
         
-        switch ( strtolower ( $definition [ 'relationship_type' ] ))
+        switch (strtolower($definition ['relationship_type']))
         {
-            case strtolower ( MB_ONETOONE ) :
-                require_once 'modules/ModuleBuilder/parsers/relationships/OneToOneRelationship.php' ;
-                return new OneToOneRelationship ( $definition ) ;
+            case strtolower(MB_ONETOONE) :
+                require_once 'modules/ModuleBuilder/parsers/relationships/OneToOneRelationship.php';
+                return new OneToOneRelationship($definition);
             
-            case strtolower ( MB_ONETOMANY ) :
-                require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php' ;
-                return new OneToManyRelationship ( $definition ) ;
+            case strtolower(MB_ONETOMANY) :
+                require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php';
+                return new OneToManyRelationship($definition);
                 
-            case strtolower ( MB_MANYTOONE ) :
-                require_once 'modules/ModuleBuilder/parsers/relationships/ManyToOneRelationship.php' ;
-                return new ManyToOneRelationship ( $definition ) ;
+            case strtolower(MB_MANYTOONE) :
+                require_once 'modules/ModuleBuilder/parsers/relationships/ManyToOneRelationship.php';
+                return new ManyToOneRelationship($definition);
             
             // default case is Many-To-Many as this was the only type ModuleBuilder could create and so much of the MB code assumes Many-To-Many
             default :
-                $definition [ 'relationship_type' ] = MB_MANYTOMANY ;
-                require_once 'modules/ModuleBuilder/parsers/relationships/ManyToManyRelationship.php' ;
-                return new ManyToManyRelationship ( $definition ) ;
+                $definition ['relationship_type'] = MB_MANYTOMANY;
+                require_once 'modules/ModuleBuilder/parsers/relationships/ManyToManyRelationship.php';
+                return new ManyToManyRelationship($definition);
         }
     
     }

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

Indentation +6 added lines, -6 removed lines

@@ -99,13 +99,13 @@ 
         $source = "";
         if ($this->rhs_module == $this->lhs_module)
         {
-        	$source = $this->getJoinKeyLHS();
+            $source = $this->getJoinKeyLHS();
         }
  
         return array( 
-        	$this->lhs_module => $this->getSubpanelDefinition ( 
-        		$this->relationship_name, $this->rhs_module, $this->rhs_subpanel , $this->getRightModuleSystemLabel() , $source
-        	) 
+            $this->lhs_module => $this->getSubpanelDefinition ( 
+                $this->relationship_name, $this->rhs_module, $this->rhs_subpanel , $this->getRightModuleSystemLabel() , $source
+            ) 
         );
     }
 
@@ -113,7 +113,7 @@ 
     /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-	function buildVardefs ( )
+    function buildVardefs ( )
     {
         $vardefs = array ( ) ;
         
@@ -123,7 +123,7 @@ 
         ) ;
         if ($this->rhs_module != $this->lhs_module )
         {
-        	$vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, true,
+            $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, true,
                 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()  ) . '_TITLE');
         }
         if (! $this->relationship_only)

Spacing +27 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
 
 /*
  * Class to manage the metadata for a One-To-Many Relationship
@@ -77,9 +77,9 @@ 
      * @param array $definition Parameters passed in as array defined in parent::$definitionKeys
      * The lhs_module value is for the One side; the rhs_module value is for the Many
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
-        parent::__construct ( $definition ) ;
+        parent::__construct($definition);
     }
 
     /*
@@ -91,10 +91,10 @@ 
      * The format is that of TO_MODULE => relationship, FROM_MODULE, FROM_MODULES_SUBPANEL, mimicking the format in the layoutdefs.php
      * @return array    An array of subpanel definitions, keyed by the module
      */
-    function buildSubpanelDefinitions ()
+    function buildSubpanelDefinitions()
     {        
         if ($this->relationship_only)
-            return array () ;
+            return array();
         
         $source = "";
         if ($this->rhs_module == $this->lhs_module)
@@ -103,8 +103,8 @@ 
         }
  
         return array( 
-        	$this->lhs_module => $this->getSubpanelDefinition ( 
-        		$this->relationship_name, $this->rhs_module, $this->rhs_subpanel , $this->getRightModuleSystemLabel() , $source
+        	$this->lhs_module => $this->getSubpanelDefinition( 
+        		$this->relationship_name, $this->rhs_module, $this->rhs_subpanel, $this->getRightModuleSystemLabel(), $source
         	) 
         );
     }
@@ -113,47 +113,47 @@ 
     /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-	function buildVardefs ( )
+	function buildVardefs( )
     {
-        $vardefs = array ( ) ;
+        $vardefs = array( );
         
-        $vardefs [ $this->rhs_module ] [] = $this->getLinkFieldDefinition ( $this->lhs_module, $this->relationship_name, false,
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE',
-            $this->relationship_only ? false : $this->getIDName( $this->lhs_module )
-        ) ;
-        if ($this->rhs_module != $this->lhs_module )
+        $vardefs [$this->rhs_module] [] = $this->getLinkFieldDefinition($this->lhs_module, $this->relationship_name, false,
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE',
+            $this->relationship_only ? false : $this->getIDName($this->lhs_module)
+        );
+        if ($this->rhs_module != $this->lhs_module)
         {
-        	$vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, true,
-                'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()  ) . '_TITLE');
+        	$vardefs [$this->lhs_module] [] = $this->getLinkFieldDefinition($this->rhs_module, $this->relationship_name, true,
+                'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE');
         }
-        if (! $this->relationship_only)
+        if (!$this->relationship_only)
         {
-            $vardefs [ $this->rhs_module ] [] = $this->getRelateFieldDefinition ( $this->lhs_module, $this->relationship_name, $this->getLeftModuleSystemLabel() ) ;
-            $vardefs [ $this->rhs_module ] [] = $this->getLink2FieldDefinition ( $this->lhs_module, $this->relationship_name, true,
-                'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()  ) . '_TITLE');
+            $vardefs [$this->rhs_module] [] = $this->getRelateFieldDefinition($this->lhs_module, $this->relationship_name, $this->getLeftModuleSystemLabel());
+            $vardefs [$this->rhs_module] [] = $this->getLink2FieldDefinition($this->lhs_module, $this->relationship_name, true,
+                'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE');
         }
         
-        return $vardefs ;
+        return $vardefs;
     }
     
     /*
      * Define what fields to add to which modules layouts
      * @return array    An array of module => fieldname
      */
-    function buildFieldsToLayouts ()
+    function buildFieldsToLayouts()
     {
         if ($this->relationship_only)
-            return array () ;
+            return array();
  
-        return array( $this->rhs_module =>$this->getValidDBName($this->relationship_name . "_name")); // this must match the name of the relate field from buildVardefs
+        return array($this->rhs_module =>$this->getValidDBName($this->relationship_name."_name")); // this must match the name of the relate field from buildVardefs
     }
        
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
-        return array( $this->lhs_module => $this->getRelationshipMetaData ( MB_ONETOMANY ) ) ;
+        return array($this->lhs_module => $this->getRelationshipMetaData(MB_ONETOMANY));
     }
 
 }

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

Indentation +20 added lines, -20 removed lines

@@ -60,21 +60,21 @@ 
     function __construct ($definition) 
     {
         
-    	parent::__construct ( $definition ) ;
-    	$onetomanyDef = array_merge($definition, array(
-	        'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
-	        'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
-	        'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
-	        'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
-	        'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
-	        'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
-	        'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
-	        'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
-	        'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
-	        'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
-	        'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
-	        'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
-	        'relationship_type' => MB_ONETOMANY,
+        parent::__construct ( $definition ) ;
+        $onetomanyDef = array_merge($definition, array(
+            'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
+            'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
+            'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
+            'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
+            'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
+            'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
+            'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
+            'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
+            'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
+            'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
+            'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
+            'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
+            'relationship_type' => MB_ONETOMANY,
         ));
         $this->one_to_many = new OneToManyRelationship($onetomanyDef);
     }
@@ -83,7 +83,7 @@ 
      * BUILD methods called during the build
      */
 	
-	function buildLabels ()
+    function buildLabels ()
     {
         return $this->one_to_many->buildLabels();
     }
@@ -104,7 +104,7 @@ 
      */
     function buildVardefs ( )
     {
-       return $this->one_to_many->buildVardefs();
+        return $this->one_to_many->buildVardefs();
     }
     
     /*
@@ -130,19 +130,19 @@ 
     public function setName ($relationshipName)
     {
         parent::setName($relationshipName);
-    	$this->one_to_many->setname($relationshipName);
+        $this->one_to_many->setname($relationshipName);
     }
     
     public function setReadonly ()
     {
         parent::setReadonly();
-    	$this->one_to_many->setReadonly();
+        $this->one_to_many->setReadonly();
     }
     
     public function delete ()
     {
         parent::delete();
-    	$this->one_to_many->delete();
+        $this->one_to_many->delete();
     }
     
     public function setRelationship_only ()

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -39,9 +39,9 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
-require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php' ;
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
+require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php';
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 /*
  * Class to manage the metadata for a many-To-one Relationship
@@ -57,21 +57,21 @@ 
      * @param array $definition Parameters passed in as array defined in parent::$definitionKeys
      * The lhs_module value is for the One side; the rhs_module value is for the Many
      */
-    function __construct ($definition) 
+    function __construct($definition) 
     {
         
-    	parent::__construct ( $definition ) ;
+    	parent::__construct($definition);
     	$onetomanyDef = array_merge($definition, array(
-	        'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
-	        'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
+	        'rhs_label'    => isset($definition['lhs_label']) ? $definition['lhs_label'] : null,
+	        'lhs_label'    => isset($definition['rhs_label']) ? $definition['rhs_label'] : null,
 	        'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
 	        'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
-	        'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
-	        'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
-	        'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
-	        'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
-	        'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
-	        'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
+	        'lhs_module'   => isset($definition['rhs_module']) ? $definition['rhs_module'] : null,
+	        'lhs_table'    => isset($definition['rhs_table']) ? $definition['rhs_table'] : null,
+	        'lhs_key'      => isset($definition['rhs_key']) ? $definition['rhs_key'] : null,
+	        'rhs_module'   => isset($definition['lhs_module']) ? $definition['lhs_module'] : null,
+	        'rhs_table'    => isset($definition['lhs_table']) ? $definition['lhs_table'] : null,
+	        'rhs_key'      => isset($definition['lhs_key']) ? $definition['lhs_key'] : null,
 	        'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
 	        'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
 	        'relationship_type' => MB_ONETOMANY,
@@ -83,7 +83,7 @@ 
      * BUILD methods called during the build
      */
 	
-	function buildLabels ()
+	function buildLabels()
     {
         return $this->one_to_many->buildLabels();
     }
@@ -93,7 +93,7 @@ 
      * The format is that of TO_MODULE => relationship, FROM_MODULE, FROM_MODULES_SUBPANEL, mimicking the format in the layoutdefs.php
      * @return array    An array of subpanel definitions, keyed by the module
      */
-    function buildSubpanelDefinitions ()
+    function buildSubpanelDefinitions()
     {        
         return $this->one_to_many->buildSubpanelDefinitions();
     }
@@ -102,7 +102,7 @@ 
     /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-    function buildVardefs ( )
+    function buildVardefs( )
     {
        return $this->one_to_many->buildVardefs();
     }
@@ -111,41 +111,41 @@ 
      * Define what fields to add to which modules layouts
      * @return array    An array of module => fieldname
      */
-    function buildFieldsToLayouts ()
+    function buildFieldsToLayouts()
     {
         if ($this->relationship_only)
-            return array () ;
+            return array();
  
-        return array( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ) ; // this must match the name of the relate field from buildVardefs
+        return array($this->lhs_module => $this->getValidDBName($this->relationship_name."_name")); // this must match the name of the relate field from buildVardefs
     }
        
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
         return $this->one_to_many->buildRelationshipMetaData();
     }
     
-    public function setName ($relationshipName)
+    public function setName($relationshipName)
     {
         parent::setName($relationshipName);
     	$this->one_to_many->setname($relationshipName);
     }
     
-    public function setReadonly ()
+    public function setReadonly()
     {
         parent::setReadonly();
     	$this->one_to_many->setReadonly();
     }
     
-    public function delete ()
+    public function delete()
     {
         parent::delete();
     	$this->one_to_many->delete();
     }
     
-    public function setRelationship_only ()
+    public function setRelationship_only()
     {
         parent::setRelationship_only();
         $this->one_to_many->setRelationship_only();

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

Indentation +16 added lines, -16 removed lines

@@ -72,10 +72,10 @@ 
 class ActivitiesRelationship extends OneToManyRelationship
 {
 
-	protected static $subpanelsAdded = array();
-	protected static $labelsAdded = array();
+    protected static $subpanelsAdded = array();
+    protected static $labelsAdded = array();
 
-	/*
+    /*
      * Constructor
      * @param array $definition Parameters passed in as array defined in parent::$definitionKeys
      * The lhs_module value is for the One side; the rhs_module value is for the Many
@@ -89,7 +89,7 @@ 
      * BUILD methods called during the build
      */
 
-	/*
+    /*
      * Define the labels to be added to the module for the new relationships
      * @return array    An array of system value => display value
      */
@@ -140,7 +140,7 @@ 
     }
 
 
-	/*
+    /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
     function buildVardefs ( )
@@ -154,7 +154,7 @@ 
         return $vardefs ;
     }
 
-	protected function getLinkFieldDefinition ($sourceModule , $relationshipName)
+    protected function getLinkFieldDefinition ($sourceModule , $relationshipName)
     {
         $vardef = array ( ) ;
         $vardef [ 'name' ] = $relationshipName;
@@ -179,7 +179,7 @@ 
         return array( $this->rhs_module => $this->relationship_name . "_name" ) ; // this must match the name of the relate field from buildVardefs
     }
 
- 	function buildSubpanelDefinitions ()
+        function buildSubpanelDefinitions ()
     {
         if ($this->relationship_only || isset(ActivitiesRelationship::$subpanelsAdded[$this->lhs_module]))
             return array () ;
@@ -187,9 +187,9 @@ 
         ActivitiesRelationship::$subpanelsAdded[$this->lhs_module] = true;
         $relationshipName = substr($this->relationship_name, 0, strrpos($this->relationship_name, '_'));
         return array( $this->lhs_module => array (
-        			  'activities' => $this->buildActivitiesSubpanelDefinition ( $relationshipName ),
-        			  'history' => $this->buildHistorySubpanelDefinition ( $relationshipName ) ,
-        			));
+                        'activities' => $this->buildActivitiesSubpanelDefinition ( $relationshipName ),
+                        'history' => $this->buildHistorySubpanelDefinition ( $relationshipName ) ,
+                    ));
     }
 
     /*
@@ -209,10 +209,10 @@ 
         $relMetadata ['relationship_role_column'] = 'parent_type';
         $relMetadata ['relationship_role_column_value'] = $this->definition [ 'lhs_module' ] ;
 
-    	return array( $this->lhs_module => array(
-    		'relationships' => array ($relationshipName => $relMetadata),
-    		'fields' => '', 'indices' => '', 'table' => '')
-    	) ;
+        return array( $this->lhs_module => array(
+            'relationships' => array ($relationshipName => $relMetadata),
+            'fields' => '', 'indices' => '', 'table' => '')
+        ) ;
     }
 
 /*
@@ -221,7 +221,7 @@ 
      */
     protected function buildActivitiesSubpanelDefinition ( $relationshipName )
     {
-		return array (
+        return array (
             'order' => 10 ,
             'sort_order' => 'desc' ,
             'sort_by' => 'date_start' ,
@@ -265,7 +265,7 @@ 
             'module' => 'History' ,
             'top_buttons' => array (
                 array ( 'widget_class' => 'SubPanelTopCreateNoteButton' ) ,
-				array ( 'widget_class' => 'SubPanelTopArchiveEmailButton'),
+                array ( 'widget_class' => 'SubPanelTopArchiveEmailButton'),
                 array ( 'widget_class' => 'SubPanelTopSummaryButton' ) ) ,
                 'collection_list' => array (
                     'meetings' => array (

Spacing +112 added lines, -112 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php';
 
 /*
  * Class to manage the metadata for a One-To-Many Relationship
@@ -80,9 +80,9 @@ 
      * @param array $definition Parameters passed in as array defined in parent::$definitionKeys
      * The lhs_module value is for the One side; the rhs_module value is for the Many
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
-        parent::__construct ( $definition ) ;
+        parent::__construct($definition);
     }
 
     /*
@@ -93,15 +93,15 @@ 
      * Define the labels to be added to the module for the new relationships
      * @return array    An array of system value => display value
      */
-    function buildLabels ()
+    function buildLabels()
     {
-        $labelDefinitions = array ( ) ;
-        if (!$this->relationship_only )
+        $labelDefinitions = array( );
+        if (!$this->relationship_only)
         {
             if (!isset(ActivitiesRelationship::$labelsAdded[$this->lhs_module])) {
-                foreach(getTypeDisplayList() as $typeDisplay)
+                foreach (getTypeDisplayList() as $typeDisplay)
                 {
-                    $labelDefinitions [] = array (
+                    $labelDefinitions [] = array(
                         'module' => 'application',
                         'system_label' => $typeDisplay,
                         'display_label' => array(
@@ -113,180 +113,180 @@ 
 
             $rhs_display_label = '';
             if (!empty($this->rhs_label)) {
-                $rhs_display_label .= $this->rhs_label . ':';
+                $rhs_display_label .= $this->rhs_label.':';
             }
             $rhs_display_label .= translate($this->rhs_module);
 
             $lhs_display_label = '';
             if (!empty($this->rhs_label)) {
-                $lhs_display_label .= $this->rhs_label . ':';
+                $lhs_display_label .= $this->rhs_label.':';
             }
             $lhs_display_label .= translate($this->lhs_module);
 
-            $labelDefinitions[] = array (
-                'module' => $this->lhs_module ,
-                'system_label' => 'LBL_' . strtoupper($this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()) . '_TITLE',
+            $labelDefinitions[] = array(
+                'module' => $this->lhs_module,
+                'system_label' => 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE',
                 'display_label' => $rhs_display_label
             );
             $labelDefinitions[] = array(
                 'module' => $this->rhs_module,
-                'system_label' => 'LBL_' . strtoupper($this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel()) . '_TITLE',
+                'system_label' => 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE',
                 'display_label' => $lhs_display_label
             );
 
             ActivitiesRelationship::$labelsAdded[$this->lhs_module] = true;
         }
-        return $labelDefinitions ;
+        return $labelDefinitions;
     }
 
 
 	/*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-    function buildVardefs ( )
+    function buildVardefs( )
     {
-        $vardefs = array ( ) ;
+        $vardefs = array( );
 
-        $vardefs [ $this->rhs_module ] [] = $this->getLinkFieldDefinition ( $this->lhs_module, $this->relationship_name ) ;
-        $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name ) ;
+        $vardefs [$this->rhs_module] [] = $this->getLinkFieldDefinition($this->lhs_module, $this->relationship_name);
+        $vardefs [$this->lhs_module] [] = $this->getLinkFieldDefinition($this->rhs_module, $this->relationship_name);
 
 
-        return $vardefs ;
+        return $vardefs;
     }
 
-	protected function getLinkFieldDefinition ($sourceModule , $relationshipName)
+	protected function getLinkFieldDefinition($sourceModule, $relationshipName)
     {
-        $vardef = array ( ) ;
-        $vardef [ 'name' ] = $relationshipName;
-        $vardef [ 'type' ] = 'link' ;
-        $vardef [ 'relationship' ] = $relationshipName ;
-        $vardef [ 'source' ] = 'non-db' ;
-        $vardef [ 'module' ] = $sourceModule ;
-        $vardef [ 'bean_name' ] = BeanFactory::getObjectName($sourceModule) ;
-        $vardef [ 'vname' ] = strtoupper("LBL_{$relationshipName}_FROM_{$sourceModule}_TITLE");
-        return $vardef ;
+        $vardef = array( );
+        $vardef ['name'] = $relationshipName;
+        $vardef ['type'] = 'link';
+        $vardef ['relationship'] = $relationshipName;
+        $vardef ['source'] = 'non-db';
+        $vardef ['module'] = $sourceModule;
+        $vardef ['bean_name'] = BeanFactory::getObjectName($sourceModule);
+        $vardef ['vname'] = strtoupper("LBL_{$relationshipName}_FROM_{$sourceModule}_TITLE");
+        return $vardef;
     }
 
     /*
      * Define what fields to add to which modules layouts
      * @return array    An array of module => fieldname
      */
-    function buildFieldsToLayouts ()
+    function buildFieldsToLayouts()
     {
         if ($this->relationship_only)
-            return array () ;
+            return array();
 
-        return array( $this->rhs_module => $this->relationship_name . "_name" ) ; // this must match the name of the relate field from buildVardefs
+        return array($this->rhs_module => $this->relationship_name."_name"); // this must match the name of the relate field from buildVardefs
     }
 
- 	function buildSubpanelDefinitions ()
+ 	function buildSubpanelDefinitions()
     {
         if ($this->relationship_only || isset(ActivitiesRelationship::$subpanelsAdded[$this->lhs_module]))
-            return array () ;
+            return array();
 
         ActivitiesRelationship::$subpanelsAdded[$this->lhs_module] = true;
         $relationshipName = substr($this->relationship_name, 0, strrpos($this->relationship_name, '_'));
-        return array( $this->lhs_module => array (
-        			  'activities' => $this->buildActivitiesSubpanelDefinition ( $relationshipName ),
-        			  'history' => $this->buildHistorySubpanelDefinition ( $relationshipName ) ,
+        return array($this->lhs_module => array(
+        			  'activities' => $this->buildActivitiesSubpanelDefinition($relationshipName),
+        			  'history' => $this->buildHistorySubpanelDefinition($relationshipName),
         			));
     }
 
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
-        $relationshipName = $this->definition [ 'relationship_name' ];
-        $relMetadata = array ( ) ;
-        $relMetadata [ 'lhs_module' ] = $this->definition [ 'lhs_module' ] ;
-        $relMetadata [ 'lhs_table' ] = $this->getTablename($this->definition [ 'lhs_module' ]) ;
-        $relMetadata [ 'lhs_key' ] = 'id' ;
-        $relMetadata [ 'rhs_module' ] = $this->definition [ 'rhs_module' ] ;
-        $relMetadata [ 'rhs_table' ] = $this->getTablename($this->definition [ 'rhs_module' ]) ;
+        $relationshipName = $this->definition ['relationship_name'];
+        $relMetadata = array( );
+        $relMetadata ['lhs_module'] = $this->definition ['lhs_module'];
+        $relMetadata ['lhs_table'] = $this->getTablename($this->definition ['lhs_module']);
+        $relMetadata ['lhs_key'] = 'id';
+        $relMetadata ['rhs_module'] = $this->definition ['rhs_module'];
+        $relMetadata ['rhs_table'] = $this->getTablename($this->definition ['rhs_module']);
         $relMetadata ['rhs_key'] = 'parent_id';
         $relMetadata ['relationship_type'] = 'one-to-many';
         $relMetadata ['relationship_role_column'] = 'parent_type';
-        $relMetadata ['relationship_role_column_value'] = $this->definition [ 'lhs_module' ] ;
+        $relMetadata ['relationship_role_column_value'] = $this->definition ['lhs_module'];
 
-    	return array( $this->lhs_module => array(
-    		'relationships' => array ($relationshipName => $relMetadata),
+    	return array($this->lhs_module => array(
+    		'relationships' => array($relationshipName => $relMetadata),
     		'fields' => '', 'indices' => '', 'table' => '')
-    	) ;
+    	);
     }
 
 /*
      * Shortcut to construct an Activities collection subpanel
      * @param AbstractRelationship $relationship    Source relationship to Activities module
      */
-    protected function buildActivitiesSubpanelDefinition ( $relationshipName )
+    protected function buildActivitiesSubpanelDefinition($relationshipName)
     {
-		return array (
-            'order' => 10 ,
-            'sort_order' => 'desc' ,
-            'sort_by' => 'date_start' ,
-            'title_key' => 'LBL_ACTIVITIES_SUBPANEL_TITLE' ,
-            'type' => 'collection' ,
-            'subpanel_name' => 'activities' , //this value is not associated with a physical file
-            'module' => 'Activities' ,
-            'top_buttons' => array (
-                array ( 'widget_class' => 'SubPanelTopCreateTaskButton' ) ,
-                array ( 'widget_class' => 'SubPanelTopScheduleMeetingButton' ) ,
-                array ( 'widget_class' => 'SubPanelTopScheduleCallButton' ) ,
-                array ( 'widget_class' => 'SubPanelTopComposeEmailButton' ) ) ,
-                'collection_list' => array (
-                    'meetings' => array (
-                        'module' => 'Meetings' ,
-                        'subpanel_name' => 'ForActivities' ,
-                        'get_subpanel_data' => $relationshipName. '_meetings' ) ,
-                    'tasks' => array (
-                        'module' => 'Tasks' ,
-                        'subpanel_name' => 'ForActivities' ,
-                        'get_subpanel_data' => $relationshipName. '_tasks' ) ,
-                    'calls' => array (
-                        'module' => 'Calls' ,
-                        'subpanel_name' => 'ForActivities' ,
-                        'get_subpanel_data' => $relationshipName. '_calls' ) ) ) ;
+		return array(
+            'order' => 10,
+            'sort_order' => 'desc',
+            'sort_by' => 'date_start',
+            'title_key' => 'LBL_ACTIVITIES_SUBPANEL_TITLE',
+            'type' => 'collection',
+            'subpanel_name' => 'activities', //this value is not associated with a physical file
+            'module' => 'Activities',
+            'top_buttons' => array(
+                array('widget_class' => 'SubPanelTopCreateTaskButton'),
+                array('widget_class' => 'SubPanelTopScheduleMeetingButton'),
+                array('widget_class' => 'SubPanelTopScheduleCallButton'),
+                array('widget_class' => 'SubPanelTopComposeEmailButton') ),
+                'collection_list' => array(
+                    'meetings' => array(
+                        'module' => 'Meetings',
+                        'subpanel_name' => 'ForActivities',
+                        'get_subpanel_data' => $relationshipName.'_meetings' ),
+                    'tasks' => array(
+                        'module' => 'Tasks',
+                        'subpanel_name' => 'ForActivities',
+                        'get_subpanel_data' => $relationshipName.'_tasks' ),
+                    'calls' => array(
+                        'module' => 'Calls',
+                        'subpanel_name' => 'ForActivities',
+                        'get_subpanel_data' => $relationshipName.'_calls' ) ) );
     }
 
     /*
      * Shortcut to construct a History collection subpanel
      * @param AbstractRelationship $relationship    Source relationship to Activities module
      */
-    protected function buildHistorySubpanelDefinition ( $relationshipName )
+    protected function buildHistorySubpanelDefinition($relationshipName)
     {
-        return array (
-            'order' => 20 ,
-            'sort_order' => 'desc' ,
-            'sort_by' => 'date_modified' ,
-            'title_key' => 'LBL_HISTORY' ,
-            'type' => 'collection' ,
-            'subpanel_name' => 'history' , //this values is not associated with a physical file.
-            'module' => 'History' ,
-            'top_buttons' => array (
-                array ( 'widget_class' => 'SubPanelTopCreateNoteButton' ) ,
-				array ( 'widget_class' => 'SubPanelTopArchiveEmailButton'),
-                array ( 'widget_class' => 'SubPanelTopSummaryButton' ) ) ,
-                'collection_list' => array (
-                    'meetings' => array (
-                        'module' => 'Meetings' ,
-                        'subpanel_name' => 'ForHistory' ,
-                        'get_subpanel_data' => $relationshipName. '_meetings' ) ,
-                    'tasks' => array (
-                        'module' => 'Tasks' ,
-                        'subpanel_name' => 'ForHistory' ,
-                        'get_subpanel_data' => $relationshipName. '_tasks' ) ,
-                    'calls' => array (
-                        'module' => 'Calls' ,
-                        'subpanel_name' => 'ForHistory' ,
-                        'get_subpanel_data' => $relationshipName. '_calls' ) ,
-                    'notes' => array (
-                        'module' => 'Notes' ,
-                        'subpanel_name' => 'ForHistory' ,
-                        'get_subpanel_data' => $relationshipName. '_notes' ) ,
-                    'emails' => array (
-                        'module' => 'Emails' ,
-                        'subpanel_name' => 'ForHistory' ,
-                        'get_subpanel_data' => $relationshipName. '_emails' ) ) )  ;
+        return array(
+            'order' => 20,
+            'sort_order' => 'desc',
+            'sort_by' => 'date_modified',
+            'title_key' => 'LBL_HISTORY',
+            'type' => 'collection',
+            'subpanel_name' => 'history', //this values is not associated with a physical file.
+            'module' => 'History',
+            'top_buttons' => array(
+                array('widget_class' => 'SubPanelTopCreateNoteButton'),
+				array('widget_class' => 'SubPanelTopArchiveEmailButton'),
+                array('widget_class' => 'SubPanelTopSummaryButton') ),
+                'collection_list' => array(
+                    'meetings' => array(
+                        'module' => 'Meetings',
+                        'subpanel_name' => 'ForHistory',
+                        'get_subpanel_data' => $relationshipName.'_meetings' ),
+                    'tasks' => array(
+                        'module' => 'Tasks',
+                        'subpanel_name' => 'ForHistory',
+                        'get_subpanel_data' => $relationshipName.'_tasks' ),
+                    'calls' => array(
+                        'module' => 'Calls',
+                        'subpanel_name' => 'ForHistory',
+                        'get_subpanel_data' => $relationshipName.'_calls' ),
+                    'notes' => array(
+                        'module' => 'Notes',
+                        'subpanel_name' => 'ForHistory',
+                        'get_subpanel_data' => $relationshipName.'_notes' ),
+                    'emails' => array(
+                        'module' => 'Emails',
+                        'subpanel_name' => 'ForHistory',
+                        'get_subpanel_data' => $relationshipName.'_emails' ) ) );
     }
 }

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/constants.php

Indentation +2 added lines, -2 removed lines

@@ -67,6 +67,6 @@
 
 class MBConstants
 {
-	static $EMPTY = array ( 'name' => '(empty)' , 'label' => '(empty)' ) ;
-	static $FILLER = array ( 'name' => '(filler)' , 'label' => 'LBL_FILLER' ) ; // would prefer to have label => translate('LBL_FILLER') but can't be done in a static, and don't want to require instantiating a new object to get these constants
+    static $EMPTY = array ( 'name' => '(empty)' , 'label' => '(empty)' ) ;
+    static $FILLER = array ( 'name' => '(filler)' , 'label' => 'LBL_FILLER' ) ; // would prefer to have label => translate('LBL_FILLER') but can't be done in a static, and don't want to require instantiating a new object to get these constants
 }

Spacing +24 added lines, -24 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -39,34 +39,34 @@ 
  ********************************************************************************/
 
 
-define('MB_BASEMETADATALOCATION','base');
-define('MB_CUSTOMMETADATALOCATION','custom');
-define('MB_WORKINGMETADATALOCATION','working');
-define('MB_HISTORYMETADATALOCATION','history');
-define('MB_GRIDLAYOUTMETADATA','gridLayoutMetaData');
-define('MB_LISTLAYOUTMETADATA','listLayoutMetaData');
-define('MB_LISTVIEW','listview');
-define('MB_SEARCHVIEW','searchview');
-define('MB_BASICSEARCH','basic_search' );
-define('MB_ADVANCEDSEARCH','advanced_search' );
-define('MB_DASHLET','dashlet');
-define('MB_DASHLETSEARCH','dashletsearch');
-define('MB_EDITVIEW','editview');
-define('MB_DETAILVIEW','detailview');
-define('MB_QUICKCREATE','quickcreate');
-define('MB_POPUPLIST','popuplist');
-define('MB_POPUPSEARCH','popupsearch');
-define('MB_LABEL','label');
+define('MB_BASEMETADATALOCATION', 'base');
+define('MB_CUSTOMMETADATALOCATION', 'custom');
+define('MB_WORKINGMETADATALOCATION', 'working');
+define('MB_HISTORYMETADATALOCATION', 'history');
+define('MB_GRIDLAYOUTMETADATA', 'gridLayoutMetaData');
+define('MB_LISTLAYOUTMETADATA', 'listLayoutMetaData');
+define('MB_LISTVIEW', 'listview');
+define('MB_SEARCHVIEW', 'searchview');
+define('MB_BASICSEARCH', 'basic_search');
+define('MB_ADVANCEDSEARCH', 'advanced_search');
+define('MB_DASHLET', 'dashlet');
+define('MB_DASHLETSEARCH', 'dashletsearch');
+define('MB_EDITVIEW', 'editview');
+define('MB_DETAILVIEW', 'detailview');
+define('MB_QUICKCREATE', 'quickcreate');
+define('MB_POPUPLIST', 'popuplist');
+define('MB_POPUPSEARCH', 'popupsearch');
+define('MB_LABEL', 'label');
 define('MB_ONETOONE', 'one-to-one');
 define('MB_ONETOMANY', 'one-to-many');
 define('MB_MANYTOONE', 'many-to-one');
 define('MB_MANYTOMANY', 'many-to-many');
-define('MB_MAXDBIDENTIFIERLENGTH',30); // maximum length of any identifier in our supported databases
-define('MB_EXPORTPREPEND','project_');
-define('MB_VISIBILITY','visibility');
+define('MB_MAXDBIDENTIFIERLENGTH', 30); // maximum length of any identifier in our supported databases
+define('MB_EXPORTPREPEND', 'project_');
+define('MB_VISIBILITY', 'visibility');
 
 class MBConstants
 {
-	static $EMPTY = array ( 'name' => '(empty)' , 'label' => '(empty)' ) ;
-	static $FILLER = array ( 'name' => '(filler)' , 'label' => 'LBL_FILLER' ) ; // would prefer to have label => translate('LBL_FILLER') but can't be done in a static, and don't want to require instantiating a new object to get these constants
+	static $EMPTY = array('name' => '(empty)', 'label' => '(empty)');
+	static $FILLER = array('name' => '(filler)', 'label' => 'LBL_FILLER'); // would prefer to have label => translate('LBL_FILLER') but can't be done in a static, and don't want to require instantiating a new object to get these constants
 }

Braces +3 added lines, -1 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.

modules/ModuleBuilder/parsers/parser.dropdown.php

Indentation +119 added lines, -119 removed lines

@@ -41,7 +41,7 @@ 
 
 require_once('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
 
- class ParserDropDown extends ModuleBuilderParser {
+    class ParserDropDown extends ModuleBuilderParser {
 
     /**
      * Takes in the request params from a save request and processes
@@ -51,19 +51,19 @@ 
      */
     function saveDropDown($params){
         require_once('modules/Administration/Common.php');
-		$emptyMarker = translate('LBL_BLANK');
-		$selected_lang = (!empty($params['dropdown_lang'])?$params['dropdown_lang']:$_SESSION['authenticated_user_language']);
-		$type = $_REQUEST['view_package'];
-		$dir = '';
-		$dropdown_name = $params['dropdown_name'];
-		$json = getJSONobj();
+        $emptyMarker = translate('LBL_BLANK');
+        $selected_lang = (!empty($params['dropdown_lang'])?$params['dropdown_lang']:$_SESSION['authenticated_user_language']);
+        $type = $_REQUEST['view_package'];
+        $dir = '';
+        $dropdown_name = $params['dropdown_name'];
+        $json = getJSONobj();
 
-		$list_value = str_replace('"":""', '"__empty__":""', $params['list_value']);
-		//Bug 21362 ENT_QUOTES- convert single quotes to escaped single quotes.
-		$temp = $json->decode(html_entity_decode(rawurldecode($list_value), ENT_QUOTES) );
-		$dropdown = array () ;
-		// dropdown is received as an array of (name,value) pairs - now extract to name=>value format preserving order
-		// we rely here on PHP to preserve the order of the received name=>value pairs - associative arrays in PHP are ordered
+        $list_value = str_replace('"":""', '"__empty__":""', $params['list_value']);
+        //Bug 21362 ENT_QUOTES- convert single quotes to escaped single quotes.
+        $temp = $json->decode(html_entity_decode(rawurldecode($list_value), ENT_QUOTES) );
+        $dropdown = array () ;
+        // dropdown is received as an array of (name,value) pairs - now extract to name=>value format preserving order
+        // we rely here on PHP to preserve the order of the received name=>value pairs - associative arrays in PHP are ordered
         if(is_array($temp))
         {
             foreach ( $temp as $item )
@@ -71,146 +71,146 @@ 
                 $dropdown[ SugarCleaner::stripTags(from_html($item [ 0 ]), false) ] = SugarCleaner::stripTags(from_html($item [ 1 ]), false) ;
             }
         }
-		if(array_key_exists($emptyMarker, $dropdown)){
+        if(array_key_exists($emptyMarker, $dropdown)){
             $output=array();
             foreach($dropdown as $key => $value){
                 if($emptyMarker===$key)
                     $output['']='';
                 else
                     $output[$key]=$value;
-		}
+        }
             $dropdown=$output;
-		}
+        }
 
-		if($type != 'studio'){
-			$mb = new ModuleBuilder();
-			$module = $mb->getPackageModule($params['view_package'], $params['view_module']);
-			$this->synchMBDropDown($dropdown_name, $dropdown, $selected_lang, $module);
-			//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{
-			$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']){
-	           $GLOBALS['app_list_strings'][$dropdown_name] = $dropdown;
-	        }
-			//write to contents
-			$contents = str_replace("?>", '', $contents);
-			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
-	        	foreach($dropdown as $key=>$value){
-	        		//only if the value has changed or does not exist do we want to add it this way
-	        		if(!isset($my_list_strings[$dropdown_name][$key]) || strcmp($my_list_strings[$dropdown_name][$key], $value) != 0 ){
-		        		//clear out the old value
-		        		$pattern_match = '/\s*\$app_list_strings\s*\[\s*\''.$dropdown_name.'\'\s*\]\[\s*\''.$key.'\'\s*\]\s*=\s*[\'\"]{1}.*?[\'\"]{1};\s*/ism';
-		        		$contents = preg_replace($pattern_match, "\n", $contents);
-		        		//add the new ones
-		        		$contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']['$key']=" . var_export_helper($value) . ";";
-	        		}
-	        	}
-	        }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);
-	        }
-		    if(!empty($dir) && !is_dir($dir))
-		    {
-		     	$continue = mkdir_recursive($dir);
-		    }
-			save_custom_app_list_strings_contents($contents, $selected_lang, $dir);
-		}
-		sugar_cache_reset();
-		clearAllJsAndJsLangFilesWithoutOutput();
+        if($type != 'studio'){
+            $mb = new ModuleBuilder();
+            $module = $mb->getPackageModule($params['view_package'], $params['view_module']);
+            $this->synchMBDropDown($dropdown_name, $dropdown, $selected_lang, $module);
+            //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{
+            $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']){
+                $GLOBALS['app_list_strings'][$dropdown_name] = $dropdown;
+            }
+            //write to contents
+            $contents = str_replace("?>", '', $contents);
+            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
+                foreach($dropdown as $key=>$value){
+                    //only if the value has changed or does not exist do we want to add it this way
+                    if(!isset($my_list_strings[$dropdown_name][$key]) || strcmp($my_list_strings[$dropdown_name][$key], $value) != 0 ){
+                        //clear out the old value
+                        $pattern_match = '/\s*\$app_list_strings\s*\[\s*\''.$dropdown_name.'\'\s*\]\[\s*\''.$key.'\'\s*\]\s*=\s*[\'\"]{1}.*?[\'\"]{1};\s*/ism';
+                        $contents = preg_replace($pattern_match, "\n", $contents);
+                        //add the new ones
+                        $contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']['$key']=" . var_export_helper($value) . ";";
+                    }
+                }
+            }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);
+            }
+            if(!empty($dir) && !is_dir($dir))
+            {
+                    $continue = mkdir_recursive($dir);
+            }
+            save_custom_app_list_strings_contents($contents, $selected_lang, $dir);
+        }
+        sugar_cache_reset();
+        clearAllJsAndJsLangFilesWithoutOutput();
     }
 
     /**
-	 * function synchDropDown
-	 * 	Ensures that the set of dropdown keys is consistant accross all languages.
-	 *
-	 * @param $dropdown_name The name of the dropdown to be synched
-	 * @param $dropdown array The dropdown currently being saved
-	 * @param $selected_lang String the language currently selected in Studio/MB
-	 * @param $saveLov String the path to the directory to save the new lang file in.
-	 */
+     * function synchDropDown
+     * 	Ensures that the set of dropdown keys is consistant accross all languages.
+     *
+     * @param $dropdown_name The name of the dropdown to be synched
+     * @param $dropdown array The dropdown currently being saved
+     * @param $selected_lang String the language currently selected in Studio/MB
+     * @param $saveLov String the path to the directory to save the new lang file in.
+     */
     function synchDropDown($dropdown_name, $dropdown, $selected_lang, $saveLoc) {
-   		$allLanguages =  get_languages();
+            $allLanguages =  get_languages();
         foreach ($allLanguages as $lang => $langName) {
-        	if ($lang != $selected_lang) {
-        		$listStrings = return_app_list_strings_language($lang);
-        		$langDropDown = array();
-        		if (isset($listStrings[$dropdown_name]) && is_array($listStrings[$dropdown_name]))
-        		{
-        		 	$langDropDown = $this->synchDDKeys($dropdown, $listStrings[$dropdown_name]);
-        		} else
-        		{
-        			//if the dropdown does not exist in the language, justt use what we have.
-        			$langDropDown = $dropdown;
-        		}
-        		$contents = $this->getNewCustomContents($dropdown_name, $langDropDown, $lang);
-        		save_custom_app_list_strings_contents($contents, $lang, $saveLoc);
-        	}
+            if ($lang != $selected_lang) {
+                $listStrings = return_app_list_strings_language($lang);
+                $langDropDown = array();
+                if (isset($listStrings[$dropdown_name]) && is_array($listStrings[$dropdown_name]))
+                {
+                        $langDropDown = $this->synchDDKeys($dropdown, $listStrings[$dropdown_name]);
+                } else
+                {
+                    //if the dropdown does not exist in the language, justt use what we have.
+                    $langDropDown = $dropdown;
+                }
+                $contents = $this->getNewCustomContents($dropdown_name, $langDropDown, $lang);
+                save_custom_app_list_strings_contents($contents, $lang, $saveLoc);
+            }
         }
     }
 
     /**
-	 * function synchMBDropDown
-	 * 	Ensures that the set of dropdown keys is consistant accross all languages in a ModuleBuilder Module
-	 *
-	 * @param $dropdown_name The name of the dropdown to be synched
-	 * @param $dropdown array The dropdown currently being saved
-	 * @param $selected_lang String the language currently selected in Studio/MB
-	 * @param $module MBModule the module to update the languages in
-	 */
+     * function synchMBDropDown
+     * 	Ensures that the set of dropdown keys is consistant accross all languages in a ModuleBuilder Module
+     *
+     * @param $dropdown_name The name of the dropdown to be synched
+     * @param $dropdown array The dropdown currently being saved
+     * @param $selected_lang String the language currently selected in Studio/MB
+     * @param $module MBModule the module to update the languages in
+     */
     function synchMBDropDown($dropdown_name, $dropdown, $selected_lang, $module) {
-    	$selected_lang	= $selected_lang . '.lang.php';
-		foreach($module->mblanguage->appListStrings as $lang => $listStrings) {
-			if ($lang != $selected_lang)
-			{
-				$langDropDown = array();
-				if (isset($listStrings[$dropdown_name]) && is_array($listStrings[$dropdown_name]))
-				{
-					$langDropDown = $this->synchDDKeys($dropdown, $listStrings[$dropdown_name]);
-				} else
-        		{
-        			$langDropDown = $dropdown;
-        		}
-        		$module->mblanguage->appListStrings[$lang][$dropdown_name] = $langDropDown;
-				$module->mblanguage->save($module->key_name);
-			}
-		}
+        $selected_lang	= $selected_lang . '.lang.php';
+        foreach($module->mblanguage->appListStrings as $lang => $listStrings) {
+            if ($lang != $selected_lang)
+            {
+                $langDropDown = array();
+                if (isset($listStrings[$dropdown_name]) && is_array($listStrings[$dropdown_name]))
+                {
+                    $langDropDown = $this->synchDDKeys($dropdown, $listStrings[$dropdown_name]);
+                } else
+                {
+                    $langDropDown = $dropdown;
+                }
+                $module->mblanguage->appListStrings[$lang][$dropdown_name] = $langDropDown;
+                $module->mblanguage->save($module->key_name);
+            }
+        }
     }
 
     private function synchDDKeys($dom, $sub) {
-    	//check for extra keys
+        //check for extra keys
         foreach($sub as $key=>$value) {
-        	if (!isset($dom[$key])) {
-        		unset ($sub[$key]);
-        	}
+            if (!isset($dom[$key])) {
+                unset ($sub[$key]);
+            }
         }
         //check for missing keys
         foreach($dom as $key=>$value) {
-        	if (!isset($sub[$key])) {
-        		$sub[$key] = $value;
-        	}
+            if (!isset($sub[$key])) {
+                $sub[$key] = $value;
+            }
         }
         return $sub;
     }
 
     function getPatternMatch($dropdown_name) {
-    	return '/\s*\$GLOBALS\s*\[\s*\'app_list_strings\s*\'\s*\]\[\s*\''
-    		 . $dropdown_name.'\'\s*\]\s*=\s*array\s*\([^\)]*\)\s*;\s*/ism';
+        return '/\s*\$GLOBALS\s*\[\s*\'app_list_strings\s*\'\s*\]\[\s*\''
+                . $dropdown_name.'\'\s*\]\s*=\s*array\s*\([^\)]*\)\s*;\s*/ism';
     }
 
     function getNewCustomContents($dropdown_name, $dropdown, $lang) {
-    	$contents = return_custom_app_list_strings_file_contents($lang);
+        $contents = return_custom_app_list_strings_file_contents($lang);
         $contents = str_replace("?>", '', $contents);
-		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;
+        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;
     }
 }
 ?>

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -49,10 +49,10 @@ 
      *
      * @param REQUEST params  $params
      */
-    function saveDropDown($params){
+    function saveDropDown($params) {
         require_once('modules/Administration/Common.php');
 		$emptyMarker = translate('LBL_BLANK');
-		$selected_lang = (!empty($params['dropdown_lang'])?$params['dropdown_lang']:$_SESSION['authenticated_user_language']);
+		$selected_lang = (!empty($params['dropdown_lang']) ? $params['dropdown_lang'] : $_SESSION['authenticated_user_language']);
 		$type = $_REQUEST['view_package'];
 		$dir = '';
 		$dropdown_name = $params['dropdown_name'];
@@ -60,63 +60,63 @@ 
 
 		$list_value = str_replace('&quot;&quot;:&quot;&quot;', '&quot;__empty__&quot;:&quot;&quot;', $params['list_value']);
 		//Bug 21362 ENT_QUOTES- convert single quotes to escaped single quotes.
-		$temp = $json->decode(html_entity_decode(rawurldecode($list_value), ENT_QUOTES) );
-		$dropdown = array () ;
+		$temp = $json->decode(html_entity_decode(rawurldecode($list_value), ENT_QUOTES));
+		$dropdown = array();
 		// dropdown is received as an array of (name,value) pairs - now extract to name=>value format preserving order
 		// we rely here on PHP to preserve the order of the received name=>value pairs - associative arrays in PHP are ordered
-        if(is_array($temp))
+        if (is_array($temp))
         {
-            foreach ( $temp as $item )
+            foreach ($temp as $item)
             {
-                $dropdown[ SugarCleaner::stripTags(from_html($item [ 0 ]), false) ] = SugarCleaner::stripTags(from_html($item [ 1 ]), false) ;
+                $dropdown[SugarCleaner::stripTags(from_html($item [0]), false)] = SugarCleaner::stripTags(from_html($item [1]), false);
             }
         }
-		if(array_key_exists($emptyMarker, $dropdown)){
-            $output=array();
-            foreach($dropdown as $key => $value){
-                if($emptyMarker===$key)
-                    $output['']='';
+		if (array_key_exists($emptyMarker, $dropdown)) {
+            $output = array();
+            foreach ($dropdown as $key => $value) {
+                if ($emptyMarker === $key)
+                    $output[''] = '';
                 else
-                    $output[$key]=$value;
+                    $output[$key] = $value;
 		}
-            $dropdown=$output;
+            $dropdown = $output;
 		}
 
-		if($type != 'studio'){
+		if ($type != 'studio') {
 			$mb = new ModuleBuilder();
 			$module = $mb->getPackageModule($params['view_package'], $params['view_module']);
 			$this->synchMBDropDown($dropdown_name, $dropdown, $selected_lang, $module);
 			//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']){
+			if ($selected_lang == $GLOBALS['current_language']) {
 	           $GLOBALS['app_list_strings'][$dropdown_name] = $dropdown;
 	        }
 			//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'])){
+	        if (!empty($params['use_push'])) {
 	        	//this is for handling moduleList and such where nothing should be deleted or anything but they can be renamed
-	        	foreach($dropdown as $key=>$value){
+	        	foreach ($dropdown as $key=>$value) {
 	        		//only if the value has changed or does not exist do we want to add it this way
-	        		if(!isset($my_list_strings[$dropdown_name][$key]) || strcmp($my_list_strings[$dropdown_name][$key], $value) != 0 ){
+	        		if (!isset($my_list_strings[$dropdown_name][$key]) || strcmp($my_list_strings[$dropdown_name][$key], $value) != 0) {
 		        		//clear out the old value
 		        		$pattern_match = '/\s*\$app_list_strings\s*\[\s*\''.$dropdown_name.'\'\s*\]\[\s*\''.$key.'\'\s*\]\s*=\s*[\'\"]{1}.*?[\'\"]{1};\s*/ism';
 		        		$contents = preg_replace($pattern_match, "\n", $contents);
 		        		//add the new ones
-		        		$contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']['$key']=" . var_export_helper($value) . ";";
+		        		$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);
 	        }
-		    if(!empty($dir) && !is_dir($dir))
+		    if (!empty($dir) && !is_dir($dir))
 		    {
 		     	$continue = mkdir_recursive($dir);
 		    }
@@ -136,7 +136,7 @@ 
 	 * @param $saveLov String the path to the directory to save the new lang file in.
 	 */
     function synchDropDown($dropdown_name, $dropdown, $selected_lang, $saveLoc) {
-   		$allLanguages =  get_languages();
+   		$allLanguages = get_languages();
         foreach ($allLanguages as $lang => $langName) {
         	if ($lang != $selected_lang) {
         		$listStrings = return_app_list_strings_language($lang);
@@ -165,8 +165,8 @@ 
 	 * @param $module MBModule the module to update the languages in
 	 */
     function synchMBDropDown($dropdown_name, $dropdown, $selected_lang, $module) {
-    	$selected_lang	= $selected_lang . '.lang.php';
-		foreach($module->mblanguage->appListStrings as $lang => $listStrings) {
+    	$selected_lang = $selected_lang.'.lang.php';
+		foreach ($module->mblanguage->appListStrings as $lang => $listStrings) {
 			if ($lang != $selected_lang)
 			{
 				$langDropDown = array();
@@ -185,13 +185,13 @@ 
 
     private function synchDDKeys($dom, $sub) {
     	//check for extra keys
-        foreach($sub as $key=>$value) {
+        foreach ($sub as $key=>$value) {
         	if (!isset($dom[$key])) {
         		unset ($sub[$key]);
         	}
         }
         //check for missing keys
-        foreach($dom as $key=>$value) {
+        foreach ($dom as $key=>$value) {
         	if (!isset($sub[$key])) {
         		$sub[$key] = $value;
         	}
@@ -207,9 +207,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) . ";";
+	    $contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']=".var_export_helper($dropdown).";";
 	    return $contents;
     }
 }

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

Spacing +93 added lines, -93 removed lines

@@ -1,6 +1,6 @@ 
 <?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.
@@ -50,141 +50,141 @@ 
  * There are two relevant modules for every subpanel - the module whose detailview this subpanel will appear in ($module_name), and the module that is the source of the data for the subpanel ($subPanelParentModule)
  */
 
-require_once ('modules/ModuleBuilder/parsers/parser.modifylistview.php') ;
+require_once ('modules/ModuleBuilder/parsers/parser.modifylistview.php');
 
 class ParserModifySubPanel extends ParserModifyListView
 {
     
-    var $listViewDefs = false ;
-    var $defaults = array ( ) ;
-    var $additional = array ( ) ;
-    var $available = array ( ) ;
-    var $columns = array ( 'LBL_DEFAULT' => 'getDefaultFields' , 'LBL_HIDDEN' => 'getAvailableFields' ) ;
+    var $listViewDefs = false;
+    var $defaults = array( );
+    var $additional = array( );
+    var $available = array( );
+    var $columns = array('LBL_DEFAULT' => 'getDefaultFields', 'LBL_HIDDEN' => 'getAvailableFields');
     
-    function init ($module_name , $subPanelName)
+    function init($module_name, $subPanelName)
     {
-        $GLOBALS [ 'log' ]->debug ( "in ParserModifySubPanel: module_name={$module_name} child_module={$subPanelName}" ) ;
-        $this->moduleName = $module_name ;
-        $this->subPanelName = $subPanelName ;
-        global $beanList, $beanFiles ;
+        $GLOBALS ['log']->debug("in ParserModifySubPanel: module_name={$module_name} child_module={$subPanelName}");
+        $this->moduleName = $module_name;
+        $this->subPanelName = $subPanelName;
+        global $beanList, $beanFiles;
         
         // Sometimes we receive a module name which is not in the correct CamelCase, so shift to lower case for all beanList lookups
-        $beanListLower = array_change_key_case ( $beanList ) ;
+        $beanListLower = array_change_key_case($beanList);
         
         // Retrieve the definitions for all the available subpanels for this module
-        $class = $beanListLower [ strtolower ( $this->moduleName ) ] ;
-        require_once ($beanFiles [ $class ]) ;
-        $module = new $class ( ) ;
-        require_once ('include/SubPanel/SubPanelDefinitions.php') ;
-        $spd = new SubPanelDefinitions ( $module ) ;
+        $class = $beanListLower [strtolower($this->moduleName)];
+        require_once ($beanFiles [$class]);
+        $module = new $class( );
+        require_once ('include/SubPanel/SubPanelDefinitions.php');
+        $spd = new SubPanelDefinitions($module);
         
         // Get the lists of fields already in the subpanel and those that can be added in
         // Get the fields lists from an aSubPanel object describing this subpanel from the SubPanelDefinitions object
-        $this->originalListViewDefs = array ( ) ;
-        if (array_key_exists ( strtolower ( $this->subPanelName ), $spd->layout_defs [ 'subpanel_setup' ] ))
+        $this->originalListViewDefs = array( );
+        if (array_key_exists(strtolower($this->subPanelName), $spd->layout_defs ['subpanel_setup']))
         {
-            $originalPanel = $spd->load_subpanel ( $this->subPanelName, true ) ;
-            $this->originalListViewDefs = $originalPanel->get_list_fields () ;
-            $this->panel = $spd->load_subpanel ( $subPanelName, false ) ;
-            $this->listViewDefs = $this->panel->get_list_fields () ;
+            $originalPanel = $spd->load_subpanel($this->subPanelName, true);
+            $this->originalListViewDefs = $originalPanel->get_list_fields();
+            $this->panel = $spd->load_subpanel($subPanelName, false);
+            $this->listViewDefs = $this->panel->get_list_fields();
             
             // Retrieve a copy of the bean for the parent module of this subpanel - so we can find additional fields for the layout
-            $subPanelParentModuleName = $this->panel->get_module_name () ;
-            $this->subPanelParentModule = null ;
+            $subPanelParentModuleName = $this->panel->get_module_name();
+            $this->subPanelParentModule = null;
 
-            if (! empty ( $subPanelParentModuleName ) && isset($beanListLower[strtolower($subPanelParentModuleName)]))
+            if (!empty ($subPanelParentModuleName) && isset($beanListLower[strtolower($subPanelParentModuleName)]))
             {
                 $class = $beanListLower[strtolower($subPanelParentModuleName)];
-                if (isset($beanFiles [ $class ]))
+                if (isset($beanFiles [$class]))
                 {
-                    require_once ($beanFiles [ $class ]) ;
-                    $this->subPanelParentModule = new $class ( ) ;
+                    require_once ($beanFiles [$class]);
+                    $this->subPanelParentModule = new $class( );
                 }
             }
         }
         
-        $this->language_module = $this->panel->template_instance->module_dir ;
+        $this->language_module = $this->panel->template_instance->module_dir;
     }
     
     /**
      * Return a list of the fields that will be displayed in the subpanel
      */
-    function getDefaultFields ()
+    function getDefaultFields()
     {
-        $this->defaults = array ( ) ;
-        foreach ( $this->listViewDefs as $key => $def )
+        $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' ] ;
-            $this->defaults [ $key ] = $def ;
+            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 ;
+        return $this->defaults;
     }
     
     /**
      * Return a list of fields that are not currently included in the subpanel but that are available for use
      */
-    function getAvailableFields ()
+    function getAvailableFields()
     {
-        $this->availableFields = array ( ) ;
+        $this->availableFields = array( );
         if ($this->subPanelParentModule != null)
         {
-            $lowerFieldList = array_change_key_case ( $this->listViewDefs ) ;
-            foreach ( $this->originalListViewDefs as $key => $def )
+            $lowerFieldList = array_change_key_case($this->listViewDefs);
+            foreach ($this->originalListViewDefs as $key => $def)
             {
-                $key = strtolower ( $key ) ;
-                if (! isset ( $lowerFieldList [ $key ] ))
+                $key = strtolower($key);
+                if (!isset ($lowerFieldList [$key]))
                 {
-                    $this->availableFields [ $key ] = $def ;
+                    $this->availableFields [$key] = $def;
                 }
             }
-            $GLOBALS [ 'log' ]->debug ( 'parser.modifylistview.php->getAvailableFields(): field_defs=' . print_r ( $this->availableFields, true ) ) ;
-            foreach ( $this->subPanelParentModule->field_defs as $key => $fieldDefinition )
+            $GLOBALS ['log']->debug('parser.modifylistview.php->getAvailableFields(): field_defs='.print_r($this->availableFields, true));
+            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
+                $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 ((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'))
+                    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 ) ;
+                        $label = (isset ($fieldDefinition ['vname'])) ? $fieldDefinition ['vname'] : (isset ($fieldDefinition ['label']) ? $fieldDefinition ['label'] : $fieldDefinition ['name']);
+                        $this->availableFields [$fieldName] = array('width' => '10', 'label' => $label);
                     }
                 }
             }
         }
         
-        return $this->availableFields ;
+        return $this->availableFields;
     }
     
-    function getField ($fieldName)
+    function getField($fieldName)
     {
-        foreach ( $this->listViewDefs as $key => $def )
+        foreach ($this->listViewDefs as $key => $def)
         {
-            $key = strtolower ( $key ) ;
+            $key = strtolower($key);
             if ($key == $fieldName)
             {
-                return $def ;
+                return $def;
             }
         }
-        foreach ( $this->originalListViewDefs as $key => $def )
+        foreach ($this->originalListViewDefs as $key => $def)
         {
-            $key = strtolower ( $key ) ;
+            $key = strtolower($key);
             if ($key == $fieldName)
             {
-                return $def ;
+                return $def;
             }
         }
-        foreach ( $this->panel->template_instance->field_defs as $key => $def )
+        foreach ($this->panel->template_instance->field_defs as $key => $def)
         {
-            $key = strtolower ( $key ) ;
+            $key = strtolower($key);
             if ($key == $fieldName)
             {
-                return $def ;
+                return $def;
             }
         }
-        return array ( ) ;
+        return array( );
     }
     
     /*
@@ -192,67 +192,67 @@ 
      * Obtains the field definitions from a _REQUEST array, and merges them with the other fields from the original definitions
      * Uses the subpanel override mechanism from SubPanel to save them 
      */
-    function handleSave ()
+    function handleSave()
     {
-        $GLOBALS [ 'log' ]->debug ( "in ParserModifySubPanel->handleSave()" ) ;
-        require_once ('include/SubPanel/SubPanel.php') ;
-        $subpanel = new SubPanel ( $this->moduleName, 'fab4', $this->subPanelName, $this->panel ) ;
+        $GLOBALS ['log']->debug("in ParserModifySubPanel->handleSave()");
+        require_once ('include/SubPanel/SubPanel.php');
+        $subpanel = new SubPanel($this->moduleName, 'fab4', $this->subPanelName, $this->panel);
         
-        $newFields = array ( ) ;
-        foreach ( $this->listViewDefs as $name => $field )
+        $newFields = array( );
+        foreach ($this->listViewDefs as $name => $field)
         {
-            if (! isset ( $field [ 'usage' ] ) || $field [ 'usage' ] != 'query_only')
+            if (!isset ($field ['usage']) || $field ['usage'] != 'query_only')
             {
-                $existingFields [ $name ] = $field ;
+                $existingFields [$name] = $field;
             
             } else
             {
-                $newFields [ $name ] = $field ;
+                $newFields [$name] = $field;
             }
         }
         
         // Loop through all of the fields defined in the 'Default' group of the ListView data in $_REQUEST
         // Replace the field specification in the originalListViewDef with this new updated specification
-        foreach ( $_REQUEST [ 'group_0' ] as $field )
+        foreach ($_REQUEST ['group_0'] as $field)
         {
-            if (! empty ( $this->originalListViewDefs [ $field ] ))
+            if (!empty ($this->originalListViewDefs [$field]))
             {
-                $newFields [ $field ] = $this->originalListViewDefs [ $field ] ;
+                $newFields [$field] = $this->originalListViewDefs [$field];
             } else
             {
                 
-                $vname = '' ;
-                if (isset ( $this->panel->template_instance->field_defs [ $field ] ))
+                $vname = '';
+                if (isset ($this->panel->template_instance->field_defs [$field]))
                 {
-                    $vname = $this->panel->template_instance->field_defs [ $field ] [ 'vname' ] ;
+                    $vname = $this->panel->template_instance->field_defs [$field] ['vname'];
                 }
-                if (($this->subPanelParentModule != null) && (isset ( $this->subPanelParentModule->field_name_map [ $field ] ) && ($this->subPanelParentModule->field_name_map [ $field ] [ 'type' ] == 'bool' || (isset ( $this->subPanelParentModule->field_name_map [ $field ] [ 'custom_type' ] ) && $this->subPanelParentModule->field_name_map [ $field ] [ 'custom_type' ] == 'bool'))))
+                if (($this->subPanelParentModule != null) && (isset ($this->subPanelParentModule->field_name_map [$field]) && ($this->subPanelParentModule->field_name_map [$field] ['type'] == 'bool' || (isset ($this->subPanelParentModule->field_name_map [$field] ['custom_type']) && $this->subPanelParentModule->field_name_map [$field] ['custom_type'] == 'bool'))))
                 {
-                    $newFields [ $field ] = array ( 'name' => $field , 'vname' => $vname , 'widget_type' => 'checkbox' ) ;
+                    $newFields [$field] = array('name' => $field, 'vname' => $vname, 'widget_type' => 'checkbox');
                 } else
                 {
-                    $newFields [ $field ] = array ( 'name' => $field , 'vname' => $vname ) ;
+                    $newFields [$field] = array('name' => $field, 'vname' => $vname);
                 }
             }
             
             // Now set the field width if specified in the $_REQUEST data
-            if (isset ( $_REQUEST [ strtolower ( $field ) . 'width' ] ))
+            if (isset ($_REQUEST [strtolower($field).'width']))
             {
-                $width = substr ( $_REQUEST [ strtolower ( $field ) . 'width' ], 6, 3 ) ;
-                if (strpos ( $width, "%" ) != false)
+                $width = substr($_REQUEST [strtolower($field).'width'], 6, 3);
+                if (strpos($width, "%") != false)
                 {
-                    $width = substr ( $width, 0, 2 ) ;
+                    $width = substr($width, 0, 2);
                 }
                 if ($width < 101 && $width > 0)
                 {
-                    $newFields [ $field ] [ 'width' ] = $width ;
+                    $newFields [$field] ['width'] = $width;
                 }
-            } else if (isset ( $this->listViewDefs [ $field ] [ 'width' ] ))
+            } else if (isset ($this->listViewDefs [$field] ['width']))
             {
-                $newFields [ $field ] [ 'width' ] = $this->listViewDefs [ $field ] [ 'width' ] ;
+                $newFields [$field] ['width'] = $this->listViewDefs [$field] ['width'];
             }
         }
-        $subpanel->saveSubPanelDefOverride ( $this->panel, 'list_fields', $newFields ) ;
+        $subpanel->saveSubPanelDefOverride($this->panel, 'list_fields', $newFields);
     
     }
 

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