adamjakab / SuiteCRM

modules/ModuleBuilder/parsers/relationships/ManyToManyRelationship.php

Spacing +18 added lines, -18 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 Many-To-Many Relationship
@@ -57,9 +57,9 @@ 
      * Constructor
      * @param array $definition Parameters passed in as array with keys defined in parent::keys
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
-        parent::__construct ( $definition ) ;
+        parent::__construct($definition);
     }
   
     /*
@@ -71,37 +71,37 @@ 
      * 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 module
      */
-    function buildSubpanelDefinitions ()
+    function buildSubpanelDefinitions()
     {        
-        $subpanelDefinitions = array ( ) ;
+        $subpanelDefinitions = array( );
         if (!$this->relationship_only)
         {
-            $subpanelDefinitions [ $this->rhs_module ] = $this->getSubpanelDefinition ( $this->relationship_name, $this->lhs_module, $this->lhs_subpanel, $this->getLeftModuleSystemLabel() ) ;
-            $subpanelDefinitions [ $this->lhs_module ] = $this->getSubpanelDefinition ( $this->relationship_name, $this->rhs_module, $this->rhs_subpanel, $this->getRightModuleSystemLabel() ) ;
+            $subpanelDefinitions [$this->rhs_module] = $this->getSubpanelDefinition($this->relationship_name, $this->lhs_module, $this->lhs_subpanel, $this->getLeftModuleSystemLabel());
+            $subpanelDefinitions [$this->lhs_module] = $this->getSubpanelDefinition($this->relationship_name, $this->rhs_module, $this->rhs_subpanel, $this->getRightModuleSystemLabel());
         }
-        return $subpanelDefinitions ;
+        return $subpanelDefinitions;
     }
 
 
     /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-    function buildVardefs ( )
+    function buildVardefs( )
     {
-        $vardefs = array ( ) ;
-        $vardefs [ $this->rhs_module ] [] = $this->getLinkFieldDefinition ( $this->lhs_module, $this->relationship_name, false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ) ;
-        $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()  ) . '_TITLE' ) ;
-        return $vardefs ;
+        $vardefs = array( );
+        $vardefs [$this->rhs_module] [] = $this->getLinkFieldDefinition($this->lhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE');
+        $vardefs [$this->lhs_module] [] = $this->getLinkFieldDefinition($this->rhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE');
+        return $vardefs;
     }
     
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
-        return array( $this->lhs_module => $this->getRelationshipMetaData ( MB_MANYTOMANY ) ) ;
+        return array($this->lhs_module => $this->getRelationshipMetaData(MB_MANYTOMANY));
     }
     
 

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

Indentation +40 added lines, -40 removed lines

@@ -66,15 +66,15 @@ 
     // have different actual relationship names other than <relationshipName>
     // e.g $dictionary[ 'quotes_accounts' ] has two relationships: quotes_billto_accounts, quotes_shipto_accounts
     protected $specialCaseBaseNames = array( 'quotes_accounts',
-                                             'quotes_contacts',
-                                             'emails_beans',
-                                             'linked_documents',
-                                             'project_relation',
-                                             'prospect_lists_prospects',
-                                             'queues_beans',
-                                             'queues_queue',
-                                             'tracker_sessions'
-                                          );
+                                                'quotes_contacts',
+                                                'emails_beans',
+                                                'linked_documents',
+                                                'project_relation',
+                                                'prospect_lists_prospects',
+                                                'queues_beans',
+                                                'queues_queue',
+                                                'tracker_sessions'
+                                            );
     /*
      * Find all deployed modules that can participate in a relationship
      * Return a list of modules with associated subpanels
@@ -333,7 +333,7 @@ 
     protected function build ($basepath , $installDefPrefix , $relationships )
     {
         global $sugar_config;
-    	// keep the relationships data separate from any other build data by ading /relationships to the basepath
+        // keep the relationships data separate from any other build data by ading /relationships to the basepath
         $basepath .= '/relationships' ;
 
         $installDefs = array ( ) ;
@@ -393,34 +393,34 @@ 
     {
         global $sugar_config;
         
-       	mkdir_recursive ( "$basepath/language" ) ;
+            mkdir_recursive ( "$basepath/language" ) ;
     	
-       	$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
+            $headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
         $installDefs = array ( ) ;
         foreach ( $labelDefinitions as $definition )
         {
-        	$mod_strings = array();
-        	$app_list_strings = array();
+            $mod_strings = array();
+            $app_list_strings = array();
         	
-        	$out = $headerString;
+            $out = $headerString;
         	
-        	$filename = "{$basepath}/language/{$definition['module']}.php" ;
+            $filename = "{$basepath}/language/{$definition['module']}.php" ;
     	
-	    	if (file_exists ( $filename ))
-	    		include ($filename);
+            if (file_exists ( $filename ))
+                include ($filename);
 	    		
             
             //Check for app strings
             $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveLabels(): saving the following to {$filename}" 
-                                      . print_r ( $definition, true ) ) ;
+                                        . print_r ( $definition, true ) ) ;
             if ($definition['module'] == 'application') {
-            	$app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($app_list_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
+                $app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
+                foreach ($app_list_strings as $key => $val)
+                    $out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
             } else {
-            	$mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($mod_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+                $mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
+                foreach ($mod_strings as $key => $val)
+                    $out .= override_value_to_string_recursive2('mod_strings', $key, $val);
             }
             
             $fh = fopen ( $filename, 'w' ) ;
@@ -430,17 +430,17 @@ 
         	
             foreach($sugar_config['languages'] as $lk => $lv)
             {
-            	$installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
-            		'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
-            		'to_module' => $definition [ 'module' ] , 
-            		'language' => $lk 
-            	) ;                                 		
+                $installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
+                    'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
+                    'to_module' => $definition [ 'module' ] , 
+                    'language' => $lk 
+                ) ;                                 		
             }
             
             /* do not use the following write_array_to_file method to write the label file - 
              * module installer appends each of the label files together (as it does for all files) 
 			 * into a combined label file and so the last $mod_strings is the only one received by the application */
-        	// write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
+            // write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
         }
         
         return $installDefs ;
@@ -534,11 +534,11 @@ 
             $relName = $moduleName;
             foreach ( $definitions as $definition )
             {
-            	if (!empty($definition['relationship']))
-            	{
-            		$relName = $definition['relationship'];
-            		break;
-            	}
+                if (!empty($definition['relationship']))
+                {
+                    $relName = $definition['relationship'];
+                    break;
+                }
             }
             
             $filename = "$basepath/vardefs/{$relName}_{$moduleName}.php" ;
@@ -547,14 +547,14 @@ 
             foreach ( $definitions as $definition )
             {
                 $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): saving the following to {$filename}" . print_r ( $definition, true ) ) ;
-               	$out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
-               		  . var_export_helper($definition) . ";\n";
+                    $out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
+                            . var_export_helper($definition) . ";\n";
             }
             file_put_contents($filename, $out);
             
             $installDefs [ $moduleName ] = array ( 
-            	'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
-            	'to_module' => $moduleName 
+                'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
+                'to_module' => $moduleName 
             ) ;
         }
         

