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

modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php

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

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

modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php

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

modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php

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

modules/ModuleBuilder/parsers/relationships/ActivitiesRelationship.php

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

modules/ModuleBuilder/parsers/constants.php

Spacing +24 added lines, -24 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,34 +39,34 @@ 
  ********************************************************************************/
 
 
-define('MB_BASEMETADATALOCATION','base');
-define('MB_CUSTOMMETADATALOCATION','custom');
-define('MB_WORKINGMETADATALOCATION','working');
-define('MB_HISTORYMETADATALOCATION','history');
-define('MB_GRIDLAYOUTMETADATA','gridLayoutMetaData');
-define('MB_LISTLAYOUTMETADATA','listLayoutMetaData');
-define('MB_LISTVIEW','listview');
-define('MB_SEARCHVIEW','searchview');
-define('MB_BASICSEARCH','basic_search' );
-define('MB_ADVANCEDSEARCH','advanced_search' );
-define('MB_DASHLET','dashlet');
-define('MB_DASHLETSEARCH','dashletsearch');
-define('MB_EDITVIEW','editview');
-define('MB_DETAILVIEW','detailview');
-define('MB_QUICKCREATE','quickcreate');
-define('MB_POPUPLIST','popuplist');
-define('MB_POPUPSEARCH','popupsearch');
-define('MB_LABEL','label');
+define('MB_BASEMETADATALOCATION', 'base');
+define('MB_CUSTOMMETADATALOCATION', 'custom');
+define('MB_WORKINGMETADATALOCATION', 'working');
+define('MB_HISTORYMETADATALOCATION', 'history');
+define('MB_GRIDLAYOUTMETADATA', 'gridLayoutMetaData');
+define('MB_LISTLAYOUTMETADATA', 'listLayoutMetaData');
+define('MB_LISTVIEW', 'listview');
+define('MB_SEARCHVIEW', 'searchview');
+define('MB_BASICSEARCH', 'basic_search');
+define('MB_ADVANCEDSEARCH', 'advanced_search');
+define('MB_DASHLET', 'dashlet');
+define('MB_DASHLETSEARCH', 'dashletsearch');
+define('MB_EDITVIEW', 'editview');
+define('MB_DETAILVIEW', 'detailview');
+define('MB_QUICKCREATE', 'quickcreate');
+define('MB_POPUPLIST', 'popuplist');
+define('MB_POPUPSEARCH', 'popupsearch');
+define('MB_LABEL', 'label');
 define('MB_ONETOONE', 'one-to-one');
 define('MB_ONETOMANY', 'one-to-many');
 define('MB_MANYTOONE', 'many-to-one');
 define('MB_MANYTOMANY', 'many-to-many');
-define('MB_MAXDBIDENTIFIERLENGTH',30); // maximum length of any identifier in our supported databases
-define('MB_EXPORTPREPEND','project_');
-define('MB_VISIBILITY','visibility');
+define('MB_MAXDBIDENTIFIERLENGTH', 30); // maximum length of any identifier in our supported databases
+define('MB_EXPORTPREPEND', 'project_');
+define('MB_VISIBILITY', 'visibility');
 
 class MBConstants
 {
-	static $EMPTY = array ( 'name' => '(empty)' , 'label' => '(empty)' ) ;
-	static $FILLER = array ( 'name' => '(filler)' , 'label' => 'LBL_FILLER' ) ; // would prefer to have label => translate('LBL_FILLER') but can't be done in a static, and don't want to require instantiating a new object to get these constants
+	static $EMPTY = array('name' => '(empty)', 'label' => '(empty)');
+	static $FILLER = array('name' => '(filler)', 'label' => 'LBL_FILLER'); // would prefer to have label => translate('LBL_FILLER') but can't be done in a static, and don't want to require instantiating a new object to get these constants
 }

modules/ModuleBuilder/parsers/parser.dropdown.php

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -49,10 +49,10 @@ 
      *
      * @param REQUEST params  $params
      */