Spacing +199 added lines, -199 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
@@ -50,22 +50,22 @@ 
 class AbstractRelationships
 {
     
-    static $methods = array (
-        'Labels' => 'language' ,
-        'RelationshipMetaData' => 'relationships' ,
-        'SubpanelDefinitions' => 'layoutdefs' ,
-        'Vardefs' => 'vardefs' ,
+    static $methods = array(
+        'Labels' => 'language',
+        'RelationshipMetaData' => 'relationships',
+        'SubpanelDefinitions' => 'layoutdefs',
+        'Vardefs' => 'vardefs',
         'FieldsToLayouts' => 'layoutfields',
-    ) ;
-    static $activities = array ( 'calls' => 'Calls' , 'meetings' => 'Meetings' , 'notes' => 'Notes' , 'tasks' => 'Tasks' , 'emails' => 'Emails' ) ;
+    );
+    static $activities = array('calls' => 'Calls', 'meetings' => 'Meetings', 'notes' => 'Notes', 'tasks' => 'Tasks', 'emails' => 'Emails');
     
-    protected $relationships = array ( ) ; // array containing all the AbstractRelationship objects that are in this set of relationships
-    protected $moduleName ;
+    protected $relationships = array( ); // array containing all the AbstractRelationship objects that are in this set of relationships
+    protected $moduleName;
 
     // bug33522 - the following relationship names that you would find in $dictionary[ <relationshipName> ]
     // have different actual relationship names other than <relationshipName>
     // e.g $dictionary[ 'quotes_accounts' ] has two relationships: quotes_billto_accounts, quotes_shipto_accounts
-    protected $specialCaseBaseNames = array( 'quotes_accounts',
+    protected $specialCaseBaseNames = array('quotes_accounts',
                                              'quotes_contacts',
                                              'emails_beans',
                                              'linked_documents',
@@ -81,56 +81,56 @@ 
      * @param boolean $includeActivitiesSubmodules True if the list should include Calls, Meetings etc; false if they should be replaced by the parent, Activities
      * @return array    Array of [$module][$subpanel]
      */
-    static function findRelatableModules ($includeActivitiesSubmodules = true)
+    static function findRelatableModules($includeActivitiesSubmodules = true)
     {
-        $relatableModules = array ( ) ;
+        $relatableModules = array( );
         
         // add in activities automatically if required
-        $relatableModules [ 'Activities' ] [ 'default' ] = translate( 'LBL_DEFAULT' ) ;
+        $relatableModules ['Activities'] ['default'] = translate('LBL_DEFAULT');
             
         // find all deployed modules
-        require_once 'modules/ModuleBuilder/Module/StudioBrowser.php' ;
-        $browser = new StudioBrowser() ;
+        require_once 'modules/ModuleBuilder/Module/StudioBrowser.php';
+        $browser = new StudioBrowser();
         $browser->loadRelatableModules();
-        reset($browser->modules) ;
+        reset($browser->modules);
 
-        while ( list( $moduleName , $module ) = each($browser->modules) )
+        while (list($moduleName, $module) = each($browser->modules))
         {
             // do not include the submodules of Activities as already have the parent...
-            if (! $includeActivitiesSubmodules && in_array ( $module->module, self::$activities ))
-                continue ;
+            if (!$includeActivitiesSubmodules && in_array($module->module, self::$activities))
+                continue;
             $providedSubpanels = $module->getProvidedSubpanels();
-            if ( $providedSubpanels !== false ) {
-                $relatableModules [ $module->module ] = $providedSubpanels;
+            if ($providedSubpanels !== false) {
+                $relatableModules [$module->module] = $providedSubpanels;
             }
         }
         
-        return $relatableModules ;
+        return $relatableModules;
     
     }
 
-    static function validSubpanel ($filename)
+    static function validSubpanel($filename)
     {
-        if (! file_exists ( $filename ))
-            return false ;
+        if (!file_exists($filename))
+            return false;
         
-        include $filename ;
-        return (isset ( $subpanel_layout ) && (isset ( $subpanel_layout [ 'top_buttons' ] ) && isset ( $subpanel_layout [ 'list_fields' ] ))) ;
+        include $filename;
+        return (isset ($subpanel_layout) && (isset ($subpanel_layout ['top_buttons']) && isset ($subpanel_layout ['list_fields'])));
     }
 
     /*
      * Get a list of all relationships (which have not been deleted)
      * @return array    Array of relationship names, ready for use in get()
      */
-    function getRelationshipList ()
+    function getRelationshipList()
     {
-        $list = array ( ) ;
-        foreach ( $this->relationships as $name => $relationship )
+        $list = array( );
+        foreach ($this->relationships as $name => $relationship)
         {
-            if (! $relationship->deleted ())
-                $list [ $name ] = $name ;
+            if (!$relationship->deleted())
+                $list [$name] = $name;
         }
-        return $list ;
+        return $list;
     }
 
     /*
@@ -138,13 +138,13 @@ 
      * @param string $relationshipName  The unique name for this relationship, as returned by $relationship->getName()
      * @return AbstractRelationship or false if $relationshipName is not in this set of relationships
      */
-    function get ($relationshipName)
+    function get($relationshipName)
     {
-        if (isset ( $this->relationships [ $relationshipName ] ))
+        if (isset ($this->relationships [$relationshipName]))
         {
-            return $this->relationships [ $relationshipName ] ;
+            return $this->relationships [$relationshipName];
         }
-        return false ;
+        return false;
     }
 
     /*
@@ -153,45 +153,45 @@ 
      * Otherwise, create and add a new relationship with the information in the $_REQUEST
      * @return AbstractRelationship
      */
-    function addFromPost ()
+    function addFromPost()
     {
-        $definition = array ( ) ;
+        $definition = array( );
         
-        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
-        foreach ( AbstractRelationship::$definitionKeys as $key )
+        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
+        foreach (AbstractRelationship::$definitionKeys as $key)
         {
-            if (! empty ( $_REQUEST [ $key ] ))
+            if (!empty ($_REQUEST [$key]))
             {
-                $definition [ $key ] = ($key == 'relationship_type') ? AbstractRelationship::parseRelationshipType ( $_REQUEST [ $key ] ) : $_REQUEST [ $key ] ;
+                $definition [$key] = ($key == 'relationship_type') ? AbstractRelationship::parseRelationshipType($_REQUEST [$key]) : $_REQUEST [$key];
             }
         }
         
         // if this is a change to an existing relationship, and it is not readonly, then delete the old one
-        if (! empty ( $_REQUEST [ 'relationship_name' ] ))
+        if (!empty ($_REQUEST ['relationship_name']))
         {
-            if ($relationship = $this->get ( $_REQUEST [ 'relationship_name' ] ))
+            if ($relationship = $this->get($_REQUEST ['relationship_name']))
             {
-                unset( $definition[ 'relationship_name' ] ) ; // in case the related modules have changed; this name is probably no longer appropriate
-                if (! $relationship->readonly ())
-                    $this->delete ( $_REQUEST [ 'relationship_name' ] ) ;
+                unset($definition['relationship_name']); // in case the related modules have changed; this name is probably no longer appropriate
+                if (!$relationship->readonly())
+                    $this->delete($_REQUEST ['relationship_name']);
         }
         }
         
-        $newRelationship = RelationshipFactory::newRelationship ( $definition ) ;
+        $newRelationship = RelationshipFactory::newRelationship($definition);
         // TODO: error handling in case we get a badly formed definition and hence relationship
-        $this->add ( $newRelationship ) ;
-        return $newRelationship ;
+        $this->add($newRelationship);
+        return $newRelationship;
     }
 
     /*
      * Add a relationship to the set
      * @param AbstractRelationship $relationship    The relationship to add
      */
-    function add ($relationship)
+    function add($relationship)
     {
-        $name = $this->getUniqueName ( $relationship ) ;
-        $relationship->setName ( $name ) ;
-        $this->relationships [ $name ] = $relationship ;
+        $name = $this->getUniqueName($relationship);
+        $relationship->setName($name);
+        $this->relationships [$name] = $relationship;
     }
 
     /*
@@ -200,52 +200,52 @@ 
      * @param string $basepath  Base directory in which to store the relationships information
      * @return Array of AbstractRelationship objects
      */
-    protected function _load ($basepath)
+    protected function _load($basepath)
     {
-        $GLOBALS [ 'log' ]->info ( get_class ( $this ) . ": loading relationships from " . $basepath . '/relationships.php' ) ;
-        $objects = array ( ) ;
-        if (file_exists ( $basepath . '/relationships.php' ))
+        $GLOBALS ['log']->info(get_class($this).": loading relationships from ".$basepath.'/relationships.php');
+        $objects = array( );
+        if (file_exists($basepath.'/relationships.php'))
         {
-            include ($basepath . '/relationships.php') ;
-            foreach ( $relationships as $name => $definition )
+            include ($basepath.'/relationships.php');
+            foreach ($relationships as $name => $definition)
             {
                 // update any pre-5.1 relationships to the new definitions
                 // we do this here, rather than when upgrading from 5.0 to 5.1, as modules exported from MB in 5.0 may be loaded into 5.1 at any time
                 // note also that since these definitions are only found in the relationships.php working file they only occur for deployed or exported modules, not published then loaded modules
-                $definition = $this->_updateRelationshipDefinition( $definition ) ;
-                $relationship = RelationshipFactory::newRelationship ( $definition ) ;
+                $definition = $this->_updateRelationshipDefinition($definition);
+                $relationship = RelationshipFactory::newRelationship($definition);
                 // make sure it has a unique name
-                if (! isset( $definition [ 'relationship_name' ] ) )
+                if (!isset($definition ['relationship_name']))
                 {
-                    $name = $this->getUniqueName ( $relationship ) ;
-                    $relationship->setName ( $name ) ;
+                    $name = $this->getUniqueName($relationship);
+                    $relationship->setName($name);
                 }
-                $objects [ $name ] = $relationship ;
+                $objects [$name] = $relationship;
             }
         }
-        return $objects ;
+        return $objects;
     }
 
     /*
      * Save the set of relationships to a file
      * @param string $basepath  Base directory in which to store the relationships information
      */
-    protected function _save ($relationships , $basepath)
+    protected function _save($relationships, $basepath)
     {
-        $GLOBALS [ 'log' ]->info ( get_class ( $this ) . ": saving relationships to " . $basepath . '/relationships.php' ) ;
-        $header = file_get_contents ( 'modules/ModuleBuilder/MB/header.php' ) ;
+        $GLOBALS ['log']->info(get_class($this).": saving relationships to ".$basepath.'/relationships.php');
+        $header = file_get_contents('modules/ModuleBuilder/MB/header.php');
         
-        $definitions = array ( ) ;
+        $definitions = array( );
         
-        foreach ( $relationships as $relationship )
+        foreach ($relationships as $relationship)
         {
             // if (! $relationship->readonly ())
-            $definitions [ $relationship->getName () ] = $relationship->getDefinition () ;
+            $definitions [$relationship->getName()] = $relationship->getDefinition();
         }
         
-        mkdir_recursive ( $basepath ) ;
+        mkdir_recursive($basepath);
         // replace any existing relationships.php
-        write_array_to_file ( 'relationships', $definitions, $basepath . '/relationships.php', 'w', $header ) ;
+        write_array_to_file('relationships', $definitions, $basepath.'/relationships.php', 'w', $header);
     }
 
     /*
@@ -258,20 +258,20 @@ 
      * relationship (products-products) uses it (and there it makes no difference from our POV) and we don't use it when creating new ones
      * @return array Array of $relationshipName => $relationshipDefinition as an array
      */
-    protected function getDeployedRelationships ()
+    protected function getDeployedRelationships()
     {
         
-        $db = DBManagerFactory::getInstance () ;
-        $query = "SELECT * FROM relationships WHERE deleted = 0" ;
-        $result = $db->query ( $query ) ;
-        while ( $row = $db->fetchByAssoc ( $result ) )
+        $db = DBManagerFactory::getInstance();
+        $query = "SELECT * FROM relationships WHERE deleted = 0";
+        $result = $db->query($query);
+        while ($row = $db->fetchByAssoc($result))
         {
             // set this relationship to readonly
-            $row [ 'readonly' ] = true ;
-            $relationships [ $row [ 'relationship_name' ] ] = $row ;
+            $row ['readonly'] = true;
+            $relationships [$row ['relationship_name']] = $row;
         }
         
-        return $relationships ;
+        return $relationships;
     }
 
     /*
@@ -280,48 +280,48 @@ 
      * @param AbstractRelationship The relationship object
      * @return string A globally unique relationship name
      */
-    protected function getUniqueName ($relationship)
+    protected function getUniqueName($relationship)
     {
-        $allRelationships = $this->getRelationshipList () ;
-        $basename = $relationship->getName () ;
+        $allRelationships = $this->getRelationshipList();
+        $basename = $relationship->getName();
         
-        if (empty ( $basename ))
+        if (empty ($basename))
         {
             // start off with the proposed name being simply lhs_module_rhs_module
-            $definition = $relationship->getDefinition () ;
-            $basename = strtolower ( $definition [ 'lhs_module' ] . '_' . $definition [ 'rhs_module' ] ) ;
+            $definition = $relationship->getDefinition();
+            $basename = strtolower($definition ['lhs_module'].'_'.$definition ['rhs_module']);
         }
         
         // Bug #49024 : Relationships Created in Earlier Versions Cause Conflicts and AJAX Errors After Upgrade
         // ...all custom relationships created via Studio should always have a numeric identifier attached.
-        if ( $this instanceof DeployedRelationships )
+        if ($this instanceof DeployedRelationships)
         {
-            $name = $basename . '_1' ;
-            $suffix = 2 ;
+            $name = $basename.'_1';
+            $suffix = 2;
         }
         else
         {
-            $name = $basename ;
-            $suffix = 1 ;
+            $name = $basename;
+            $suffix = 1;
         }
         
-        while ( isset ( $allRelationships [ $name ] ) )
+        while (isset ($allRelationships [$name]))
         {
-            $name = $basename . "_" . ( string ) ($suffix ++) ;
+            $name = $basename."_".(string)($suffix++);
         }
 
         // bug33522 - if our relationship basename is in the special cases
-        if( in_array( $name , $this->specialCaseBaseNames ) )  {
+        if (in_array($name, $this->specialCaseBaseNames)) {
             //add a _1 (or _suffix#) and check to see if it already exists
-            $name = $name . "_" . ( string ) ($suffix ++);
-            while ( isset ( $allRelationships [ $name ] ) )
+            $name = $name."_".(string)($suffix++);
+            while (isset ($allRelationships [$name]))
             {
                 // if it does exist, strip off the _1 previously added and try again
-                $name = substr( $name , 0 , -2 ) . "_" . ( string ) ($suffix ++);
+                $name = substr($name, 0, -2)."_".(string)($suffix++);
             }
         }
 
-        return $name ;
+        return $name;
     }
     
     /*
@@ -330,40 +330,40 @@ 
      * @param string $installDefPrefix  Pathname prefix for the installdefs, for example for ModuleBuilder use "<basepath>/SugarModules"
      * @param array $relationships      Relationships to implement
      */
-    protected function build ($basepath , $installDefPrefix , $relationships )
+    protected function build($basepath, $installDefPrefix, $relationships)
     {
         global $sugar_config;
     	// keep the relationships data separate from any other build data by ading /relationships to the basepath
-        $basepath .= '/relationships' ;
+        $basepath .= '/relationships';
 
-        $installDefs = array ( ) ;
-        $compositeAdded = false ;
-        foreach ( self::$methods as $method => $key )
+        $installDefs = array( );
+        $compositeAdded = false;
+        foreach (self::$methods as $method => $key)
         {
-            $buildMethod = 'build' . $method ;
-            $saveMethod = 'save' . $method ;
+            $buildMethod = 'build'.$method;
+            $saveMethod = 'save'.$method;
             
-            foreach ( $relationships as $name => $relationship )
+            foreach ($relationships as $name => $relationship)
             {
-                if (! ($relationship->readonly () || $relationship->deleted ()))
+                if (!($relationship->readonly() || $relationship->deleted()))
                 {
-                    if (method_exists ( $relationship, $buildMethod ) && method_exists ( $this, $saveMethod ))
+                    if (method_exists($relationship, $buildMethod) && method_exists($this, $saveMethod))
                     {
-                        $metadata = $relationship->$buildMethod () ;
+                        $metadata = $relationship->$buildMethod();
                         
-                        if (count ( $metadata ) > 0) // don't clutter up the filesystem with empty files...
+                        if (count($metadata) > 0) // don't clutter up the filesystem with empty files...
                         {
-                            $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": BUILD is running METHOD $saveMethod" ) ;
-                            $installDef = $this->$saveMethod ( $basepath, $installDefPrefix, $name, $metadata ) ;
+                            $GLOBALS ['log']->debug(get_class($this).": BUILD is running METHOD $saveMethod");
+                            $installDef = $this->$saveMethod($basepath, $installDefPrefix, $name, $metadata);
                             
                             // some save methods (e.g., saveRelateFieldDefinition) handle the installDefs internally and so return null
 
                         
-                            if (! is_null ( $installDef ))
+                            if (!is_null($installDef))
                             {
-                                foreach ( $installDef as $moduleName => $def )
+                                foreach ($installDef as $moduleName => $def)
                                 {
-                                    $installDefs [ $key ] [ ] = $def ;                                    	                                   
+                                    $installDefs [$key] [] = $def;                                    	                                   
                                 }
                             }
                         }
@@ -373,7 +373,7 @@ 
             }
         }
         
-        return $installDefs ;
+        return $installDefs;
     }
 
     /*
@@ -389,52 +389,52 @@ 
      * @param array $labelDefinitions       Array of System label => Display label pairs
      * @return null Nothing to be added to the installdefs for an undeployed module
      */
-    protected function saveLabels ($basepath , $installDefPrefix , $relationshipName , $labelDefinitions)
+    protected function saveLabels($basepath, $installDefPrefix, $relationshipName, $labelDefinitions)
     {
         global $sugar_config;
         
-       	mkdir_recursive ( "$basepath/language" ) ;
+       	mkdir_recursive("$basepath/language");
     	
-       	$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
-        $installDefs = array ( ) ;
-        foreach ( $labelDefinitions as $definition )
+       	$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
+        $installDefs = array( );
+        foreach ($labelDefinitions as $definition)
         {
         	$mod_strings = array();
         	$app_list_strings = array();
         	
         	$out = $headerString;
         	
-        	$filename = "{$basepath}/language/{$definition['module']}.php" ;
+        	$filename = "{$basepath}/language/{$definition['module']}.php";
     	
-	    	if (file_exists ( $filename ))
+	    	if (file_exists($filename))
 	    		include ($filename);
 	    		
             
             //Check for app strings
-            $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveLabels(): saving the following to {$filename}" 
-                                      . print_r ( $definition, true ) ) ;
+            $GLOBALS ['log']->debug(get_class($this)."->saveLabels(): saving the following to {$filename}" 
+                                      . print_r($definition, true));
             if ($definition['module'] == 'application') {
-            	$app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
+            	$app_list_strings[$definition ['system_label']] = $definition ['display_label'];
             	foreach ($app_list_strings as $key => $val)
             		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
             } else {
-            	$mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
+            	$mod_strings[$definition ['system_label']] = $definition ['display_label'];
             	foreach ($mod_strings as $key => $val)
             		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
             }
             
-            $fh = fopen ( $filename, 'w' ) ;
-            fputs ( $fh, $out, strlen ( $out ) ) ;
-            fclose ( $fh ) ;
+            $fh = fopen($filename, 'w');
+            fputs($fh, $out, strlen($out));
+            fclose($fh);
             
         	
-            foreach($sugar_config['languages'] as $lk => $lv)
+            foreach ($sugar_config['languages'] as $lk => $lv)
             {
-            	$installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
-            		'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
-            		'to_module' => $definition [ 'module' ] , 
+            	$installDefs [$definition ['module']."_$lk"] = array( 
+            		'from' => "{$installDefPrefix}/relationships/language/{$definition ['module']}.php", 
+            		'to_module' => $definition ['module'], 
             		'language' => $lk 
-            	) ;                                 		
+            	);                                 		
             }
             
             /* do not use the following write_array_to_file method to write the label file - 
@@ -443,7 +443,7 @@ 
         	// write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
         }
         
-        return $installDefs ;
+        return $installDefs;
     }
 
     /*
@@ -454,18 +454,18 @@ 
      * @param array $relationshipMetaData   Set of metadata definitions in the form $relationshipMetaData[$relationshipName]
      * @return array $installDefs           Set of new installDefs
      */
-    protected function saveRelationshipMetaData ($basepath , $installDefPrefix , $relationshipName , $relationshipMetaData)
+    protected function saveRelationshipMetaData($basepath, $installDefPrefix, $relationshipName, $relationshipMetaData)
     {
-        mkdir_recursive ( "$basepath/relationships" ) ;
+        mkdir_recursive("$basepath/relationships");
         
-        $installDefs = array ( ) ;
-        list ( $rhs_module, $properties ) = each ( $relationshipMetaData ) ;
-        $filename = "$basepath/relationships/{$relationshipName}MetaData.php" ;
-        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveRelationshipMetaData(): saving the following to {$filename}" . print_r ( $properties, true ) ) ;
-        write_array_to_file ( 'dictionary["' . $relationshipName . '"]', $properties, "{$filename}", 'w' ) ;
-        $installDefs [ $relationshipName ] = array ( /*'module' => $rhs_module , 'module_vardefs' => "<basepath>/Vardefs/{$relationshipName}.php" ,*/ 'meta_data' => "{$installDefPrefix}/relationships/relationships/{$relationshipName}MetaData.php" ) ;
+        $installDefs = array( );
+        list ($rhs_module, $properties) = each($relationshipMetaData);
+        $filename = "$basepath/relationships/{$relationshipName}MetaData.php";
+        $GLOBALS ['log']->debug(get_class($this)."->saveRelationshipMetaData(): saving the following to {$filename}".print_r($properties, true));
+        write_array_to_file('dictionary["'.$relationshipName.'"]', $properties, "{$filename}", 'w');
+        $installDefs [$relationshipName] = array( /*'module' => $rhs_module , 'module_vardefs' => "<basepath>/Vardefs/{$relationshipName}.php" ,*/ 'meta_data' => "{$installDefPrefix}/relationships/relationships/{$relationshipName}MetaData.php" );
         
-        return $installDefs ;
+        return $installDefs;
     }
 
     /*
@@ -475,31 +475,31 @@ 
      * @param array $subpanelDefinitions    Set of subpanel definitions in the form $subpanelDefinitions[$for_module][]
      * @return array $installDefs           Set of new installDefs
      */
-    protected function saveSubpanelDefinitions ($basepath , $installDefPrefix , $relationshipName , $subpanelDefinitions)
+    protected function saveSubpanelDefinitions($basepath, $installDefPrefix, $relationshipName, $subpanelDefinitions)
     {
-        mkdir_recursive ( "$basepath/layoutdefs/" ) ;
+        mkdir_recursive("$basepath/layoutdefs/");
         
-        foreach ( $subpanelDefinitions as $moduleName => $definitions )
+        foreach ($subpanelDefinitions as $moduleName => $definitions)
         {
-            $filename = "$basepath/layoutdefs/{$relationshipName}_{$moduleName}.php" ;
-            $subpanelVarname = 'layout_defs["' . $moduleName . '"]["subpanel_setup"]';
+            $filename = "$basepath/layoutdefs/{$relationshipName}_{$moduleName}.php";
+            $subpanelVarname = 'layout_defs["'.$moduleName.'"]["subpanel_setup"]';
             $out = "";
-            foreach ( $definitions as $definition )
+            foreach ($definitions as $definition)
             {
-                $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveSubpanelDefinitions(): saving the following to {$filename}" . print_r ( $definition, true ) ) ;
+                $GLOBALS ['log']->debug(get_class($this)."->saveSubpanelDefinitions(): saving the following to {$filename}".print_r($definition, true));
                 if (empty($definition ['get_subpanel_data']) || $definition ['subpanel_name'] == 'history' || $definition ['subpanel_name'] == 'activities') {
                     $definition ['get_subpanel_data'] = $definition ['subpanel_name'];
                 }
-                $out .= override_value_to_string($subpanelVarname, strtolower ( $definition [ 'get_subpanel_data' ] ), $definition) . "\n";
+                $out .= override_value_to_string($subpanelVarname, strtolower($definition ['get_subpanel_data']), $definition)."\n";
             }
             if (!empty($out)) {
-                $out = "<?php\n // created: " . date('Y-m-d H:i:s') . "\n" . $out;
+                $out = "<?php\n // created: ".date('Y-m-d H:i:s')."\n".$out;
                 sugar_file_put_contents($filename, $out);
             }
 
-            $installDefs [ $moduleName ] = array ( 'from' => "{$installDefPrefix}/relationships/layoutdefs/{$relationshipName}_{$moduleName}.php" , 'to_module' => $moduleName ) ;
+            $installDefs [$moduleName] = array('from' => "{$installDefPrefix}/relationships/layoutdefs/{$relationshipName}_{$moduleName}.php", 'to_module' => $moduleName);
         }
-        return $installDefs ;
+        return $installDefs;
     }
 
 
@@ -514,25 +514,25 @@ 
      * @param array $linkFieldDefinitions   Set of link field definitions in the form $linkFieldDefinitions[$for_module]
      * @return array $installDefs           Set of new installDefs
      */
-    protected function saveVardefs ($basepath , $installDefPrefix , $relationshipName , $vardefs)
+    protected function saveVardefs($basepath, $installDefPrefix, $relationshipName, $vardefs)
     {
-        mkdir_recursive ( "$basepath/vardefs/" ) ;
-        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): vardefs =" . print_r ( $vardefs, true ) ) ;
+        mkdir_recursive("$basepath/vardefs/");
+        $GLOBALS ['log']->debug(get_class($this)."->saveVardefs(): vardefs =".print_r($vardefs, true));
         
-        foreach ( $vardefs as $moduleName => $definitions )
+        foreach ($vardefs as $moduleName => $definitions)
         {
             // find this module's Object name - the object name, not the module name, is used as the key in the vardefs...
-            if (isset ( $GLOBALS [ 'beanList' ] [ $moduleName ] ))
+            if (isset ($GLOBALS ['beanList'] [$moduleName]))
             {
-                $module = get_module_info ( $moduleName ) ;
-                $object = $module->object_name ;
+                $module = get_module_info($moduleName);
+                $object = $module->object_name;
             } else
             {
-                $object = $moduleName ;
+                $object = $moduleName;
             }
             
             $relName = $moduleName;
-            foreach ( $definitions as $definition )
+            foreach ($definitions as $definition)
             {
             	if (!empty($definition['relationship']))
             	{
@@ -541,26 +541,26 @@ 
             	}
             }
             
-            $filename = "$basepath/vardefs/{$relName}_{$moduleName}.php" ;
+            $filename = "$basepath/vardefs/{$relName}_{$moduleName}.php";
             
-            $out =  "<?php\n// created: " . date('Y-m-d H:i:s') . "\n";
-            foreach ( $definitions as $definition )
+            $out = "<?php\n// created: ".date('Y-m-d H:i:s')."\n";
+            foreach ($definitions as $definition)
             {
-                $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): saving the following to {$filename}" . print_r ( $definition, true ) ) ;
-               	$out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
-               		  . var_export_helper($definition) . ";\n";
+                $GLOBALS ['log']->debug(get_class($this)."->saveVardefs(): saving the following to {$filename}".print_r($definition, true));
+               	$out .= '$dictionary["'.$object.'"]["fields"]["'.$definition ['name'].'"] = '
+               		  . var_export_helper($definition).";\n";
             }
             file_put_contents($filename, $out);
             
-            $installDefs [ $moduleName ] = array ( 
-            	'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
+            $installDefs [$moduleName] = array( 
+            	'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php", 
             	'to_module' => $moduleName 
-            ) ;
+            );
         }
         
-        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): installDefs =" . print_r ( $installDefs, true ) ) ;
+        $GLOBALS ['log']->debug(get_class($this)."->saveVardefs(): installDefs =".print_r($installDefs, true));
         
-        return $installDefs ;
+        return $installDefs;
     
     }
 
@@ -571,37 +571,37 @@ 
      * @param $deployedName Name of the module in the deployed form - that is, keyname_modulename or modulename
      * @return array ('moduleName'=>name, 'packageName'=>package) if undeployed, ('moduleName'=>name) if deployed
      */
-    static function parseDeployedModuleName ($deployedName)
+    static function parseDeployedModuleName($deployedName)
     {
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
         
-        $packageName = '' ;
-        $moduleName = $deployedName ;
+        $packageName = '';
+        $moduleName = $deployedName;
         
-        foreach ( $mb->getPackageList () as $name )
+        foreach ($mb->getPackageList() as $name)
         {
             // convert the keyName into a packageName, needed for checking to see if this is really an undeployed module, or just a module with a _ in the name...
-            $package = $mb->getPackage ( $name ) ; // seem to need to call getPackage twice to get the key correctly... TODO: figure out why...
-            $key = $mb->getPackage ( $name )->key ;
-            if (strlen ( $key ) < strlen ( $deployedName ))
+            $package = $mb->getPackage($name); // seem to need to call getPackage twice to get the key correctly... TODO: figure out why...
+            $key = $mb->getPackage($name)->key;
+            if (strlen($key) < strlen($deployedName))
             {
-                $position = stripos ( $deployedName, $key ) ;
-                $moduleName = trim( substr( $deployedName , strlen($key) ) , '_' ); //use trim rather than just assuming that _ is between packageName and moduleName in the deployedName
-                if ( $position !== false && $position == 0 && (isset ( $mb->packages [ $name ]->modules [ $moduleName ] )))
+                $position = stripos($deployedName, $key);
+                $moduleName = trim(substr($deployedName, strlen($key)), '_'); //use trim rather than just assuming that _ is between packageName and moduleName in the deployedName
+                if ($position !== false && $position == 0 && (isset ($mb->packages [$name]->modules [$moduleName])))
                 {
-                    $packageName = $name ;
-                    break ;
+                    $packageName = $name;
+                    break;
                 }
             }
         }
         
-        if (! empty ( $packageName ))
+        if (!empty ($packageName))
         {
-            return array ( 'moduleName' => $moduleName , 'packageName' => $packageName ) ;
+            return array('moduleName' => $moduleName, 'packageName' => $packageName);
         } else
         {
-            return array ( 'moduleName' => $deployedName ) ;
+            return array('moduleName' => $deployedName);
         }
     }
 

Braces +27 added lines, -18 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
@@ -97,8 +98,9 @@ 
         while ( list( $moduleName , $module ) = each($browser->modules) )
         {
             // do not include the submodules of Activities as already have the parent...
-            if (! $includeActivitiesSubmodules && in_array ( $module->module, self::$activities ))
-                continue ;
+            if (! $includeActivitiesSubmodules && in_array ( $module->module, self::$activities )) {
+                            continue ;
+            }
             $providedSubpanels = $module->getProvidedSubpanels();
             if ( $providedSubpanels !== false ) {
                 $relatableModules [ $module->module ] = $providedSubpanels;
@@ -111,8 +113,9 @@ 
 
     static function validSubpanel ($filename)
     {
-        if (! file_exists ( $filename ))
-            return false ;
+        if (! file_exists ( $filename )) {
+                    return false ;
+        }
         
         include $filename ;
         return (isset ( $subpanel_layout ) && (isset ( $subpanel_layout [ 'top_buttons' ] ) && isset ( $subpanel_layout [ 'list_fields' ] ))) ;
@@ -127,8 +130,9 @@ 
         $list = array ( ) ;
         foreach ( $this->relationships as $name => $relationship )
         {
-            if (! $relationship->deleted ())
-                $list [ $name ] = $name ;
+            if (! $relationship->deleted ()) {
+                            $list [ $name ] = $name ;
+            }
         }
         return $list ;
     }
@@ -172,8 +176,9 @@ 
             if ($relationship = $this->get ( $_REQUEST [ 'relationship_name' ] ))
             {
                 unset( $definition[ 'relationship_name' ] ) ; // in case the related modules have changed; this name is probably no longer appropriate
-                if (! $relationship->readonly ())
-                    $this->delete ( $_REQUEST [ 'relationship_name' ] ) ;
+                if (! $relationship->readonly ()) {
+                                    $this->delete ( $_REQUEST [ 'relationship_name' ] ) ;
+                }
         }
         }
         
@@ -298,8 +303,7 @@ 
         {
             $name = $basename . '_1' ;
             $suffix = 2 ;
-        }
-        else
+        } else
         {
             $name = $basename ;
             $suffix = 1 ;
@@ -351,9 +355,11 @@ 
                     {
                         $metadata = $relationship->$buildMethod () ;
                         
-                        if (count ( $metadata ) > 0) // don't clutter up the filesystem with empty files...
+                        if (count ( $metadata ) > 0) {
+                            // don't clutter up the filesystem with empty files...
                         {
                             $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": BUILD is running METHOD $saveMethod" ) ;
+                        }
                             $installDef = $this->$saveMethod ( $basepath, $installDefPrefix, $name, $metadata ) ;
                             
                             // some save methods (e.g., saveRelateFieldDefinition) handle the installDefs internally and so return null
@@ -406,8 +412,9 @@ 
         	
         	$filename = "{$basepath}/language/{$definition['module']}.php" ;
     	
-	    	if (file_exists ( $filename ))
-	    		include ($filename);
+	    	if (file_exists ( $filename )) {
+	    		    		include ($filename);
+	    	}
 	    		
             
             //Check for app strings
@@ -415,12 +422,14 @@ 
                                       . print_r ( $definition, true ) ) ;
             if ($definition['module'] == 'application') {
             	$app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($app_list_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
+            	foreach ($app_list_strings as $key => $val) {
+            	            		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
+            	}
             } else {
             	$mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($mod_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+            	foreach ($mod_strings as $key => $val) {
+            	            		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+            	}
             }
             
             $fh = fopen ( $filename, 'w' ) ;

modules/ModuleBuilder/parsers/relationships/UndeployedRelationships.php

Indentation +3 added lines, -3 removed lines

@@ -284,8 +284,8 @@ 
             }
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
-			//Bug42170================================
-		}
+            //Bug42170================================
+        }
         
         // use an installDefPrefix of <basepath>/SugarModules for compatibility with the rest of ModuleBuilder
         $this->installDefs = parent::build ( $basepath, "<basepath>/SugarModules", $relationships ) ;
@@ -418,7 +418,7 @@ 
                         $fieldsToAdd [$deployedModuleName] = $fieldName;
                     }
                 }
-        	}
+            }
         }
         return array(array('additional_fields' => $fieldsToAdd));
     }

Spacing +138 added lines, -138 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,16 +40,16 @@ 
  ********************************************************************************/
 
 
-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 UndeployedRelationships extends AbstractRelationships implements RelationshipsInterface
 {
     
-    protected $basepath ; // Base directory for the lhs_module
-    protected $packageName ;
-    private $activitiesToAdd ; // if we need to add in the composite Activities and History subpanels to the module during the build
+    protected $basepath; // Base directory for the lhs_module
+    protected $packageName;
+    private $activitiesToAdd; // if we need to add in the composite Activities and History subpanels to the module during the build
 
     
     /*
@@ -57,17 +57,17 @@ 
      * Automatically loads in any saved relationships
      * @param string $path  The pathname of the base module directory
      */
-    function __construct ($path)
+    function __construct($path)
     {
-        $this->basepath = $path ;
+        $this->basepath = $path;
         // pull the module and package names out of the path
-        $this->moduleName = basename ( $path, "/" ) ; // just in case there are any trailing /
-        $this->packageName = basename ( dirname ( dirname ( $path ) ) ) ; // simpler than explode :)
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $this->packageKey = $mb->getPackageKey ( $this->packageName ) ;
+        $this->moduleName = basename($path, "/"); // just in case there are any trailing /
+        $this->packageName = basename(dirname(dirname($path))); // simpler than explode :)
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $this->packageKey = $mb->getPackageKey($this->packageName);
         
-        $this->load () ;
+        $this->load();
     
     }
 
@@ -75,27 +75,27 @@ 
      * Find all modules, deployed and undeployed, that can participate in a relationship
      * @return array    Array of [$module][$subpanel]
      */
-    static function findRelatableModules ($includeActivitiesSubmodules = true)
+    static function findRelatableModules($includeActivitiesSubmodules = true)
     {
         // first find all deployed modules that we might participate in a relationship
-        $relatableModules = parent::findRelatableModules ($includeActivitiesSubmodules ) ;
+        $relatableModules = parent::findRelatableModules($includeActivitiesSubmodules);
         
         // now add in the undeployed modules - those in custom/modulebuilder
         // note that if a module exists in both deployed and undeployed forms, the subpanels from the undeployed form are used...  
 
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $mb->getPackages () ;
-        foreach ( $mb->getPackageList () as $packageName )
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $mb->getPackages();
+        foreach ($mb->getPackageList() as $packageName)
         {
-            $package = $mb->packages [ $packageName ] ;
-            foreach ( $package->modules as $module )
+            $package = $mb->packages [$packageName];
+            foreach ($package->modules as $module)
             {
-                $relatableModules [ $package->key . "_" . $module->name ] = $module->getProvidedSubpanels () ;
+                $relatableModules [$package->key."_".$module->name] = $module->getProvidedSubpanels();
             }
         }
         
-        return $relatableModules ;
+        return $relatableModules;
     
     }
 
@@ -105,10 +105,10 @@ 
      * that the admin may move them around or otherwise edit them before the module is deployed
      * @param AbstractRelationship $relationship    The relationship to add
      */
-    function add ($relationship)
+    function add($relationship)
     {
-        parent::add ( $relationship ) ;
-        $this->addFieldsToUndeployedLayouts ( $relationship ) ; // must come after parent::add as we need the relationship_name in the relationships getFieldsToLayouts() which is called by addFieldsToUndeployedLayouts() 
+        parent::add($relationship);
+        $this->addFieldsToUndeployedLayouts($relationship); // must come after parent::add as we need the relationship_name in the relationships getFieldsToLayouts() which is called by addFieldsToUndeployedLayouts() 
     }
 
     /*
@@ -116,29 +116,29 @@ 
      * In future, if we need to actually track deleted relationships then just call $relationship->delete() instead
      * @param string $relationshipName  The unique name for this relationship, as returned by $relationship->getName()
      */
-    function delete ($relationshipName)
+    function delete($relationshipName)
     {
-        if ($relationship = $this->get ( $relationshipName ))
+        if ($relationship = $this->get($relationshipName))
         {
-            $this->removeFieldsFromUndeployedLayouts ( $relationship ) ;
-            unset ( $this->relationships [ $relationshipName ] ) ;
+            $this->removeFieldsFromUndeployedLayouts($relationship);
+            unset ($this->relationships [$relationshipName]);
         }
     }
 
     /*
      * Load the saved relationship definitions for this module
      */
-    function load ()
+    function load()
     {
-        $this->relationships = parent::_load ( $this->basepath ) ;
+        $this->relationships = parent::_load($this->basepath);
     }
 
     /*
      * Save this modules relationship definitions out to a working file
      */
-    function save ()
+    function save()
     {
-        parent::_save ( $this->relationships, $this->basepath ) ;
+        parent::_save($this->relationships, $this->basepath);
     }
 
     /*
@@ -146,24 +146,24 @@ 
      * @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)
     {
-        if (isset ( $definition [ 'relate' ] ))
+        if (isset ($definition ['relate']))
         {
-            $newDefinition = array ( ) ;
-            foreach ( array ( 'relate' => 'rhs_module' , 'rsub' => 'rhs_subpanel' , 'msub' => 'lhs_subpanel' , 'label' => 'label' ) as $oldParameter => $newParameter )
+            $newDefinition = array( );
+            foreach (array('relate' => 'rhs_module', 'rsub' => 'rhs_subpanel', 'msub' => 'lhs_subpanel', 'label' => 'label') as $oldParameter => $newParameter)
             {
-                if (isset ( $definition [ $oldParameter ] ))
+                if (isset ($definition [$oldParameter]))
                 {
-                    $definition [ $newParameter ] = $definition [ $oldParameter ] ;
-                    unset ( $definition [ $oldParameter ] ) ;
+                    $definition [$newParameter] = $definition [$oldParameter];
+                    unset ($definition [$oldParameter]);
                 }
             }
-            $definition [ 'lhs_module' ] = "{$this->packageKey}_{$this->moduleName}" ;
+            $definition ['lhs_module'] = "{$this->packageKey}_{$this->moduleName}";
             // finally update the relationship name
-            unset ( $definition [ 'name' ] ) ; // clear the oldstyle name
+            unset ($definition ['name']); // clear the oldstyle name
         }
-        return $definition ;
+        return $definition;
     }
 
     /*
@@ -171,30 +171,30 @@ 
      * The set of all relevant relationships for undeployed modules is the superset of that for deployed modules and all of the relationships known to ModuleBuilder
      * @return array Set of all relevant relationships
      */
-    protected function getAllRelationships ()
+    protected function getAllRelationships()
     {
         // start with the set of relationships known to this module plus those already deployed
-        $allRelationships = array_merge ( $this->relationships, parent::getDeployedRelationships () ) ;
+        $allRelationships = array_merge($this->relationships, parent::getDeployedRelationships());
         
         // add in the relationships known to ModuleBuilder
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $mb->getPackages () ;
-        foreach ( $mb->getPackageList () as $packageName )
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $mb->getPackages();
+        foreach ($mb->getPackageList() as $packageName)
         {
-            $package = $mb->packages [ $packageName ] ;
-            foreach ( $package->modules as $module )
+            $package = $mb->packages [$packageName];
+            foreach ($package->modules as $module)
             {
                 
-                foreach ( $module->relationships->getRelationshipList () as $relationshipName )
+                foreach ($module->relationships->getRelationshipList() as $relationshipName)
                 {
-                    $relationship = $module->relationships->get ( $relationshipName ) ;
-                    $allRelationships [ $relationship->getName () ] = $relationship->getDefinition () ;
+                    $relationship = $module->relationships->get($relationshipName);
+                    $allRelationships [$relationship->getName()] = $relationship->getDefinition();
                 }
             }
         }
         
-        return $allRelationships ;
+        return $allRelationships;
     
     }
 
@@ -204,15 +204,15 @@ 
      * This function is called from the view when constructing a new relationship
      * @param AbstractRelationship $relationship The relationship to be enforced
      */
-    public function enforceRelationshipOnly ($relationship)
+    public function enforceRelationshipOnly($relationship)
     {
         // if we already have a relationship between this lhs_module and this rhs_module then set RelationshipOnly flag
-        foreach ( $this->relationships as $rel )
+        foreach ($this->relationships as $rel)
         {
             if ($rel->lhs_module == $relationship->lhs_module && $rel->rhs_module == $relationship->rhs_module)
             {
-                $rel->setRelationship_only () ;
-                break ;
+                $rel->setRelationship_only();
+                break;
             }
         }
     }
@@ -225,7 +225,7 @@ 
      * Translate the set of relationship objects into files that the Module Loader can work with
      * @param $basepath string Pathname of the directory to contain the build
      */
-    function build ($basepath, $installDefPrefix, $relationships)
+    function build($basepath, $installDefPrefix, $relationships)
     {
         
         // first expand out any reference to Activities to its submodules
@@ -233,62 +233,62 @@ 
         // as the relationship name, that must be unique
         // the only special case is the subpanel for Activities, which is a composite, and is applied only once for all the submodules - this is handled in saveSubpanelDefinitions() for Undeployed modules
         
-        $relationships = array ( ) ;
-        $this->activitiesToAdd = false ;
-        foreach ( $this->relationships as $relationshipName => $relationship )
+        $relationships = array( );
+        $this->activitiesToAdd = false;
+        foreach ($this->relationships as $relationshipName => $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 ;
-                    $relationships [ $definition [ 'relationship_name' ] ] = RelationshipFactory::newRelationship ( $definition ) ;
+                    $definition ['rhs_module'] = $activitiesSubModuleName;
+                    $definition ['for_activities'] = true;
+                    $definition ['relationship_name'] = $relationshipName.'_'.$activitiesSubModuleLower;
+                    $relationships [$definition ['relationship_name']] = RelationshipFactory::newRelationship($definition);
                 }
             
             } else
             {
-                $relationships [ $definition [ 'relationship_name' ] ] = $relationship ;
+                $relationships [$definition ['relationship_name']] = $relationship;
             }
         }
         
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $module = $mb->getPackageModule ( $this->packageName, $this->moduleName ) ;
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $module = $mb->getPackageModule($this->packageName, $this->moduleName);
         if ($this->activitiesToAdd)
         {
-            $appStrings = $module->getAppListStrings () ;
-            foreach(getTypeDisplayList() as $typeDisplay)
+            $appStrings = $module->getAppListStrings();
+            foreach (getTypeDisplayList() as $typeDisplay)
             {
-                $appStrings[$typeDisplay][$module->key_name] = $module->getlabel ( 'en_us', 'LBL_MODULE_TITLE' ) ;
+                $appStrings[$typeDisplay][$module->key_name] = $module->getlabel('en_us', 'LBL_MODULE_TITLE');
             }
-            $module->setAppListStrings ( 'en_us', $appStrings ) ;
-            $module->save () ;
+            $module->setAppListStrings('en_us', $appStrings);
+            $module->save();
 
         }
         else
         {
             //Bug42170================================
-            $appStrings = $module->getAppListStrings () ;
-            foreach(getTypeDisplayList() as $typeDisplay)
+            $appStrings = $module->getAppListStrings();
+            foreach (getTypeDisplayList() as $typeDisplay)
             {
-                if(isset($appStrings[$typeDisplay][$module->key_name]))
+                if (isset($appStrings[$typeDisplay][$module->key_name]))
                 {
                     unset($appStrings[$typeDisplay][$module->key_name]);
                 }
             }
-            $module->setAppListStrings ( 'en_us', $appStrings ) ;
-            $module->save () ;
+            $module->setAppListStrings('en_us', $appStrings);
+            $module->save();
 			//Bug42170================================
 		}
         
         // use an installDefPrefix of <basepath>/SugarModules for compatibility with the rest of ModuleBuilder