-    function saveDropDown($params){
+    function saveDropDown($params) {
         require_once('modules/Administration/Common.php');
 		$emptyMarker = translate('LBL_BLANK');
-		$selected_lang = (!empty($params['dropdown_lang'])?$params['dropdown_lang']:$_SESSION['authenticated_user_language']);
+		$selected_lang = (!empty($params['dropdown_lang']) ? $params['dropdown_lang'] : $_SESSION['authenticated_user_language']);
 		$type = $_REQUEST['view_package'];
 		$dir = '';
 		$dropdown_name = $params['dropdown_name'];
@@ -60,63 +60,63 @@ 
 
 		$list_value = str_replace('&quot;&quot;:&quot;&quot;', '&quot;__empty__&quot;:&quot;&quot;', $params['list_value']);
 		//Bug 21362 ENT_QUOTES- convert single quotes to escaped single quotes.
-		$temp = $json->decode(html_entity_decode(rawurldecode($list_value), ENT_QUOTES) );
-		$dropdown = array () ;
+		$temp = $json->decode(html_entity_decode(rawurldecode($list_value), ENT_QUOTES));
+		$dropdown = array();
 		// dropdown is received as an array of (name,value) pairs - now extract to name=>value format preserving order
 		// we rely here on PHP to preserve the order of the received name=>value pairs - associative arrays in PHP are ordered
-        if(is_array($temp))
+        if (is_array($temp))
         {
-            foreach ( $temp as $item )
+            foreach ($temp as $item)
             {
-                $dropdown[ SugarCleaner::stripTags(from_html($item [ 0 ]), false) ] = SugarCleaner::stripTags(from_html($item [ 1 ]), false) ;
+                $dropdown[SugarCleaner::stripTags(from_html($item [0]), false)] = SugarCleaner::stripTags(from_html($item [1]), false);
             }
         }
-		if(array_key_exists($emptyMarker, $dropdown)){
-            $output=array();
-            foreach($dropdown as $key => $value){
-                if($emptyMarker===$key)
-                    $output['']='';
+		if (array_key_exists($emptyMarker, $dropdown)) {
+            $output = array();
+            foreach ($dropdown as $key => $value) {
+                if ($emptyMarker === $key)
+                    $output[''] = '';
                 else
-                    $output[$key]=$value;
+                    $output[$key] = $value;
 		}
-            $dropdown=$output;
+            $dropdown = $output;
 		}
 
-		if($type != 'studio'){
+		if ($type != 'studio') {
 			$mb = new ModuleBuilder();
 			$module = $mb->getPackageModule($params['view_package'], $params['view_module']);
 			$this->synchMBDropDown($dropdown_name, $dropdown, $selected_lang, $module);
 			//Can't use synch on selected lang as we want to overwrite values, not just keys
 			$module->mblanguage->appListStrings[$selected_lang.'.lang.php'][$dropdown_name] = $dropdown;
 			$module->mblanguage->save($module->key_name); // tyoung - key is required parameter as of
-		}else{
+		} else {
 			$contents = return_custom_app_list_strings_file_contents($selected_lang);
 			$my_list_strings = return_app_list_strings_language($selected_lang);
-			if($selected_lang == $GLOBALS['current_language']){
+			if ($selected_lang == $GLOBALS['current_language']) {
 	           $GLOBALS['app_list_strings'][$dropdown_name] = $dropdown;
 	        }
 			//write to contents
 			$contents = str_replace("?>", '', $contents);
-			if(empty($contents))$contents = "<?php";
+			if (empty($contents))$contents = "<?php";
 	        //add new drop down to the bottom
-	        if(!empty($params['use_push'])){
+	        if (!empty($params['use_push'])) {
 	        	//this is for handling moduleList and such where nothing should be deleted or anything but they can be renamed
-	        	foreach($dropdown as $key=>$value){
+	        	foreach ($dropdown as $key=>$value) {
 	        		//only if the value has changed or does not exist do we want to add it this way
-	        		if(!isset($my_list_strings[$dropdown_name][$key]) || strcmp($my_list_strings[$dropdown_name][$key], $value) != 0 ){
+	        		if (!isset($my_list_strings[$dropdown_name][$key]) || strcmp($my_list_strings[$dropdown_name][$key], $value) != 0) {
 		        		//clear out the old value
 		        		$pattern_match = '/\s*\$app_list_strings\s*\[\s*\''.$dropdown_name.'\'\s*\]\[\s*\''.$key.'\'\s*\]\s*=\s*[\'\"]{1}.*?[\'\"]{1};\s*/ism';
 		        		$contents = preg_replace($pattern_match, "\n", $contents);
 		        		//add the new ones
-		        		$contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']['$key']=" . var_export_helper($value) . ";";
+		        		$contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']['$key']=".var_export_helper($value).";";
 	        		}
 	        	}
-	        }else{
+	        } else {
 	        	//Now synch up the keys in other langauges to ensure that removed/added Drop down values work properly under all langs.
 	        	$this->synchDropDown($dropdown_name, $dropdown, $selected_lang, $dir);
 	        	$contents = $this->getNewCustomContents($dropdown_name, $dropdown, $selected_lang);
 	        }
-		    if(!empty($dir) && !is_dir($dir))
+		    if (!empty($dir) && !is_dir($dir))
 		    {
 		     	$continue = mkdir_recursive($dir);
 		    }
@@ -136,7 +136,7 @@ 
 	 * @param $saveLov String the path to the directory to save the new lang file in.
 	 */
     function synchDropDown($dropdown_name, $dropdown, $selected_lang, $saveLoc) {
-   		$allLanguages =  get_languages();
+   		$allLanguages = get_languages();
         foreach ($allLanguages as $lang => $langName) {
         	if ($lang != $selected_lang) {
         		$listStrings = return_app_list_strings_language($lang);
@@ -165,8 +165,8 @@ 
 	 * @param $module MBModule the module to update the languages in
 	 */
     function synchMBDropDown($dropdown_name, $dropdown, $selected_lang, $module) {
-    	$selected_lang	= $selected_lang . '.lang.php';
-		foreach($module->mblanguage->appListStrings as $lang => $listStrings) {
+    	$selected_lang = $selected_lang.'.lang.php';
+		foreach ($module->mblanguage->appListStrings as $lang => $listStrings) {
 			if ($lang != $selected_lang)
 			{
 				$langDropDown = array();
@@ -185,13 +185,13 @@ 
 
     private function synchDDKeys($dom, $sub) {
     	//check for extra keys
-        foreach($sub as $key=>$value) {
+        foreach ($sub as $key=>$value) {
         	if (!isset($dom[$key])) {
         		unset ($sub[$key]);
         	}
         }
         //check for missing keys
-        foreach($dom as $key=>$value) {
+        foreach ($dom as $key=>$value) {
         	if (!isset($sub[$key])) {
         		$sub[$key] = $value;
         	}
@@ -207,9 +207,9 @@ 
     function getNewCustomContents($dropdown_name, $dropdown, $lang) {
     	$contents = return_custom_app_list_strings_file_contents($lang);
         $contents = str_replace("?>", '', $contents);
-		if(empty($contents))$contents = "<?php";
+		if (empty($contents))$contents = "<?php";
     	$contents = preg_replace($this->getPatternMatch($dropdown_name), "\n", $contents);
-	    $contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']=" . var_export_helper($dropdown) . ";";
+	    $contents .= "\n\$GLOBALS['app_list_strings']['$dropdown_name']=".var_export_helper($dropdown).";";
 	    return $contents;
     }
 }

modules/ModuleBuilder/parsers/parser.modifysubpanel.php

Spacing +93 added lines, -93 removed lines

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