-        $this->installDefs = parent::build ( $basepath, "<basepath>/SugarModules", $relationships ) ;
+        $this->installDefs = parent::build($basepath, "<basepath>/SugarModules", $relationships);
     }
 
     /*
@@ -296,28 +296,28 @@ 
      * Required by MBModule
      * @param reference installDef  Reference to the set of installDefs to which this relationship's installDefs should be added
      */
-    function addInstallDefs (&$installDef)
+    function addInstallDefs(&$installDef)
     {
-        foreach ( $this->installDefs as $name => $def )
+        foreach ($this->installDefs as $name => $def)
         {
-            if (! empty ( $def ))
+            if (!empty ($def))
             {
-                foreach ( $def as $val )
+                foreach ($def as $val)
                 {
-                    $installDef [ $name ] [] = $val ;
+                    $installDef [$name] [] = $val;
                 }
             }
         }
     }
 
-    private function addFieldsToUndeployedLayouts ($relationship)
+    private function addFieldsToUndeployedLayouts($relationship)
     {
-        return $this->updateUndeployedLayout ( $relationship, true ) ;
+        return $this->updateUndeployedLayout($relationship, true);
     }
 
-    private function removeFieldsFromUndeployedLayouts ($relationship)
+    private function removeFieldsFromUndeployedLayouts($relationship)
     {
-        return $this->updateUndeployedLayout ( $relationship, false ) ;
+        return $this->updateUndeployedLayout($relationship, false);
     }
 
     /**
@@ -326,18 +326,18 @@ 
      */
     private function removeAppLangStrings($relationship) {
         $def = $relationship->getDefinition();
-        if (strtolower ( $def [ 'rhs_module' ] ) == 'activities' && !empty($_REQUEST [ 'view_package' ]) && !empty($_REQUEST [ 'view_module' ] ))
+        if (strtolower($def ['rhs_module']) == 'activities' && !empty($_REQUEST ['view_package']) && !empty($_REQUEST ['view_module']))
         {
-            $mb = new ModuleBuilder ( ) ;
-            $module = $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
-            $appStrings = $module->getAppListStrings () ;
-            foreach(getTypeDisplayList() as $key)
+            $mb = new ModuleBuilder( );
+            $module = $mb->getPackageModule($_REQUEST ['view_package'], $_REQUEST ['view_module']);
+            $appStrings = $module->getAppListStrings();
+            foreach (getTypeDisplayList() as $key)
             {
-                if (isset($appStrings[$key][ $module->key_name ]))
-                    unset($appStrings[$key][ $module->key_name ]);
+                if (isset($appStrings[$key][$module->key_name]))
+                    unset($appStrings[$key][$module->key_name]);
             }
-            $module->setAppListStrings ( 'en_us', $appStrings ) ;
-            $module->save () ;
+            $module->setAppListStrings('en_us', $appStrings);
+            $module->save();
         }
     }
 
@@ -347,41 +347,41 @@ 
      * @param boolean $actionAdd True if we are to add; false if to remove
      * return null
      */
-    private function updateUndeployedLayout ($relationship , $actionAdd = true)
+    private function updateUndeployedLayout($relationship, $actionAdd = true)
     {
         
         // 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)
             {
-                $parsedName = AbstractRelationships::parseDeployedModuleName ( $deployedModuleName ) ;
-                if (isset ( $parsedName [ 'packageName' ] ))
+                $parsedName = AbstractRelationships::parseDeployedModuleName($deployedModuleName);
+                if (isset ($parsedName ['packageName']))
                 {
-                    $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": " . (($actionAdd) ? "adding" : "removing") . " $fieldName on $view layout for undeployed module {$parsedName [ 'moduleName' ]} in package {$parsedName [ 'packageName' ]}" ) ;
-                    $parser = new GridLayoutMetaDataParser ( $view, $parsedName [ 'moduleName' ], $parsedName [ 'packageName' ] ) ;
+                    $GLOBALS ['log']->debug(get_class($this).": ".(($actionAdd) ? "adding" : "removing")." $fieldName on $view layout for undeployed module {$parsedName ['moduleName']} in package {$parsedName ['packageName']}");
+                    $parser = new GridLayoutMetaDataParser($view, $parsedName ['moduleName'], $parsedName ['packageName']);
                     
-                    if (($actionAdd) ? $parser->addField ( array ( 'name' => $fieldName ) ) : $parser->removeField ( $fieldName ))
+                    if (($actionAdd) ? $parser->addField(array('name' => $fieldName)) : $parser->removeField($fieldName))
                     {
-                        $parser->handleSave ( false ) ;
+                        $parser->handleSave(false);
                     } 
                     else
                     {
-                        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": couldn't " . (($actionAdd) ? "add" : "remove") . " $fieldName on $view layout for undeployed module $deployedModuleName" ) ;
-                        $successful = false ;
+                        $GLOBALS ['log']->debug(get_class($this).": couldn't ".(($actionAdd) ? "add" : "remove")." $fieldName on $view layout for undeployed module $deployedModuleName");
+                        $successful = false;
                     }
                 }
             }
         }
         
-        return $successful ;
+        return $successful;
     }
 
     /*
@@ -392,29 +392,29 @@ 
      * @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');
         
         $fieldsToAdd = array();
-        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' ]->debug ( get_class ( $this ) . ": adding $fieldName to $view layout for module $deployedModuleName" ) ;
-                    $parsedName = self::parseDeployedModuleName ( $deployedModuleName ) ;
-                    if (! isset ( $parsedName [ 'packageName' ] ))
+                    $GLOBALS ['log']->debug(get_class($this).": adding $fieldName to $view layout for module $deployedModuleName");
+                    $parsedName = self::parseDeployedModuleName($deployedModuleName);
+                    if (!isset ($parsedName ['packageName']))
                     {
-                        $fieldsToAdd [$parsedName [ 'moduleName' ]] = $fieldName;
+                        $fieldsToAdd [$parsedName ['moduleName']] = $fieldName;
                     } 
                     //Bug 22348: We should add in the field for custom modules not in this package, if they have been deployed.
-                    else if ($parsedName [ 'packageName' ] != $this->packageName 
-                            && isset ( $GLOBALS [ 'beanList' ] [ $deployedModuleName ])){
+                    else if ($parsedName ['packageName'] != $this->packageName 
+                            && isset ($GLOBALS ['beanList'] [$deployedModuleName])) {
                         $fieldsToAdd [$deployedModuleName] = $fieldName;
                     }
                 }

Braces +10 added lines, -9 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -270,8 +271,7 @@ 
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
 
-        }
-        else
+        } else
         {
             //Bug42170================================
             $appStrings = $module->getAppListStrings () ;
@@ -333,8 +333,9 @@ 
             $appStrings = $module->getAppListStrings () ;
             foreach(getTypeDisplayList() as $key)
             {
-                if (isset($appStrings[$key][ $module->key_name ]))
-                    unset($appStrings[$key][ $module->key_name ]);
+                if (isset($appStrings[$key][ $module->key_name ])) {
+                                    unset($appStrings[$key][ $module->key_name ]);
+                }
             }
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
@@ -351,8 +352,9 @@ 
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...
-        if ($relationship->getType () == MB_MANYTOMANY)
-            return false ;
+        if ($relationship->getType () == MB_MANYTOMANY) {
+                    return false ;
+        }
         
         $successful = true ;
         $layoutAdditions = $relationship->buildFieldsToLayouts () ;
@@ -371,8 +373,7 @@ 
                     if (($actionAdd) ? $parser->addField ( array ( 'name' => $fieldName ) ) : $parser->removeField ( $fieldName ))
                     {
                         $parser->handleSave ( false ) ;
-                    } 
-                    else
+                    } else
                     {
                         $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": couldn't " . (($actionAdd) ? "add" : "remove") . " $fieldName on $view layout for undeployed module $deployedModuleName" ) ;
                         $successful = false ;

modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php

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...

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, $installDefPrefix, $relationships)
+    function build($basepath, $installDefPrefix, $relationships)
     {
-        $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;
     }
 
 }

Braces +11 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -243,8 +244,9 @@ 
         
         foreach ( $module->field_defs as $field )
         {
-            if ($field [ 'type' ] == 'relate' && isset ( $field [ 'module' ] ) && $field [ 'module' ] == $sourceModuleName)
-                return $field [ 'name' ] ;
+            if ($field [ 'type' ] == 'relate' && isset ( $field [ 'module' ] ) && $field [ 'module' ] == $sourceModuleName) {
+                            return $field [ 'name' ] ;
+            }
         }
         return null ;
     }
@@ -389,10 +391,11 @@ 
         
         foreach ( $layoutAdditions as $deployedModuleName => $fieldName )
         {
-            if (! in_array ( strtolower ( $deployedModuleName ), $invalidModules ))
-                foreach ( array ( MB_EDITVIEW , MB_DETAILVIEW ) as $view )
+            if (! in_array ( strtolower ( $deployedModuleName ), $invalidModules )) {
+                            foreach ( array ( MB_EDITVIEW , MB_DETAILVIEW ) as $view )
                 {
                     $GLOBALS [ 'log' ]->info ( get_class ( $this ) . ": adding $fieldName to $view layout for module $deployedModuleName" ) ;
+            }
                     $parser = new GridLayoutMetaDataParser ( $view, $deployedModuleName ) ;
                     $parser->addField ( array ( 'name' => $fieldName ) ) ;
                     $parser->handleSave ( false ) ;
@@ -411,8 +414,9 @@ 
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...
-        if ($relationship->getType () == MB_MANYTOMANY)
-            return false ;
+        if ($relationship->getType () == MB_MANYTOMANY) {
+                    return false ;
+        }
         
         $successful = true ;
         $layoutAdditions = $relationship->buildFieldsToLayouts () ;

modules/ModuleBuilder/parsers/relationships/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, '_'));