adamjakab / SuiteCRM

modules/ModuleBuilder/parsers/relationships/ActivitiesRelationship.php

Indentation +16 added lines, -16 removed lines

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

Spacing +112 added lines, -112 removed lines

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

Braces +9 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -173,16 +175,18 @@ 
      */
     function buildFieldsToLayouts ()
     {
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
 
         return array( $this->rhs_module => $this->relationship_name . "_name" ) ; // this must match the name of the relate field from buildVardefs
     }
 
  	function buildSubpanelDefinitions ()
     {
-        if ($this->relationship_only || isset(ActivitiesRelationship::$subpanelsAdded[$this->lhs_module]))
-            return array () ;
+        if ($this->relationship_only || isset(ActivitiesRelationship::$subpanelsAdded[$this->lhs_module])) {
+                    return array () ;
+        }
 
         ActivitiesRelationship::$subpanelsAdded[$this->lhs_module] = true;
         $relationshipName = substr($this->relationship_name, 0, strrpos($this->relationship_name, '_'));

Doc Comments +7 added lines

@@ -219,6 +219,9 @@ 
      * Shortcut to construct an Activities collection subpanel
      * @param AbstractRelationship $relationship    Source relationship to Activities module
      */
+    /**
+     * @param string $relationshipName
+     */
     protected function buildActivitiesSubpanelDefinition ( $relationshipName )
     {
 		return array (
@@ -253,6 +256,10 @@ 
      * Shortcut to construct a History collection subpanel
      * @param AbstractRelationship $relationship    Source relationship to Activities module
      */
+
+    /**
+     * @param string $relationshipName
+     */
     protected function buildHistorySubpanelDefinition ( $relationshipName )
     {
         return array (

modules/ModuleBuilder/parsers/constants.php

Indentation +2 added lines, -2 removed lines

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

Spacing +24 added lines, -24 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/ModuleBuilder/parsers/parser.label.php

Indentation +36 added lines, -36 removed lines

@@ -93,7 +93,7 @@ 
             $deployedModule = true ;
             $basepath = "custom/modules/$moduleName/language" ;
             if($forRelationshipLabel){
-            	$basepath = "custom/modules/$moduleName/Ext/Language" ;
+                $basepath = "custom/modules/$moduleName/Ext/Language" ;
             }
             if (! is_dir ( $basepath ))
             {
@@ -104,8 +104,8 @@ 
 
         $filename = "$basepath/$language.lang.php" ;
         if($forRelationshipLabel){
-        	$filename = "$basepath/$language.lang.ext.php" ;
-     	}
+            $filename = "$basepath/$language.lang.ext.php" ;
+            }
 
         $dir_exists = is_dir ( $basepath ) ;
 
@@ -170,7 +170,7 @@ 
             $deployedModule = true ;
             $basepath = "custom/modules/$moduleName/language" ;
             if($forRelationshipLabel){
-            	$basepath = "custom/modules/$moduleName/Ext/Language" ;
+                $basepath = "custom/modules/$moduleName/Ext/Language" ;
             }
             if (! is_dir ( $basepath ))
             {
@@ -180,8 +180,8 @@ 
 
         $filename = "$basepath/$language.lang.php" ;
         if($forRelationshipLabel){
-        	$filename = "$basepath/$language.lang.ext.php" ;
-     	}
+            $filename = "$basepath/$language.lang.ext.php" ;
+            }
         $dir_exists = is_dir ( $basepath ) ;
 
         $mod_strings = array ( ) ;
@@ -193,47 +193,47 @@ 
                 // obtain $mod_strings
                 include ($filename) ;
             }else if($forRelationshipLabel){
-            	$fh = fopen ($filename, 'a');
-            	fclose($fh);
+                $fh = fopen ($filename, 'a');
+                fclose($fh);
             }
         } else
         {
             return false ;
         }
 
-        	$changed = false ;
+            $changed = false ;
 
         //$charset = (isset($app_strings['LBL_CHARSET'])) ? $app_strings['LBL_CHARSET'] : $GLOBALS['sugar_config']['default_charset'] ;
 
-	        foreach ( $labels as $key => $value )
-	        {
+            foreach ( $labels as $key => $value )
+            {
             if (! isset ( $mod_strings [ $key ] ) || strcmp ( $value, $mod_strings [ $key ] ) != 0)
-	            {
+                {
                     $mod_strings [$key] = to_html(strip_tags(from_html($value))); // must match encoding used in view.labels.php
-	                $changed = true ;
-	            }
-	        }
+                    $changed = true ;
+                }
+            }
 
-	        if ($changed)
-	        {
+            if ($changed)
+            {
             $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels: writing new mod_strings to $filename" ) ;
-	            $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels: mod_strings=".print_r($mod_strings,true) ) ;
+                $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels: mod_strings=".print_r($mod_strings,true) ) ;
             if (! write_array_to_file ( "mod_strings", $mod_strings, $filename ))
-	            {
+                {
                 $GLOBALS [ 'log' ]->fatal ( "Could not write $filename" ) ;
-	            } else
-	            {
-	                // if we have a cache to worry about, then clear it now
+                } else
+                {
+                    // if we have a cache to worry about, then clear it now
                 if ($deployedModule)
-	                {
+                    {
                             SugarCache::cleanOpcodes();
-	                    $GLOBALS [ 'log' ]->debug ( "PaserLabel->addLabels: clearing language cache" ) ;
-	                    $cache_key = "module_language." . $language . $moduleName ;
-	                    sugar_cache_clear ( $cache_key ) ;
-	                    LanguageManager::clearLanguageCache ( $moduleName, $language ) ;
-	                }
-	            }
-	        }
+                        $GLOBALS [ 'log' ]->debug ( "PaserLabel->addLabels: clearing language cache" ) ;
+                        $cache_key = "module_language." . $language . $moduleName ;
+                        sugar_cache_clear ( $cache_key ) ;
+                        LanguageManager::clearLanguageCache ( $moduleName, $language ) ;
+                    }
+                }
+            }
 
         // Fix for bug #51
         // when the label is recreated it defaults back to the original value (In this case its "User").
@@ -356,18 +356,18 @@ 
         {
         foreach ( $metadata as $definition )
             {
-        	$labels = array();
-        	$labels[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-        	self::addLabels ( $language, $labels, $definition [ 'module' ],null,true );
+            $labels = array();
+            $labels[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
+            self::addLabels ( $language, $labels, $definition [ 'module' ],null,true );
             }
         }
 
     function addLabelsToAllLanguages($labels)
             {
-    	$langs = get_languages();
-    	foreach($langs as $lang_key => $lang_display)
+        $langs = get_languages();
+        foreach($langs as $lang_key => $lang_display)
         {
-    		$this->addLabels($lang_key, $labels, $this->moduleName);
+            $this->addLabels($lang_key, $labels, $this->moduleName);
         }
     }
 }

Braces +15 added lines, -9 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,8 +49,9 @@ 
     function ParserLabel ($moduleName, $packageName = '' )
     {
         $this->moduleName = $moduleName;
-        if (!empty($packageName))
-            $this->packageName = $packageName ;
+        if (!empty($packageName)) {
+                    $this->packageName = $packageName ;
+        }
     }
 
     /**
@@ -68,9 +70,11 @@ 
                 $labels [ strtoupper(substr ( $key, 6 )) ] = SugarCleaner::cleanHtml(from_html($value),false);
             }
         }
-        if (!empty($this->packageName)) //we are in Module builder
+        if (!empty($this->packageName)) {
+            //we are in Module builder
         {
             return self::addLabels ( $language, $labels, $this->moduleName, "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/language" ) ;
+        }
         } else
         {
             return self::addLabels ( $language, $labels, $this->moduleName ) ;
@@ -192,7 +196,7 @@ 
             {
                 // obtain $mod_strings
                 include ($filename) ;
-            }else if($forRelationshipLabel){
+            } else if($forRelationshipLabel){
             	$fh = fopen ($filename, 'a');
             	fclose($fh);
             }
@@ -271,8 +275,9 @@ 
                     }
                 }
 
-                foreach ($mod_strings as $key => $val)
-                    $out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+                foreach ($mod_strings as $key => $val) {
+                                    $out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+                }
 
                 $failed_to_write = false;
                 try {
@@ -314,8 +319,9 @@ 
                     }
                 }
 
-                foreach ($mod_strings as $key => $val)
-                    $out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+                foreach ($mod_strings as $key => $val) {
+                                    $out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+                }
 
                 $failed_to_write = false;
                 try {

Spacing +84 added lines, -84 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
-    die ( 'Not A Valid Entry Point' ) ;
+if (!defined('sugarEntry') || !sugarEntry)
+    die ('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,16 +40,16 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php') ;
+require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
 
 class ParserLabel //extends ModuleBuilderParser
 {
 
-    public function __construct ($moduleName, $packageName = '' )
+    public function __construct($moduleName, $packageName = '')
     {
         $this->moduleName = $moduleName;
         if (!empty($packageName))
-            $this->packageName = $packageName ;
+            $this->packageName = $packageName;
     }
 
     /**
@@ -58,22 +58,22 @@ 
      * @param REQUEST $params       Labels as "label_".System label => Display label pairs
      * @param string $language      Language key, for example 'en_us'
      */
-    function handleSave ($params , $language)
+    function handleSave($params, $language)
     {
-        $labels = array ( ) ;
-        foreach ( $params as $key => $value )
+        $labels = array( );
+        foreach ($params as $key => $value)
         {
-            if (preg_match ( '/^label_/', $key ) && strcmp ( $value, 'no_change' ) != 0)
+            if (preg_match('/^label_/', $key) && strcmp($value, 'no_change') != 0)
             {
-                $labels [ strtoupper(substr ( $key, 6 )) ] = SugarCleaner::cleanHtml(from_html($value),false);
+                $labels [strtoupper(substr($key, 6))] = SugarCleaner::cleanHtml(from_html($value), false);
             }
         }
         if (!empty($this->packageName)) //we are in Module builder
         {
-            return self::addLabels ( $language, $labels, $this->moduleName, "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/language" ) ;
+            return self::addLabels($language, $labels, $this->moduleName, "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/language");
         } else
         {
-            return self::addLabels ( $language, $labels, $this->moduleName ) ;
+            return self::addLabels($language, $labels, $this->moduleName);
         }
     }
 
@@ -87,68 +87,68 @@ 
      * @param string $forRelationshipLabel      whether this is a relationship label
      */
     static function removeLabel($language, $label, $labelvalue, $moduleName, $basepath = null, $forRelationshipLabel = false) {
-        $GLOBALS [ 'log' ]->debug ( "ParserLabel->removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );" ) ;
-        if (is_null ( $basepath ))
+        $GLOBALS ['log']->debug("ParserLabel->removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );");
+        if (is_null($basepath))
         {
-            $deployedModule = true ;
-            $basepath = "custom/modules/$moduleName/language" ;
-            if($forRelationshipLabel){
-            	$basepath = "custom/modules/$moduleName/Ext/Language" ;
+            $deployedModule = true;
+            $basepath = "custom/modules/$moduleName/language";
+            if ($forRelationshipLabel) {
+            	$basepath = "custom/modules/$moduleName/Ext/Language";
             }
-            if (! is_dir ( $basepath ))
+            if (!is_dir($basepath))
             {
                 $GLOBALS ['log']->debug("$basepath is not a directory.");
                 return false;
             }
         }
 
-        $filename = "$basepath/$language.lang.php" ;
-        if($forRelationshipLabel){
-        	$filename = "$basepath/$language.lang.ext.php" ;
+        $filename = "$basepath/$language.lang.php";
+        if ($forRelationshipLabel) {
+        	$filename = "$basepath/$language.lang.ext.php";
      	}
 
-        $dir_exists = is_dir ( $basepath ) ;
+        $dir_exists = is_dir($basepath);
 
-        $mod_strings = array ( ) ;
+        $mod_strings = array( );
 
         if ($dir_exists)
         {
-            if (file_exists ($filename))
+            if (file_exists($filename))
             {
                 // obtain $mod_strings
-                include ($filename) ;
+                include ($filename);
             } else {
                 $GLOBALS ['log']->debug("file $filename does not exist.");
                 return false;
             }
         } else {
             $GLOBALS ['log']->debug("directory $basepath does not exist.");
-            return false ;
+            return false;
         }
 
-        $changed = false ;
+        $changed = false;
 
-        if (isset($mod_strings[$label]) && $mod_strings[$label]==$labelvalue) {
+        if (isset($mod_strings[$label]) && $mod_strings[$label] == $labelvalue) {
             unset($mod_strings[$label]);
             $changed = true;
         }
 
         if ($changed)
         {
-            if (! write_array_to_file ( "mod_strings", $mod_strings, $filename )) {
-                $GLOBALS [ 'log' ]->fatal ( "Could not write $filename" ) ;
+            if (!write_array_to_file("mod_strings", $mod_strings, $filename)) {
+                $GLOBALS ['log']->fatal("Could not write $filename");
             } else {
                 // if we have a cache to worry about, then clear it now
                 if ($deployedModule) {
-                    $GLOBALS ['log']->debug ( "PaserLabel->addLabels: clearing language cache" ) ;
-                    $cache_key = "module_language." . $language . $moduleName ;
-                    sugar_cache_clear ( $cache_key ) ;
-                    LanguageManager::clearLanguageCache ( $moduleName, $language ) ;
+                    $GLOBALS ['log']->debug("PaserLabel->addLabels: clearing language cache");
+                    $cache_key = "module_language.".$language.$moduleName;
+                    sugar_cache_clear($cache_key);
+                    LanguageManager::clearLanguageCache($moduleName, $language);
                 }
             }
         }
 
-        return true ;
+        return true;
     }
 
     /*
@@ -158,79 +158,79 @@ 
      * @param string $moduleName    Name of the module to which to add these labels
      * @param string $packageName   If module is undeployed, name of the package to which it belongs
      */
-    static function addLabels ($language , $labels , $moduleName , $basepath = null, $forRelationshipLabel = false)
+    static function addLabels($language, $labels, $moduleName, $basepath = null, $forRelationshipLabel = false)
     {
 
-        $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels($language, \$labels, $moduleName, $basepath );" ) ;
-        $GLOBALS [ 'log' ]->debug ( "\$labels:" . print_r ( $labels, true ) ) ;
+        $GLOBALS ['log']->debug("ParserLabel->addLabels($language, \$labels, $moduleName, $basepath );");
+        $GLOBALS ['log']->debug("\$labels:".print_r($labels, true));
 
-        $deployedModule = false ;
-        if (is_null ( $basepath ))
+        $deployedModule = false;
+        if (is_null($basepath))
         {
-            $deployedModule = true ;
-            $basepath = "custom/modules/$moduleName/language" ;
-            if($forRelationshipLabel){
-            	$basepath = "custom/modules/$moduleName/Ext/Language" ;
+            $deployedModule = true;
+            $basepath = "custom/modules/$moduleName/language";
+            if ($forRelationshipLabel) {
+            	$basepath = "custom/modules/$moduleName/Ext/Language";
             }
-            if (! is_dir ( $basepath ))
+            if (!is_dir($basepath))
             {
                 mkdir_recursive($basepath);
             }
         }
 
-        $filename = "$basepath/$language.lang.php" ;
-        if($forRelationshipLabel){
-        	$filename = "$basepath/$language.lang.ext.php" ;
+        $filename = "$basepath/$language.lang.php";
+        if ($forRelationshipLabel) {
+        	$filename = "$basepath/$language.lang.ext.php";
      	}
-        $dir_exists = is_dir ( $basepath ) ;
+        $dir_exists = is_dir($basepath);
 
-        $mod_strings = array ( ) ;
+        $mod_strings = array( );
 
         if ($dir_exists)
         {
-            if (file_exists ( $filename ))
+            if (file_exists($filename))
             {
                 // obtain $mod_strings
-                include ($filename) ;
-            }else if($forRelationshipLabel){
-            	$fh = fopen ($filename, 'a');
+                include ($filename);
+            } else if ($forRelationshipLabel) {
+            	$fh = fopen($filename, 'a');
             	fclose($fh);
             }
         } else
         {
-            return false ;
+            return false;
         }
 
-        	$changed = false ;
+        	$changed = false;
 
         //$charset = (isset($app_strings['LBL_CHARSET'])) ? $app_strings['LBL_CHARSET'] : $GLOBALS['sugar_config']['default_charset'] ;
 
-	        foreach ( $labels as $key => $value )
+	        foreach ($labels as $key => $value)
 	        {
-            if (! isset ( $mod_strings [ $key ] ) || strcmp ( $value, $mod_strings [ $key ] ) != 0)
+            if (!isset ($mod_strings [$key]) || strcmp($value, $mod_strings [$key]) != 0)
 	            {
                     $mod_strings [$key] = to_html(strip_tags(from_html($value))); // must match encoding used in view.labels.php
-	                $changed = true ;
+	                $changed = true;
 	            }
 	        }
 
 	        if ($changed)
 	        {
-            $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels: writing new mod_strings to $filename" ) ;
-	            $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels: mod_strings=".print_r($mod_strings,true) ) ;
-            if (! write_array_to_file ( "mod_strings", $mod_strings, $filename ))
+            $GLOBALS ['log']->debug("ParserLabel->addLabels: writing new mod_strings to $filename");
+	            $GLOBALS ['log']->debug("ParserLabel->addLabels: mod_strings=".print_r($mod_strings, true));
+            if (!write_array_to_file("mod_strings", $mod_strings, $filename))
 	            {
-                $GLOBALS [ 'log' ]->fatal ( "Could not write $filename" ) ;
+                $GLOBALS ['log']->fatal("Could not write $filename");
 	            } else
 	            {
 	                // if we have a cache to worry about, then clear it now
                 if ($deployedModule)
 	                {
                             SugarCache::cleanOpcodes();
-	                    $GLOBALS [ 'log' ]->debug ( "PaserLabel->addLabels: clearing language cache" ) ;
-	                    $cache_key = "module_language." . $language . $moduleName ;
-	                    sugar_cache_clear ( $cache_key ) ;
-	                    LanguageManager::clearLanguageCache ( $moduleName, $language ) ;
+	                    $GLOBALS ['log']->debug("PaserLabel->addLabels: clearing language cache");
+	                    $cache_key = "module_language.".$language.$moduleName;
+	                    sugar_cache_clear($cache_key);
+	                    LanguageManager::clearLanguageCache($moduleName, $language);
 	                }
 	            }
 	        }
@@ -244,16 +244,16 @@ 
         // The changes from custom/Extension/modules/{ModuleName}/Ext/Language
         // will overwrite stuff in custom/modules/{ModuleName}/Ext/Language/en_us.lang.ext.php after
         //  Quick Repair and Rebuild is applied.
-        if($forRelationshipLabel) {
-            if(!empty($_POST[view_module]) && !empty($_POST[relationship_name]) && !empty($_POST[rhs_label]) && !empty($_POST[lhs_module])) {
+        if ($forRelationshipLabel) {
+            if (!empty($_POST[view_module]) && !empty($_POST[relationship_name]) && !empty($_POST[rhs_label]) && !empty($_POST[lhs_module])) {
                 // 1. Overwrite custom/Extension/modules/{ModuleName}/Ext/Language
-                $extension_basepath = "custom/Extension/modules/" . $_POST[view_module] . "/Ext/Language";
+                $extension_basepath = "custom/Extension/modules/".$_POST[view_module]."/Ext/Language";
                 mkdir_recursive($extension_basepath);
 
                 $headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
                 $out = $headerString;
 
-                $extension_filename = "$extension_basepath/$language.custom" . $_POST[relationship_name] . ".php";
+                $extension_filename = "$extension_basepath/$language.custom".$_POST[relationship_name].".php";
 
                 $mod_strings = array();
                 if (file_exists($extension_filename)) {
@@ -279,9 +279,9 @@ 
                     $file_contents = fopen($extension_filename, 'w');
                     fputs($file_contents, $out, strlen($out));
                     fclose($file_contents);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $GLOBALS ['log']->fatal("Could not write $filename");
-                    $GLOBALS ['log']->fatal("Exception " . $e->getMessage());
+                    $GLOBALS ['log']->fatal("Exception ".$e->getMessage());
                     $failed_to_write = true;
                 }
 
@@ -295,7 +295,7 @@ 
                 $headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
                 $out = $headerString;
 
-                $relationships_filename = "$relationships_basepath/" . $_POST[lhs_module] . ".php";
+                $relationships_filename = "$relationships_basepath/".$_POST[lhs_module].".php";
 
 
                 $mod_strings = array();
@@ -322,9 +322,9 @@ 
                     $file_contents = fopen($relationships_filename, 'w');
                     fputs($file_contents, $out, strlen($out));
                     fclose($file_contents);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $GLOBALS ['log']->fatal("Could not write $filename");
-                    $GLOBALS ['log']->fatal("Exception " . $e->getMessage());
+                    $GLOBALS ['log']->fatal("Exception ".$e->getMessage());
                     $failed_to_write = true;
                 }
 
@@ -334,7 +334,7 @@ 
                         if ($deployedModule) {
                             SugarCache::cleanOpcodes();
                             $GLOBALS ['log']->debug("PaserLabel->addLabels: clearing language cache");
-                            $cache_key = "module_language." . $language . $moduleName;
+                            $cache_key = "module_language.".$language.$moduleName;
                             sugar_cache_clear($cache_key);
                             LanguageManager::clearLanguageCache($moduleName, $language);
                         }
@@ -343,7 +343,7 @@ 
             }
         }
 
-        return true ;
+        return true;
     }
 
     /**
@@ -352,20 +352,20 @@ 
      * @param $metadata
      * @param string $language      Language key, for example 'en_us'
      */
-    function handleSaveRelationshipLabels ($metadata , $language)
+    function handleSaveRelationshipLabels($metadata, $language)
         {
-        foreach ( $metadata as $definition )
+        foreach ($metadata as $definition)
             {
         	$labels = array();
-        	$labels[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-        	self::addLabels ( $language, $labels, $definition [ 'module' ],null,true );
+        	$labels[$definition ['system_label']] = $definition ['display_label'];
+        	self::addLabels($language, $labels, $definition ['module'], null, true);
             }
         }
 
     function addLabelsToAllLanguages($labels)
             {
     	$langs = get_languages();
-    	foreach($langs as $lang_key => $lang_display)
+    	foreach ($langs as $lang_key => $lang_display)
         {
     		$this->addLabels($lang_key, $labels, $this->moduleName);
         }

modules/ModuleBuilder/parsers/parser.dropdown.php

Indentation +119 added lines, -119 removed lines

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

Spacing +32 added lines, -32 removed lines

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

Braces +16 added lines, -9 removed lines

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

Doc Comments +1 added lines

@@ -134,6 +134,7 @@
 	 * @param $dropdown array The dropdown currently being saved
 	 * @param $selected_lang String the language currently selected in Studio/MB
 	 * @param $saveLov String the path to the directory to save the new lang file in.
+	 * @param string $saveLoc
 	 */
     function synchDropDown($dropdown_name, $dropdown, $selected_lang, $saveLoc) {
    		$allLanguages =  get_languages();

modules/ModuleBuilder/parsers/parser.modifysubpanel.php

Spacing +93 added lines, -93 removed lines

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

Braces +11 added lines, -6 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -114,10 +115,12 @@ 
         $this->defaults = array ( ) ;
         foreach ( $this->listViewDefs as $key => $def )
         {
-            if (! empty ( $def [ 'usage' ] ) && strcmp ( $def [ 'usage' ], 'query_only' ) == 0)
-                continue ;
-            if (! empty ( $def [ 'vname' ] ))
-                $def [ 'label' ] = $def [ 'vname' ] ;
+            if (! empty ( $def [ 'usage' ] ) && strcmp ( $def [ 'usage' ], 'query_only' ) == 0) {
+                            continue ;
+            }
+            if (! empty ( $def [ 'vname' ] )) {
+                            $def [ 'label' ] = $def [ 'vname' ] ;
+            }
             $this->defaults [ $key ] = $def ;
         }
         return $this->defaults ;
@@ -144,11 +147,13 @@ 
             foreach ( $this->subPanelParentModule->field_defs as $key => $fieldDefinition )
             {
                 $fieldName = strtolower ( $key ) ;
-                if (! isset ( $lowerFieldList [ $fieldName ] )) // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
+                if (! isset ( $lowerFieldList [ $fieldName ] )) {
+                    // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
                 {
                     if ((empty ( $fieldDefinition [ 'source' ] ) || $fieldDefinition [ 'source' ] == 'db' || $fieldDefinition [ 'source' ] == 'custom_fields') && $fieldDefinition [ 'type' ] != 'id' && strcmp ( $fieldName, 'deleted' ) != 0 || (isset ( $def [ 'name' ] ) && strpos ( $def [ 'name' ], "_name" ) != false) || ! empty ( $def [ 'custom_type' ] ) && (empty ( $fieldDefinition [ 'dbType' ] ) || $fieldDefinition [ 'dbType' ] != 'id') && (empty ( $fieldDefinition [ 'dbtype' ] ) || $fieldDefinition [ 'dbtype' ] != 'id') || (! empty ( $fieldDefinition [ 'studio' ] ) && $fieldDefinition [ 'studio' ] == 'visible'))
                     {
                         $label = (isset ( $fieldDefinition [ 'vname' ] )) ? $fieldDefinition [ 'vname' ] : (isset ( $fieldDefinition [ 'label' ] ) ? $fieldDefinition [ 'label' ] : $fieldDefinition [ 'name' ]) ;
+                }
                         $this->availableFields [ $fieldName ] = array ( 'width' => '10' , 'label' => $label ) ;
                     }
                 }

modules/ModuleBuilder/parsers/parser.modifylayoutview.php

Indentation +3 added lines, -3 removed lines

@@ -169,12 +169,12 @@
         include_once('include/TemplateHandler/TemplateHandler.php');
         if (strtolower($this->_view) == 'quickcreate')
         {
-        	TemplateHandler::clearCache($this->_module,"form_SubPanelQuickCreate_{$this->_module}.tpl");
-        	TemplateHandler::clearCache($this->_module,"form_DCQuickCreate_{$this->_module}.tpl");
+            TemplateHandler::clearCache($this->_module,"form_SubPanelQuickCreate_{$this->_module}.tpl");
+            TemplateHandler::clearCache($this->_module,"form_DCQuickCreate_{$this->_module}.tpl");
         } 
         else 
         {
-        	TemplateHandler::clearCache($this->_module,"{$this->_view}.tpl");
+            TemplateHandler::clearCache($this->_module,"{$this->_view}.tpl");
         }
 
     }

Spacing +50 added lines, -50 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('sugarEntry') || ! sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry)
 die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -62,19 +62,19 @@ 
     /**
      * Constructor
      */
-    function init ($module, $view, $submittedLayout = false)
+    function init($module, $view, $submittedLayout = false)
     {
         $this->_view = ucfirst($view);
         $this->_module = $module;
         $this->language_module = $module;
 
         $this->_baseDirectory = "modules/{$module}/metadata/";
-        $file =  $this->_baseDirectory . strtolower($view) . "defs.php";
-        $this->_customFile = "custom/" . $file;
-        $this->_workingFile = "custom/working/" . $file;
+        $file = $this->_baseDirectory.strtolower($view)."defs.php";
+        $this->_customFile = "custom/".$file;
+        $this->_workingFile = "custom/working/".$file;
 
         $this->_sourceView = $this->_view;
-        $this->_originalFile = $file ;
+        $this->_originalFile = $file;
         $this->_sourceFile = $file;
         if (is_file($this->_workingFile))
         {
@@ -85,16 +85,16 @@ 
         {
             $this->_sourceFile = $this->_customFile;
         }
-        else if (! is_file($this->_sourceFile))
+        else if (!is_file($this->_sourceFile))
         {
             // if we don't have ANY defined metadata then improvise as best we can
             if (strtolower($this->_view) == 'quickcreate')
             {
                 // special handling for quickcreates - base the quickcreate on the editview if no quickcreatedef exists
                 $this->_sourceFile = $this->_baseDirectory."editviewdefs.php";
-                if (is_file("custom/" . $this->_sourceFile))
+                if (is_file("custom/".$this->_sourceFile))
                 {
-                    $this->_sourceFile = "custom/" . $this->_sourceFile;
+                    $this->_sourceFile = "custom/".$this->_sourceFile;
                 }
                 $this->_sourceView = 'EditView';
             }
@@ -126,13 +126,13 @@ 
 
     }
 
-    function getAvailableFields ()
+    function getAvailableFields()
     {
         // Available fields are those that are in the Model and the original layout definition, but not already shown in the View
         // So, because the formats of the two are different we brute force loop through View and unset the fields we find in a copy of Model
         $availableFields = $this->_getModelFields();
-        $GLOBALS['log']->debug( get_class($this)."->getAvailableFields(): _getModelFields returns: ".implode(",",array_keys($availableFields)));
-        if (! empty($this->_viewdefs))
+        $GLOBALS['log']->debug(get_class($this)."->getAvailableFields(): _getModelFields returns: ".implode(",", array_keys($availableFields)));
+        if (!empty($this->_viewdefs))
         {
             foreach ($this->_viewdefs ['panels'] as $panel)
             {
@@ -143,7 +143,7 @@ 
                         if (isset($fieldArray ['name']))
                         {
                             unset($availableFields [$fieldArray ['name']]);
-                            $GLOBALS['log']->debug( get_class($this)."->getAvailableFields(): removing ".$fieldArray ['name'] );
+                            $GLOBALS['log']->debug(get_class($this)."->getAvailableFields(): removing ".$fieldArray ['name']);
                         }
                     }
                 }
@@ -152,39 +152,39 @@ 
         return $availableFields;
     }
 
-    function getLayout ()
+    function getLayout()
     {
         return $this->_viewdefs ['panels'];
     }
 
-    function writeWorkingFile ()
+    function writeWorkingFile()
     {
-        $this->_writeToFile($this->_workingFile,$this->_view,$this->_module,$this->_viewdefs,$this->_variables);
+        $this->_writeToFile($this->_workingFile, $this->_view, $this->_module, $this->_viewdefs, $this->_variables);
     }
 
-    function handleSave ()
+    function handleSave()
     {
-        $this->_writeToFile($this->_customFile,$this->_view,$this->_module,$this->_viewdefs,$this->_variables);
+        $this->_writeToFile($this->_customFile, $this->_view, $this->_module, $this->_viewdefs, $this->_variables);
         // now clear the cache so that the results are immediately visible
         include_once('include/TemplateHandler/TemplateHandler.php');
         if (strtolower($this->_view) == 'quickcreate')
         {
-        	TemplateHandler::clearCache($this->_module,"form_SubPanelQuickCreate_{$this->_module}.tpl");
-        	TemplateHandler::clearCache($this->_module,"form_DCQuickCreate_{$this->_module}.tpl");
+        	TemplateHandler::clearCache($this->_module, "form_SubPanelQuickCreate_{$this->_module}.tpl");
+        	TemplateHandler::clearCache($this->_module, "form_DCQuickCreate_{$this->_module}.tpl");
         } 
         else 
         {
-        	TemplateHandler::clearCache($this->_module,"{$this->_view}.tpl");
+        	TemplateHandler::clearCache($this->_module, "{$this->_view}.tpl");
         }
 
     }
 
-    function loadModule ($module, $view)
+    function loadModule($module, $view)
     {
         $this->_viewdefs = array();
         $viewdefs = null;
 
-        $loaded = $this->_loadFromFile($view,$this->_sourceFile,$module);
+        $loaded = $this->_loadFromFile($view, $this->_sourceFile, $module);
         $this->_viewdefs = $loaded['viewdefs'][$module][$view];
         $this->_variables = $loaded['variables'];
     }
@@ -193,14 +193,14 @@ 
      * Load the canonical panel layout from the submitted form
      *
      */
-    function _loadLayoutFromRequest ()
+    function _loadLayoutFromRequest()
     {
 
         $i = 1;
         // set up the map of panel# (as provided in the _REQUEST) to panel ID (as used in $this->_viewdefs['panels'])
         foreach ($this->_viewdefs ['panels'] as $panelID => $panel)
         {
-            $panelMap [$i ++] = $panelID;
+            $panelMap [$i++] = $panelID;
         }
         // replace any old values with new panel labels from the request
         foreach ($_REQUEST as $key => $value)
@@ -220,7 +220,7 @@ 
 
         if ($this->maxColumns < 1)
         {
-            $this->_fatalError("EditDetailViewParser:invalid maxColumns=" . $this->maxColumns);
+            $this->_fatalError("EditDetailViewParser:invalid maxColumns=".$this->maxColumns);
         }
 
         foreach ($_REQUEST as $slot => $value)
@@ -267,7 +267,7 @@ 
                         // if a leading (empty) then remove (by noting that remaining fields need to be shuffled along)
                         if ($startOfRow)
                         {
-                            $offset ++;
+                            $offset++;
                         }
                         unset($row [$colID]);
                     } else
@@ -287,9 +287,9 @@ 
         //          _pp($this->_viewdefs);
     }
 
-    function _padFields ()
+    function _padFields()
     {
-        if (! empty($this->_viewdefs))
+        if (!empty($this->_viewdefs))
         {
             foreach ($this->_viewdefs ['panels'] as $panelID => $panel)
             {
@@ -299,7 +299,7 @@ 
                     // pad between fields on a row
                     foreach ($row as $colID => $col)
                     {
-                        for ($i = $column + 1 ; $i < $colID ; $i ++ )
+                        for ($i = $column + 1; $i < $colID; $i++)
                         {
                             $row [$i] = array('name' => '(empty)', 'label' => '(empty)');
                         }
@@ -308,7 +308,7 @@ 
                     // now pad out to the end of the row
                     if (($column + 1) < $this->maxColumns)
                     { // last column is maxColumns-1
-                        for ($i = $column + 1 ; $i < $this->maxColumns ; $i ++ )
+                        for ($i = $column + 1; $i < $this->maxColumns; $i++)
                         {
                             $row [$i] = array('name' => '(empty)', 'label' => '(empty)');
                         }
@@ -323,7 +323,7 @@ 
 
     // add a new field to the end of a panel
     // don't write out (caller should call handleSave() when ready)
-    function _addField ($properties, $panelID = FALSE)
+    function _addField($properties, $panelID = FALSE)
     {
 
         // if a panelID was not passed, use the first available panel in the list
@@ -357,7 +357,7 @@ 
             //          print "lastrow=$lastrow lastcol=$lastcol";
             if ($lastcol >= $this->maxColumns)
             {
-                $lastrow ++;
+                $lastrow++;
                 $this->_viewdefs ['panels'] [$panelID] [$lastrow] = array();
                 $lastcol = 0;
             }
@@ -367,7 +367,7 @@ 
     }
 
     /* getModelFields returns an array of all fields stored in the database for this module plus those fields in the original layout definition (so we get fields such as Team ID)*/
-    function _getModelFields ()
+    function _getModelFields()
     {
         $modelFields = array();
         $origViewDefs = $this->_getOrigFieldViewDefs();
@@ -376,13 +376,13 @@ 
         {
             if (!empty($field))
             {
-                if (! is_array($def)) {
+                if (!is_array($def)) {
                     $def = array('name' => $field);
                 }
                 // get this field's label - if it has not been explicitly provided, see if the fieldDefs has a label for this field, and if not fallback to the field name
-                if (! isset($def ['label']))
+                if (!isset($def ['label']))
                         {
-                            if (! empty($this->_fieldDefs [$field] ['vname']))
+                            if (!empty($this->_fieldDefs [$field] ['vname']))
                             {
                                 $def ['label'] = $this->_fieldDefs [$field] ['vname'];
                             } else
@@ -393,25 +393,25 @@ 
                 $modelFields[$field] = array('name' => $field, 'label' => $def ['label']);
             }
         }
-        $GLOBALS['log']->debug(print_r($modelFields,true));
+        $GLOBALS['log']->debug(print_r($modelFields, true));
         foreach ($this->_fieldDefs as $field => $def)
         {
             if ((!empty($def['studio']) && $def['studio'] == 'visible')
-            || (empty($def['studio']) &&  (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields') && $def ['type'] != 'id' && strcmp($field, 'deleted') != 0 && (empty($def ['dbType']) || $def ['dbType'] != 'id') && (empty($def ['dbtype']) || $def ['dbtype'] != 'id')))
+            || (empty($def['studio']) && (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields') && $def ['type'] != 'id' && strcmp($field, 'deleted') != 0 && (empty($def ['dbType']) || $def ['dbType'] != 'id') && (empty($def ['dbtype']) || $def ['dbtype'] != 'id')))
             {
                 $label = isset($def['vname']) ? $def['vname'] : $def['name'];
                 $modelFields [$field] = array('name' => $field, 'label' => $label);
             }
             else
             {
-                $GLOBALS['log']->debug( get_class($this)."->_getModelFields(): skipping $field from modelFields as it fails the test for inclusion");
+                $GLOBALS['log']->debug(get_class($this)."->_getModelFields(): skipping $field from modelFields as it fails the test for inclusion");
             }
         }
-        $GLOBALS['log']->debug( get_class($this)."->_getModelFields(): remaining entries in modelFields are: ".implode(",",array_keys($modelFields)));
+        $GLOBALS['log']->debug(get_class($this)."->_getModelFields(): remaining entries in modelFields are: ".implode(",", array_keys($modelFields)));
         return $modelFields;
     }
 
-    function _parseData ($panels)
+    function _parseData($panels)
     {
         $fields = array();
         if (empty($panels))
@@ -419,7 +419,7 @@ 
 
         // Fix for a flexibility in the format of the panel sections - if only one panel, then we don't have a panel level defined, it goes straight into rows
         // See EditView2 for similar treatment
-        if (! empty($panels) && count($panels) > 0)
+        if (!empty($panels) && count($panels) > 0)
         {
             $keys = array_keys($panels);
             if (is_numeric($keys [0]))
@@ -438,12 +438,12 @@ 
                 {
                     $properties = array();
 
-                    if (! empty($col))
+                    if (!empty($col))
                     {
                         if (is_string($col))
                         {
                             $properties ['name'] = $col;
-                        } else if (! empty($col ['name']))
+                        } else if (!empty($col ['name']))
                         {
                             $properties = $col;
                         }
@@ -452,13 +452,13 @@ 
                         $properties ['name'] = translate('LBL_FILLER');
                     }
 
-                    if (! empty($properties ['name']))
+                    if (!empty($properties ['name']))
                     {
 
                         // get this field's label - if it has not been explicity provided, see if the fieldDefs has a label for this field, and if not fallback to the field name
-                        if (! isset($properties ['label']))
+                        if (!isset($properties ['label']))
                         {
-                            if (! empty($this->_fieldDefs [$properties ['name']] ['vname']))
+                            if (!empty($this->_fieldDefs [$properties ['name']] ['vname']))
                             {
                                 $properties ['label'] = $this->_fieldDefs [$properties ['name']] ['vname'];
                             } else
@@ -476,7 +476,7 @@ 
         return $displayData;
     }
 
-    function _getOrigFieldViewDefs ()
+    function _getOrigFieldViewDefs()
     {
         $origFieldDefs = array();
         $GLOBALS['log']->debug("Original File = ".$this->_originalFile);
@@ -487,7 +487,7 @@ 
 //          $GLOBALS['log']->debug($origdefs);
             // Fix for a flexibility in the format of the panel sections - if only one panel, then we don't have a panel level defined, it goes straight into rows
             // See EditView2 for similar treatment
-            if (! empty($origdefs) && count($origdefs) > 0)
+            if (!empty($origdefs) && count($origdefs) > 0)
             {
                 $keys = array_keys($origdefs);
                 if (is_numeric($keys [0]))

Braces +14 added lines, -20 removed lines

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

Doc Comments +3 added lines

@@ -179,6 +179,9 @@
 
     }
 
+    /**
+     * @param string $view
+     */
     function loadModule ($module, $view)
     {
         $this->_viewdefs = array();

modules/ModuleBuilder/parsers/ModuleBuilderParser.php

Spacing +17 added lines, -17 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.
@@ -48,12 +48,12 @@ 
 	
 	function ModuleBuilderParser()
 	{
-		$this->_defMap = array('listview'=>'listViewDefs','searchview'=>'searchdefs','editview'=>'viewdefs','detailview'=>'viewdefs','quickcreate'=>'viewdefs');
+		$this->_defMap = array('listview'=>'listViewDefs', 'searchview'=>'searchdefs', 'editview'=>'viewdefs', 'detailview'=>'viewdefs', 'quickcreate'=>'viewdefs');
 	}
 	/*
 	 * Initialize this parser
 	 */
-	function init ()
+	function init()
 	{
 	}
 	
@@ -64,11 +64,11 @@ 
 	{
 	}
 	
-	function _loadFromFile($view,$file,$moduleName)
+	function _loadFromFile($view, $file, $moduleName)
 	{
 		
 		$variables = array();
-	    if (! file_exists($file))
+	    if (!file_exists($file))
         {
             $this->_fatalError("ModuleBuilderParser: required viewdef file {$file} does not exist");
         }
@@ -80,7 +80,7 @@ 
         // This is a format used by ModuleBuilder templated modules to speed the renaming of modules
         // Traditional Sugar modules don't use this format
         // We must do this in ParserModifyLayout (rather than just in ParserBuildLayout) because we might be editing the layout of a MB created module in Studio after it has been deployed
-        $moduleVariables = array('module_name','_module_name', 'OBJECT_NAME', '_object_name');
+        $moduleVariables = array('module_name', '_module_name', 'OBJECT_NAME', '_object_name');
         foreach ($moduleVariables as $name)
         {
             if (isset($$name)) {
@@ -106,7 +106,7 @@ 
         return (array('viewdefs' => $defs, 'variables' => $variables));
 	}
 	
-	function handleSave ($file,$view,$moduleName,$defs)
+	function handleSave($file, $view, $moduleName, $defs)
 	{
 	}
 	
@@ -114,21 +114,21 @@ 
 	/*
 	 * Save the new layout
 	 */
-	function _writeToFile ($file,$view,$moduleName,$defs,$variables)
+	function _writeToFile($file, $view, $moduleName, $defs, $variables)
 	{
-	        if(file_exists($file))
+	        if (file_exists($file))
 	            unlink($file);
 	        
-	        mkdir_recursive ( dirname ( $file ) ) ;
+	        mkdir_recursive(dirname($file));
 	        $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
-            $useVariables = (count($variables)>0);
-            if( $fh = @sugar_fopen( $file, 'w' ) )
+            $useVariables = (count($variables) > 0);
+            if ($fh = @sugar_fopen($file, 'w'))
             {
                 $out = "<?php\n";    
                 if ($useVariables)
                 {
                     // write out the $<variable>=<modulename> lines
-                    foreach($variables as $key=>$value)
+                    foreach ($variables as $key=>$value)
                     {
                     	$out .= "\$$key = '".$value."';\n";
                     }
@@ -147,7 +147,7 @@ 
                 }
                 $viewVariable = $this->_defMap[strtolower($view)];
                 $out .= "\$$viewVariable = ";
-                $out .= ($useVariables) ? "array (\n\$module_name =>\n".var_export_helper($defs) : var_export_helper( array($moduleName => $defs) );
+                $out .= ($useVariables) ? "array (\n\$module_name =>\n".var_export_helper($defs) : var_export_helper(array($moduleName => $defs));
                 
                 // tidy up the parenthesis
                 if ($useVariables)
@@ -157,8 +157,8 @@ 
                 $out .= ";\n?>\n";
                 
 //           $GLOBALS['log']->debug("parser.modifylayout.php->_writeFile(): out=".print_r($out,true));
-            fputs( $fh, $out);
-            fclose( $fh );
+            fputs($fh, $out);
+            fclose($fh);
             }
             else
             {
@@ -167,7 +167,7 @@ 
 	}
 
 
-    function _fatalError ($msg)
+    function _fatalError($msg)
     {
         $GLOBALS ['log']->fatal($msg);
         echo $msg;

Braces +7 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -116,8 +118,9 @@ 
 	 */
 	function _writeToFile ($file,$view,$moduleName,$defs,$variables)
 	{
-	        if(file_exists($file))
-	            unlink($file);
+	        if(file_exists($file)) {
+	        	            unlink($file);
+	        }
 	        
 	        mkdir_recursive ( dirname ( $file ) ) ;
 	        $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
@@ -159,8 +162,7 @@ 
 //           $GLOBALS['log']->debug("parser.modifylayout.php->_writeFile(): out=".print_r($out,true));
             fputs( $fh, $out);
             fclose( $fh );
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->fatal("ModuleBuilderParser->_writeFile() Could not write new viewdef file ".$file);
             }

Doc Comments +7 added lines

@@ -64,6 +64,9 @@ 
 	{
 	}
 	
+	/**
+	 * @param string $file
+	 */
 	function _loadFromFile($view,$file,$moduleName)
 	{
 		
@@ -114,6 +117,10 @@ 
 	/*
 	 * Save the new layout
 	 */
+
+	/**
+	 * @param string $view
+	 */
 	function _writeToFile ($file,$view,$moduleName,$defs,$variables)
 	{
 	        if(file_exists($file))

Indentation +48 added lines, -48 removed lines

@@ -43,32 +43,32 @@ 
 class ModuleBuilderParser
 {
 
-	var $_defMap; // private - mapping from view to variable name inside the viewdef file
-	var $_variables = array(); // private - set of additional variables (other than the viewdefs) found in the viewdef file that need to be added to the file again when it is saved - used by ModuleBuilder
-
-	function __construct()
-	{
-		$this->_defMap = array('listview'=>'listViewDefs','searchview'=>'searchdefs','editview'=>'viewdefs','detailview'=>'viewdefs','quickcreate'=>'viewdefs');
-	}
-	/*
+    var $_defMap; // private - mapping from view to variable name inside the viewdef file
+    var $_variables = array(); // private - set of additional variables (other than the viewdefs) found in the viewdef file that need to be added to the file again when it is saved - used by ModuleBuilder
+
+    function __construct()
+    {
+        $this->_defMap = array('listview'=>'listViewDefs','searchview'=>'searchdefs','editview'=>'viewdefs','detailview'=>'viewdefs','quickcreate'=>'viewdefs');
+    }
+    /*
 	 * Initialize this parser
 	 */
-	function init ()
-	{
-	}
+    function init ()
+    {
+    }
 
-	/*
+    /*
 	 * Dummy function used to ease the transition to the new parser structure
 	 */
-	function populateFromPost()
-	{
-	}
+    function populateFromPost()
+    {
+    }
 
-	function _loadFromFile($view,$file,$moduleName)
-	{
+    function _loadFromFile($view,$file,$moduleName)
+    {
 
-		$variables = array();
-	    if (! file_exists($file))
+        $variables = array();
+        if (! file_exists($file))
         {
             $this->_fatalError("ModuleBuilderParser: required viewdef file {$file} does not exist");
         }
@@ -84,7 +84,7 @@ 
         foreach ($moduleVariables as $name)
         {
             if (isset($$name)) {
-            	$variables[$name] = $$name;
+                $variables[$name] = $$name;
             }
         }
         $viewVariable = $this->_defMap[strtolower($view)];
@@ -94,33 +94,33 @@ 
 
         if (isset($variables['module_name']))
         {
-        	$mbName = $variables['module_name'];
-        	if ($mbName != $moduleName)
-        	{
-	        	$GLOBALS['log']->debug('ModuleBuilderParser->_loadFromFile(): tidying module names from '.$mbName.' to '.$moduleName);
-	        	$defs[$moduleName] = $defs[$mbName];
-	        	unset($defs[$mbName]);
-        	}
+            $mbName = $variables['module_name'];
+            if ($mbName != $moduleName)
+            {
+                $GLOBALS['log']->debug('ModuleBuilderParser->_loadFromFile(): tidying module names from '.$mbName.' to '.$moduleName);
+                $defs[$moduleName] = $defs[$mbName];
+                unset($defs[$mbName]);
+            }
         }
 //	    $GLOBALS['log']->debug('ModuleBuilderParser->_loadFromFile(): '.print_r($defs,true));
         return (array('viewdefs' => $defs, 'variables' => $variables));
-	}
+    }
 
-	function handleSave ($file,$view,$moduleName,$defs)
-	{
-	}
+    function handleSave ($file,$view,$moduleName,$defs)
+    {
+    }
 
 
-	/*
+    /*
 	 * Save the new layout
 	 */
-	function _writeToFile ($file,$view,$moduleName,$defs,$variables)
-	{
-	        if(file_exists($file))
-	            unlink($file);
+    function _writeToFile ($file,$view,$moduleName,$defs,$variables)
+    {
+            if(file_exists($file))
+                unlink($file);
 
-	        mkdir_recursive ( dirname ( $file ) ) ;
-	        $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
+            mkdir_recursive ( dirname ( $file ) ) ;
+            $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
             $useVariables = (count($variables)>0);
             if( $fh = @sugar_fopen( $file, 'w' ) )
             {
@@ -130,20 +130,20 @@ 
                     // write out the $<variable>=<modulename> lines
                     foreach($variables as $key=>$value)
                     {
-                    	$out .= "\$$key = '".$value."';\n";
+                        $out .= "\$$key = '".$value."';\n";
                     }
                 }
 
                 // write out the defs array itself
                 switch (strtolower($view))
                 {
-                	case 'editview':
-                	case 'detailview':
-                	case 'quickcreate':
-                		$defs = array($view => $defs);
-                		break;
-                	default:
-                		break;
+                    case 'editview':
+                    case 'detailview':
+                    case 'quickcreate':
+                        $defs = array($view => $defs);
+                        break;
+                    default:
+                        break;
                 }
                 $viewVariable = $this->_defMap[strtolower($view)];
                 $out .= "\$$viewVariable = ";
@@ -152,7 +152,7 @@ 
                 // tidy up the parenthesis
                 if ($useVariables)
                 {
-                	$out .= "\n)";
+                    $out .= "\n)";
                 }
                 $out .= ";\n?>\n";
 
@@ -164,7 +164,7 @@ 
             {
                 $GLOBALS['log']->fatal("ModuleBuilderParser->_writeFile() Could not write new viewdef file ".$file);
             }
-	}
+    }
 
 
     function _fatalError ($msg)

modules/ModuleBuilder/parsers/ParserFactory.php

Indentation +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     public static function getParser ( $view , $moduleName , $packageName = null , $subpanelName = null )
     {
         $GLOBALS [ 'log' ]->info ( "ParserFactory->getParser($view,$moduleName,$packageName,$subpanelName )" ) ;
-		$sm = null;
+        $sm = null;
         $lView = strtolower ( $view );
         if ( empty ( $packageName ) || ( $packageName == 'studio' ) )
         {

Spacing +43 added lines, -43 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
@@ -41,7 +41,7 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 class ParserFactory
 {
@@ -55,20 +55,20 @@ 
      * @return AbstractMetaDataParser
      */
 
-    public static function getParser ( $view , $moduleName , $packageName = null , $subpanelName = null )
+    public static function getParser($view, $moduleName, $packageName = null, $subpanelName = null)
     {
-        $GLOBALS [ 'log' ]->info ( "ParserFactory->getParser($view,$moduleName,$packageName,$subpanelName )" ) ;
+        $GLOBALS ['log']->info("ParserFactory->getParser($view,$moduleName,$packageName,$subpanelName )");
 		$sm = null;
-        $lView = strtolower ( $view );
-        if ( empty ( $packageName ) || ( $packageName == 'studio' ) )
+        $lView = strtolower($view);
+        if (empty ($packageName) || ($packageName == 'studio'))
         {
-            $packageName = null ;
+            $packageName = null;
             //For studio modules, check for view parser overrides
             $parser = self::checkForStudioParserOverride($view, $moduleName, $packageName);
             if ($parser) return $parser;
             $sm = StudioModuleFactory::getStudioModule($moduleName);
             //If we didn't find a specofic parser, see if there is a view to type mapping
-            foreach($sm->sources as $file => $def)
+            foreach ($sm->sources as $file => $def)
             {
                 if (!empty($def['view']) && $def['view'] == $view && !empty($def['type']))
                 {
@@ -78,41 +78,41 @@ 
             }
         }
 
-        switch ( $lView)
+        switch ($lView)
         {
             case MB_EDITVIEW :
             case MB_DETAILVIEW :
             case MB_QUICKCREATE :
-                require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
-                return new GridLayoutMetaDataParser ( $view, $moduleName, $packageName ) ;
+                require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php';
+                return new GridLayoutMetaDataParser($view, $moduleName, $packageName);
             case MB_BASICSEARCH :
             case MB_ADVANCEDSEARCH :
-                require_once 'modules/ModuleBuilder/parsers/views/SearchViewMetaDataParser.php' ;
-                return new SearchViewMetaDataParser ( $view, $moduleName, $packageName ) ;
+                require_once 'modules/ModuleBuilder/parsers/views/SearchViewMetaDataParser.php';
+                return new SearchViewMetaDataParser($view, $moduleName, $packageName);
             case MB_LISTVIEW :
                 if ($subpanelName == null)
                 {
-                    require_once 'modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php' ;
-                    return new ListLayoutMetaDataParser ( MB_LISTVIEW, $moduleName, $packageName ) ;
+                    require_once 'modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php';
+                    return new ListLayoutMetaDataParser(MB_LISTVIEW, $moduleName, $packageName);
                 } else
                 {
-                    require_once 'modules/ModuleBuilder/parsers/views/SubpanelMetaDataParser.php' ;
-                    return new SubpanelMetaDataParser ( $subpanelName, $moduleName, $packageName ) ;
+                    require_once 'modules/ModuleBuilder/parsers/views/SubpanelMetaDataParser.php';
+                    return new SubpanelMetaDataParser($subpanelName, $moduleName, $packageName);
                 }
             case MB_DASHLET :
             case MB_DASHLETSEARCH :
-                require_once 'modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php' ;
-                return new DashletMetaDataParser($view, $moduleName, $packageName  );
+                require_once 'modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php';
+                return new DashletMetaDataParser($view, $moduleName, $packageName);
             case MB_POPUPLIST :
             case MB_POPUPSEARCH :
-                require_once 'modules/ModuleBuilder/parsers/views/PopupMetaDataParser.php' ;
-                return new PopupMetaDataParser($view, $moduleName, $packageName  );
+                require_once 'modules/ModuleBuilder/parsers/views/PopupMetaDataParser.php';
+                return new PopupMetaDataParser($view, $moduleName, $packageName);
             case MB_LABEL :
-                require_once 'modules/ModuleBuilder/parsers/parser.label.php' ;
-                return new ParserLabel ( $moduleName, $packageName ) ;
+                require_once 'modules/ModuleBuilder/parsers/parser.label.php';
+                return new ParserLabel($moduleName, $packageName);
             case MB_VISIBILITY :
-                require_once 'modules/ModuleBuilder/parsers/parser.visibility.php' ;
-                return new ParserVisibility ( $moduleName, $packageName ) ;
+                require_once 'modules/ModuleBuilder/parsers/parser.visibility.php';
+                return new ParserVisibility($moduleName, $packageName);
             default :
                 $parser = self::checkForParserClass($view, $moduleName, $packageName);
                 if ($parser)
@@ -120,33 +120,33 @@ 
 
         }
 
-        $GLOBALS [ 'log' ]->fatal ("ParserFactory: cannot create ModuleBuilder Parser $view" ) ;
+        $GLOBALS ['log']->fatal("ParserFactory: cannot create ModuleBuilder Parser $view");
 
     }
 
     protected static function checkForParserClass($view, $moduleName, $packageName, $nameOverride = false)
     {
         $prefix = '';
-        if(!is_null ( $packageName )){
-            $prefix = empty($packageName) ? 'build' :'modify';
+        if (!is_null($packageName)) {
+            $prefix = empty($packageName) ? 'build' : 'modify';
         }
         $fileNames = array(
-            "custom/modules/$moduleName/parsers/parser." . strtolower ( $prefix . $view ) . ".php",
-            "modules/$moduleName/parsers/parser." . strtolower ( $prefix . $view ) . ".php",
-            "custom/modules/ModuleBuilder/parsers/parser." . strtolower ( $prefix . $view ) . ".php",
-            "modules/ModuleBuilder/parsers/parser." . strtolower ( $prefix . $view ) . ".php",
+            "custom/modules/$moduleName/parsers/parser.".strtolower($prefix.$view).".php",
+            "modules/$moduleName/parsers/parser.".strtolower($prefix.$view).".php",
+            "custom/modules/ModuleBuilder/parsers/parser.".strtolower($prefix.$view).".php",
+            "modules/ModuleBuilder/parsers/parser.".strtolower($prefix.$view).".php",
         );
-        foreach($fileNames as $fileName)
+        foreach ($fileNames as $fileName)
         {
-            if (file_exists ( $fileName ))
+            if (file_exists($fileName))
             {
-                require_once $fileName ;
-                $class = 'Parser' . $prefix . ucfirst ( $view ) ;
-                if (class_exists ( $class ))
+                require_once $fileName;
+                $class = 'Parser'.$prefix.ucfirst($view);
+                if (class_exists($class))
                 {
-                    $GLOBALS [ 'log' ]->debug ( 'Using ModuleBuilder Parser ' . $fileName ) ;
-                    $parser = new $class ( ) ;
-                    return $parser ;
+                    $GLOBALS ['log']->debug('Using ModuleBuilder Parser '.$fileName);
+                    $parser = new $class( );
+                    return $parser;
                 }
             }
         }
@@ -157,7 +157,7 @@ 
     {
         require_once('modules/ModuleBuilder/Module/StudioModuleFactory.php');
         $sm = StudioModuleFactory::getStudioModule($moduleName);
-        foreach($sm->sources as $file => $def)
+        foreach ($sm->sources as $file => $def)
         {
             if (!empty($def['view']) && $def['view'] == strtolower($view) && !empty($def['parser']))
             {
@@ -167,7 +167,7 @@ 
                     require_once("custom/$path");
                 else if (file_exists($path))
                     require_once($path);
-                if (class_exists ( $pName ))
+                if (class_exists($pName))
                     return new $pName($view, $moduleName, $packageName);
                 //If it wasn't defined directly, check for a generic parser name for the view
                 $parser = self::checkForParserClass($view, $moduleName, $packageName);

Braces +19 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -65,7 +66,9 @@ 
             $packageName = null ;
             //For studio modules, check for view parser overrides
             $parser = self::checkForStudioParserOverride($view, $moduleName, $packageName);
-            if ($parser) return $parser;
+            if ($parser) {
+                return $parser;
+            }
             $sm = StudioModuleFactory::getStudioModule($moduleName);
             //If we didn't find a specofic parser, see if there is a view to type mapping
             foreach($sm->sources as $file => $def)
@@ -115,8 +118,9 @@ 
                 return new ParserVisibility ( $moduleName, $packageName ) ;
             default :
                 $parser = self::checkForParserClass($view, $moduleName, $packageName);
-                if ($parser)
-                    return $parser;
+                if ($parser) {
+                                    return $parser;
+                }
 
         }
 
@@ -163,16 +167,19 @@ 
             {
                 $pName = $def['parser'];
                 $path = "modules/ModuleBuilder/parsers/views/{$pName}.php";
-                if (file_exists("custom/$path"))
-                    require_once("custom/$path");
-                else if (file_exists($path))
-                    require_once($path);
-                if (class_exists ( $pName ))
-                    return new $pName($view, $moduleName, $packageName);
+                if (file_exists("custom/$path")) {
+                                    require_once("custom/$path");
+                } else if (file_exists($path)) {
+                                    require_once($path);
+                }
+                if (class_exists ( $pName )) {
+                                    return new $pName($view, $moduleName, $packageName);
+                }
                 //If it wasn't defined directly, check for a generic parser name for the view
                 $parser = self::checkForParserClass($view, $moduleName, $packageName);
-                if ($parser)
-                    return $parser;
+                if ($parser) {
+                                    return $parser;
+                }
             }
         }
         return false;

Doc Comments +4 added lines

@@ -153,6 +153,10 @@
         return false;
     }
 
+    /**
+     * @param string $view
+     * @param string $moduleName
+     */
     protected static function checkForStudioParserOverride($view, $moduleName, $packageName)
     {
         require_once('modules/ModuleBuilder/Module/StudioModuleFactory.php');

modules/ModuleBuilder/parsers/parser.modifylistview.php

Indentation +262 added lines, -262 removed lines

@@ -43,144 +43,144 @@ 
 require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php') ;
 class ParserModifyListView extends ModuleBuilderParser
 {
-	var $listViewDefs = false ;
-	var $defaults = array ( ) ;
-	var $additional = array ( ) ;
-	var $available = array ( ) ;
-	var $reserved = array(); // fields marked by 'studio'=>false in the listviewdefs; need to be preserved
-	//	var $language_module = '';
-	var $columns = array ( 'LBL_DEFAULT' => 'getDefaultFields' , 'LBL_AVAILABLE' => 'getAdditionalFields' , 'LBL_HIDDEN' => 'getAvailableFields' ) ;
-	function init ( $module_name , $submodule = '' )
-	{
-		global $app_list_strings ;
-		$this->module_name = $module_name ;
-		$mod_strings = return_module_language ( $GLOBALS [ 'current_language' ], $this->module_name ) ; // needed solely so that listviewdefs that reference this can be included without error
-		$class = $GLOBALS [ 'beanList' ] [ $this->module_name ] ;
-		require_once ($GLOBALS [ 'beanFiles' ] [ $class ]) ;
-		$this->module = new $class ( ) ;
+    var $listViewDefs = false ;
+    var $defaults = array ( ) ;
+    var $additional = array ( ) ;
+    var $available = array ( ) ;
+    var $reserved = array(); // fields marked by 'studio'=>false in the listviewdefs; need to be preserved
+    //	var $language_module = '';
+    var $columns = array ( 'LBL_DEFAULT' => 'getDefaultFields' , 'LBL_AVAILABLE' => 'getAdditionalFields' , 'LBL_HIDDEN' => 'getAvailableFields' ) ;
+    function init ( $module_name , $submodule = '' )
+    {
+        global $app_list_strings ;
+        $this->module_name = $module_name ;
+        $mod_strings = return_module_language ( $GLOBALS [ 'current_language' ], $this->module_name ) ; // needed solely so that listviewdefs that reference this can be included without error
+        $class = $GLOBALS [ 'beanList' ] [ $this->module_name ] ;
+        require_once ($GLOBALS [ 'beanFiles' ] [ $class ]) ;
+        $this->module = new $class ( ) ;
 
-		$loaded = $this->_loadFromFile('ListView','modules/' . $this->module_name . '/metadata/listviewdefs.php',$this->module_name);
-		$this->originalListViewDefs = $loaded['viewdefs'] [ $this->module_name ] ;
-		$this->_variables = $loaded['variables'];
-		//		_pp($loaded);
-		$this->customFile = 'custom/modules/' . $this->module_name . '/metadata/listviewdefs.php' ;
-		if (file_exists ( $this->customFile ))
-		{
-			$loaded = $this->_loadFromFile('ListView',$this->customFile,$this->module_name);
-			$this->listViewDefs = $loaded['viewdefs'] [ $this->module_name ] ;
-			$this->_variables = $loaded['variables'];
-		} else
-		{
-			$this->listViewDefs = & $this->originalListViewDefs ;
-		}
+        $loaded = $this->_loadFromFile('ListView','modules/' . $this->module_name . '/metadata/listviewdefs.php',$this->module_name);
+        $this->originalListViewDefs = $loaded['viewdefs'] [ $this->module_name ] ;
+        $this->_variables = $loaded['variables'];
+        //		_pp($loaded);
+        $this->customFile = 'custom/modules/' . $this->module_name . '/metadata/listviewdefs.php' ;
+        if (file_exists ( $this->customFile ))
+        {
+            $loaded = $this->_loadFromFile('ListView',$this->customFile,$this->module_name);
+            $this->listViewDefs = $loaded['viewdefs'] [ $this->module_name ] ;
+            $this->_variables = $loaded['variables'];
+        } else
+        {
+            $this->listViewDefs = & $this->originalListViewDefs ;
+        }
 
-		$this->fixKeys ( $this->originalListViewDefs ) ;
-		$this->fixKeys ( $this->listViewDefs ) ;
-		$this->language_module = $this->module_name ;
-	}
+        $this->fixKeys ( $this->originalListViewDefs ) ;
+        $this->fixKeys ( $this->listViewDefs ) ;
+        $this->language_module = $this->module_name ;
+    }
 	
-	function getLanguage()
-	{
-	    return $this->language_module;
-	}
-	// re-key array so that every entry has a key=name and all keys are lowercase - makes it easier in handleSave() later...
-	function fixKeys ( &$defs )
-	{
-		$temp = array ( ) ;
-		foreach ( $defs as $key => $value )
-		{
-			if (! is_array ( $value ))
-			{
-				$key = $value ;
-				$def = array ( ) ;
-				$def [ 'name' ] = (isset ( $this->module->field_defs [ $key ] )) ? $this->module->field_defs [ $key ] [ 'name' ] : $key ;
-				$value = $def ;
-			}
-			if (isset ( $value [ 'name' ] ))
-			{
-				$key = $value [ 'name' ] ; // override key with name, needed when the entry lacks a key
-			}
-			$temp [ strtolower ( $key ) ] = $value ;
-		}
-		$defs = $temp ;
-	}
+    function getLanguage()
+    {
+        return $this->language_module;
+    }
+    // re-key array so that every entry has a key=name and all keys are lowercase - makes it easier in handleSave() later...
+    function fixKeys ( &$defs )
+    {
+        $temp = array ( ) ;
+        foreach ( $defs as $key => $value )
+        {
+            if (! is_array ( $value ))
+            {
+                $key = $value ;
+                $def = array ( ) ;
+                $def [ 'name' ] = (isset ( $this->module->field_defs [ $key ] )) ? $this->module->field_defs [ $key ] [ 'name' ] : $key ;
+                $value = $def ;
+            }
+            if (isset ( $value [ 'name' ] ))
+            {
+                $key = $value [ 'name' ] ; // override key with name, needed when the entry lacks a key
+            }
+            $temp [ strtolower ( $key ) ] = $value ;
+        }
+        $defs = $temp ;
+    }
 	
-	/**
-	 * returns the default fields for a listview
-	 * Called only when displaying the listview for editing; not called when saving
-	 */
-	function getDefaultFields ()
-	{
-		$this->defaults = array ( ) ;
-		foreach ( $this->listViewDefs as $key => $def )
-		{
-		    // add in the default fields from the listviewdefs, stripping out any field with 'studio' set to a value other than true
-		    // Important: the 'studio' fields must be added back into the layout on save, as they're not editable rather than hidden
-			if (! empty ( $def [ 'default' ] ))
-			{
-			    if (! isset($def['studio']) || $def['studio'] === true)
-			    {
-			        $this->defaults [ $key ] = $def ;
-			    }
-			    else
-			    // anything which doesn't go into the defaults is a reserved field - this makes sure we don't miss anything
-			    {
-			        $this->reserved [ $key ] = $def;
-			    }
-			}
-		}
-		return $this->defaults ;
-	}
-	/**
-	 * returns additional fields available for users to create fields
-	 */
-	function getAdditionalFields ()
-	{
-		$this->additional = array ( ) ;
-		foreach ( $this->listViewDefs as $key => $def )
-		{
-			if (empty ( $def [ 'default' ] ))
-			{
-				$key = strtolower ( $key ) ;
-				$this->additional [ $key ] = $def ;
-			}
-		}
-		return $this->additional ;
-	}
-	/**
-	 * returns unused fields that are available for using in either default or additional list views
-	 */
-	function getAvailableFields ()
-	{
-		$this->availableFields = array ( ) ;
-		$lowerFieldList = array_change_key_case ( $this->listViewDefs ) ;
-		foreach ( $this->originalListViewDefs as $key => $def )
-		{
-			$key = strtolower ( $key ) ;
-			if (! isset ( $lowerFieldList [ $key ] ))
-			{
-				$this->availableFields [ $key ] = $def ;
-			}
-		}
-		$GLOBALS['log']->debug('parser.modifylistview.php->getAvailableFields(): field_defs='.print_r($this->availableFields,true));
-		$modFields = !empty($this->module->field_name_map) ? $this->module->field_name_map : $this->module->field_defs;
-		foreach ( $modFields as $key => $def )
-		{
-			$fieldName = strtolower ( $key ) ;
+    /**
+     * returns the default fields for a listview
+     * Called only when displaying the listview for editing; not called when saving
+     */
+    function getDefaultFields ()
+    {
+        $this->defaults = array ( ) ;
+        foreach ( $this->listViewDefs as $key => $def )
+        {
+            // add in the default fields from the listviewdefs, stripping out any field with 'studio' set to a value other than true
+            // Important: the 'studio' fields must be added back into the layout on save, as they're not editable rather than hidden
+            if (! empty ( $def [ 'default' ] ))
+            {
+                if (! isset($def['studio']) || $def['studio'] === true)
+                {
+                    $this->defaults [ $key ] = $def ;
+                }
+                else
+                // anything which doesn't go into the defaults is a reserved field - this makes sure we don't miss anything
+                {
+                    $this->reserved [ $key ] = $def;
+                }
+            }
+        }
+        return $this->defaults ;
+    }
+    /**
+     * returns additional fields available for users to create fields
+     */
+    function getAdditionalFields ()
+    {
+        $this->additional = array ( ) ;
+        foreach ( $this->listViewDefs as $key => $def )
+        {
+            if (empty ( $def [ 'default' ] ))
+            {
+                $key = strtolower ( $key ) ;
+                $this->additional [ $key ] = $def ;
+            }
+        }
+        return $this->additional ;
+    }
+    /**
+     * returns unused fields that are available for using in either default or additional list views
+     */
+    function getAvailableFields ()
+    {
+        $this->availableFields = array ( ) ;
+        $lowerFieldList = array_change_key_case ( $this->listViewDefs ) ;
+        foreach ( $this->originalListViewDefs as $key => $def )
+        {
+            $key = strtolower ( $key ) ;
+            if (! isset ( $lowerFieldList [ $key ] ))
+            {
+                $this->availableFields [ $key ] = $def ;
+            }
+        }
+        $GLOBALS['log']->debug('parser.modifylistview.php->getAvailableFields(): field_defs='.print_r($this->availableFields,true));
+        $modFields = !empty($this->module->field_name_map) ? $this->module->field_name_map : $this->module->field_defs;
+        foreach ( $modFields as $key => $def )
+        {
+            $fieldName = strtolower ( $key ) ;
             if ($fieldName == 'currency_id')
                 continue;
-			if (!isset ( $lowerFieldList [ $fieldName ] )) // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
-			{
+            if (!isset ( $lowerFieldList [ $fieldName ] )) // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
+            {
             // bug 19656: this test changed after 5.0.0b - we now remove all ID type fields - whether set as type, or dbtype, from the fielddefs
             if ($this->isValidField($key, $def)){
-					$label = (isset ( $def [ 'vname' ] )) ? $def [ 'vname' ] : (isset($def [ 'label' ]) ? $def['label'] : $def['name']) ;
-					$this->availableFields [ $fieldName ] = array ( 'width' => '10' , 'label' => $label ) ;
-				}
-			}
-		}
+                    $label = (isset ( $def [ 'vname' ] )) ? $def [ 'vname' ] : (isset($def [ 'label' ]) ? $def['label'] : $def['name']) ;
+                    $this->availableFields [ $fieldName ] = array ( 'width' => '10' , 'label' => $label ) ;
+                }
+            }
+        }
 
-		return $this->availableFields ;
-	}
+        return $this->availableFields ;
+    }
 
     function getFieldDefs()
     {
@@ -188,146 +188,146 @@ 
     }
 
 	
-	function isValidField($key, $def) {
-	    //Allow fields that are studio visible  
-		if (! empty ( $def [ 'studio' ] ) && $def [ 'studio' ] == 'visible')
-		  return true;
+    function isValidField($key, $def) {
+        //Allow fields that are studio visible  
+        if (! empty ( $def [ 'studio' ] ) && $def [ 'studio' ] == 'visible')
+            return true;
 		  
-		//No ID fields
-		if  ((!empty ( $def [ 'dbType' ] ) && $def [ 'dbType' ] == 'id') || (!empty ( $def [ 'type' ] ) && $def [ 'type' ] == 'id'))
-		  return false;
+        //No ID fields
+        if  ((!empty ( $def [ 'dbType' ] ) && $def [ 'dbType' ] == 'id') || (!empty ( $def [ 'type' ] ) && $def [ 'type' ] == 'id'))
+            return false;
 		  
-		//only allow DB and custom fields (if a source is specified)
-	    if (!empty($def [ 'source' ]) && $def [ 'source' ] != 'db' && $def [ 'source' ] != 'custom_fields')
-		  return false;
+        //only allow DB and custom fields (if a source is specified)
+        if (!empty($def [ 'source' ]) && $def [ 'source' ] != 'db' && $def [ 'source' ] != 'custom_fields')
+            return false;
 
-		//Dont ever show the "deleted" fields or "_name" fields
-		if (strcmp ( $key, 'deleted' ) == 0 || (isset ( $def [ 'name' ] ) && strpos ( $def [ 'name' ], "_name" ) !== false))
-	       return false;
+        //Dont ever show the "deleted" fields or "_name" fields
+        if (strcmp ( $key, 'deleted' ) == 0 || (isset ( $def [ 'name' ] ) && strpos ( $def [ 'name' ], "_name" ) !== false))
+            return false;
 
-	    //If none of the "ifs" are true, the field is valid
-	    return true;
-	}
+        //If none of the "ifs" are true, the field is valid
+        return true;
+    }
 	
 	
-	function getField ( $fieldName )
-	{
-		$fieldName = strtolower ( $fieldName ) ;
-		foreach ( $this->listViewDefs as $key => $def )
-		{
-			$key = strtolower ( $key ) ;
-			if ($key == $fieldName)
-			{
-				return $def ;
-			}
-		}
-		foreach ( $this->module->field_defs as $key => $def )
-		{
-			$key = strtolower ( $key ) ;
-			if ($key == $fieldName)
-			{
-				return $def ;
-			}
-		}
-		return array ( ) ;
-	}
-	function addRelateData($fieldname, $listfielddef) {
-		$modFieldDef = $this->module->field_defs [ strtolower ( $fieldname ) ];
-		if (!empty($modFieldDef['module']) && !empty($modFieldDef['id_name'])) {
-			$listfielddef['module'] = $modFieldDef['module'];
-			$listfielddef['id'] = strtoupper($modFieldDef['id_name']);
-			$listfielddef['link'] = true;
-			$listfielddef['related_fields'] = array (strtolower($modFieldDef['id_name']));
-		}
-		return $listfielddef;
-	}
-	function _loadLayoutFromRequest ()
-	{
-	    $GLOBALS['log']->debug("ParserModifyListView->_loadLayoutFromRequest()");
-		$fields = array ( ) ;
-		$rejectTypes = array ( 'html' , 'enum' , 'text' ) ;
-		for ( $i = 0 ; isset ( $_POST [ 'group_' . $i ] ) && $i < 2 ; $i ++ )
-		{
-			//echo "\n***group-$i Size:".sizeof($_POST['group_' . $i])."\n";
-			foreach ( $_POST [ 'group_' . $i ] as $field )
-			{
-				$fieldname = strtoupper ( $field ) ;
-				//originalListViewDefs are all lower case
-				$lowerFieldName = strtolower ( $field ) ;
-				if (isset ( $this->originalListViewDefs [ $lowerFieldName ] ))
-				{
-					$fields [ $fieldname ] = $this->originalListViewDefs [ $lowerFieldName ] ;
-				} else
-				{
-					//check if we have the case wrong for custom fields
-					if (! isset ( $this->module->field_defs [ $fieldname ] ))
-					{
-						foreach ( $this->module->field_defs as $key => $value )
-						{
-							if (strtoupper ( $key ) == $fieldname)
-							{
-								$fields [ $fieldname ] = array ( 'width' => 10 , 'label' => $this->module->field_defs [ $key ] [ 'vname' ] ) ;
-								break ;
-							}
-						}
-					} else
-					{
-						$fields [ $fieldname ] = array ( 'width' => 10 , 'label' => $this->module->field_defs [ $fieldname ] [ 'vname' ] ) ;
-					}
-					// sorting fields of certain types will cause a database engine problems
-					// we only check this for custom fields, as we assume that OOB fields have been independently confirmed as ok
-					if (isset ( $this->module->field_defs [ strtolower ( $fieldname ) ] ) && (in_array ( $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ], $rejectTypes ) || isset($this->module->field_defs [ strtolower ( $fieldname ) ]['custom_module'])))
-					{
-						$fields [ $fieldname ] [ 'sortable' ] = false ;
-					}
-					// Bug 23728 - Make adding a currency type field default to setting the 'currency_format' to true
-					if (isset ( $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type ' ] ) && $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ] == 'currency') 
-					{
-						$fields [ $fieldname ] [ 'currency_format' ] = true;
-					}
-				}
-				if (isset ( $_REQUEST [ strtolower ( $fieldname ) . 'width' ] ))
-				{
-					$width = substr ( $_REQUEST [ strtolower ( $fieldname ) . 'width' ], 6, 3 ) ;
-					if (strpos ( $width, "%" ) !== false)
-					{
-						$width = substr ( $width, 0, 2 ) ;
-					}
-					if ($width < 101 && $width > 0)
-					{
-						$fields [ $fieldname ] [ 'width' ] = $width ;
-					}
-				} else if (isset ( $this->listViewDefs [ $fieldname ] [ 'width' ] ))
-				{
-					$fields [ $fieldname ] [ 'width' ] = $this->listViewDefs [ $fieldname ] [ 'width' ] ;
-				}
-				//Get additional Data for relate fields
-				if (isset($this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ]) && $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ] == 'relate') {
-					$fields [ $fieldname ] = $this->addRelateData($field, $fields [ $fieldname ]);
-				}
-				$fields [ $fieldname ] [ 'default' ] = ($i == 0) ;
-			}
-		}
-		// Add the reserved fields back in to the end of the default fields in the layout
-		// ASSUMPTION: reserved fields go back at the end
-		// First, load the reserved fields - we cannot assume that getDefaultFields has been called earlier when saving
-		$this->getDefaultFields();
-		foreach ( $this->reserved as $key => $def)
-		{
-		    $fields[ $key ] = $def;
-		}
+    function getField ( $fieldName )
+    {
+        $fieldName = strtolower ( $fieldName ) ;
+        foreach ( $this->listViewDefs as $key => $def )
+        {
+            $key = strtolower ( $key ) ;
+            if ($key == $fieldName)
+            {
+                return $def ;
+            }
+        }
+        foreach ( $this->module->field_defs as $key => $def )
+        {
+            $key = strtolower ( $key ) ;
+            if ($key == $fieldName)
+            {
+                return $def ;
+            }
+        }
+        return array ( ) ;
+    }
+    function addRelateData($fieldname, $listfielddef) {
+        $modFieldDef = $this->module->field_defs [ strtolower ( $fieldname ) ];
+        if (!empty($modFieldDef['module']) && !empty($modFieldDef['id_name'])) {
+            $listfielddef['module'] = $modFieldDef['module'];
+            $listfielddef['id'] = strtoupper($modFieldDef['id_name']);
+            $listfielddef['link'] = true;
+            $listfielddef['related_fields'] = array (strtolower($modFieldDef['id_name']));
+        }
+        return $listfielddef;
+    }
+    function _loadLayoutFromRequest ()
+    {
+        $GLOBALS['log']->debug("ParserModifyListView->_loadLayoutFromRequest()");
+        $fields = array ( ) ;
+        $rejectTypes = array ( 'html' , 'enum' , 'text' ) ;
+        for ( $i = 0 ; isset ( $_POST [ 'group_' . $i ] ) && $i < 2 ; $i ++ )
+        {
+            //echo "\n***group-$i Size:".sizeof($_POST['group_' . $i])."\n";
+            foreach ( $_POST [ 'group_' . $i ] as $field )
+            {
+                $fieldname = strtoupper ( $field ) ;
+                //originalListViewDefs are all lower case
+                $lowerFieldName = strtolower ( $field ) ;
+                if (isset ( $this->originalListViewDefs [ $lowerFieldName ] ))
+                {
+                    $fields [ $fieldname ] = $this->originalListViewDefs [ $lowerFieldName ] ;
+                } else
+                {
+                    //check if we have the case wrong for custom fields
+                    if (! isset ( $this->module->field_defs [ $fieldname ] ))
+                    {
+                        foreach ( $this->module->field_defs as $key => $value )
+                        {
+                            if (strtoupper ( $key ) == $fieldname)
+                            {
+                                $fields [ $fieldname ] = array ( 'width' => 10 , 'label' => $this->module->field_defs [ $key ] [ 'vname' ] ) ;
+                                break ;
+                            }
+                        }
+                    } else
+                    {
+                        $fields [ $fieldname ] = array ( 'width' => 10 , 'label' => $this->module->field_defs [ $fieldname ] [ 'vname' ] ) ;
+                    }
+                    // sorting fields of certain types will cause a database engine problems
+                    // we only check this for custom fields, as we assume that OOB fields have been independently confirmed as ok
+                    if (isset ( $this->module->field_defs [ strtolower ( $fieldname ) ] ) && (in_array ( $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ], $rejectTypes ) || isset($this->module->field_defs [ strtolower ( $fieldname ) ]['custom_module'])))
+                    {
+                        $fields [ $fieldname ] [ 'sortable' ] = false ;
+                    }
+                    // Bug 23728 - Make adding a currency type field default to setting the 'currency_format' to true
+                    if (isset ( $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type ' ] ) && $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ] == 'currency') 
+                    {
+                        $fields [ $fieldname ] [ 'currency_format' ] = true;
+                    }
+                }
+                if (isset ( $_REQUEST [ strtolower ( $fieldname ) . 'width' ] ))
+                {
+                    $width = substr ( $_REQUEST [ strtolower ( $fieldname ) . 'width' ], 6, 3 ) ;
+                    if (strpos ( $width, "%" ) !== false)
+                    {
+                        $width = substr ( $width, 0, 2 ) ;
+                    }
+                    if ($width < 101 && $width > 0)
+                    {
+                        $fields [ $fieldname ] [ 'width' ] = $width ;
+                    }
+                } else if (isset ( $this->listViewDefs [ $fieldname ] [ 'width' ] ))
+                {
+                    $fields [ $fieldname ] [ 'width' ] = $this->listViewDefs [ $fieldname ] [ 'width' ] ;
+                }
+                //Get additional Data for relate fields
+                if (isset($this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ]) && $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ] == 'relate') {
+                    $fields [ $fieldname ] = $this->addRelateData($field, $fields [ $fieldname ]);
+                }
+                $fields [ $fieldname ] [ 'default' ] = ($i == 0) ;
+            }
+        }
+        // Add the reserved fields back in to the end of the default fields in the layout
+        // ASSUMPTION: reserved fields go back at the end
+        // First, load the reserved fields - we cannot assume that getDefaultFields has been called earlier when saving
+        $this->getDefaultFields();
+        foreach ( $this->reserved as $key => $def)
+        {
+            $fields[ $key ] = $def;
+        }
 		
-		return $fields ;
-	}
-	function handleSave ()
-	{
-		$fields = $this->_loadLayoutFromRequest();
-		$this->_writeToFile($this->customFile,'ListView',$this->module_name,$fields,$this->_variables);
+        return $fields ;
+    }
+    function handleSave ()
+    {
+        $fields = $this->_loadLayoutFromRequest();
+        $this->_writeToFile($this->customFile,'ListView',$this->module_name,$fields,$this->_variables);
 
-		$GLOBALS [ "listViewDefs" ] [ $this->module_name ] = $fields ;
-		// now clear the cache so that the results are immediately visible
-		include_once ('include/TemplateHandler/TemplateHandler.php') ;
-		TemplateHandler::clearCache ( $this->module_name, "ListView.tpl" ) ; // not currently cached, but here for the future
-	}
+        $GLOBALS [ "listViewDefs" ] [ $this->module_name ] = $fields ;
+        // now clear the cache so that the results are immediately visible
+        include_once ('include/TemplateHandler/TemplateHandler.php') ;
+        TemplateHandler::clearCache ( $this->module_name, "ListView.tpl" ) ; // not currently cached, but here for the future
+    }
 }
 ?>

Spacing +119 added lines, -119 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
-die ( 'Not A Valid Entry Point' ) ;
+if (!defined('sugarEntry') || !sugarEntry)
+die ('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,43 +40,43 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php') ;
+require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
 class ParserModifyListView extends ModuleBuilderParser
 {
-	var $listViewDefs = false ;
-	var $defaults = array ( ) ;
-	var $additional = array ( ) ;
-	var $available = array ( ) ;
+	var $listViewDefs = false;
+	var $defaults = array( );
+	var $additional = array( );
+	var $available = array( );
 	var $reserved = array(); // fields marked by 'studio'=>false in the listviewdefs; need to be preserved
 	//	var $language_module = '';
-	var $columns = array ( 'LBL_DEFAULT' => 'getDefaultFields' , 'LBL_AVAILABLE' => 'getAdditionalFields' , 'LBL_HIDDEN' => 'getAvailableFields' ) ;
-	function init ( $module_name , $submodule = '' )
+	var $columns = array('LBL_DEFAULT' => 'getDefaultFields', 'LBL_AVAILABLE' => 'getAdditionalFields', 'LBL_HIDDEN' => 'getAvailableFields');
+	function init($module_name, $submodule = '')
 	{
-		global $app_list_strings ;
-		$this->module_name = $module_name ;
-		$mod_strings = return_module_language ( $GLOBALS [ 'current_language' ], $this->module_name ) ; // needed solely so that listviewdefs that reference this can be included without error
-		$class = $GLOBALS [ 'beanList' ] [ $this->module_name ] ;
-		require_once ($GLOBALS [ 'beanFiles' ] [ $class ]) ;
-		$this->module = new $class ( ) ;
+		global $app_list_strings;
+		$this->module_name = $module_name;
+		$mod_strings = return_module_language($GLOBALS ['current_language'], $this->module_name); // needed solely so that listviewdefs that reference this can be included without error
+		$class = $GLOBALS ['beanList'] [$this->module_name];
+		require_once ($GLOBALS ['beanFiles'] [$class]);
+		$this->module = new $class( );
 
-		$loaded = $this->_loadFromFile('ListView','modules/' . $this->module_name . '/metadata/listviewdefs.php',$this->module_name);
-		$this->originalListViewDefs = $loaded['viewdefs'] [ $this->module_name ] ;
+		$loaded = $this->_loadFromFile('ListView', 'modules/'.$this->module_name.'/metadata/listviewdefs.php', $this->module_name);
+		$this->originalListViewDefs = $loaded['viewdefs'] [$this->module_name];
 		$this->_variables = $loaded['variables'];
 		//		_pp($loaded);
-		$this->customFile = 'custom/modules/' . $this->module_name . '/metadata/listviewdefs.php' ;
-		if (file_exists ( $this->customFile ))
+		$this->customFile = 'custom/modules/'.$this->module_name.'/metadata/listviewdefs.php';
+		if (file_exists($this->customFile))
 		{
-			$loaded = $this->_loadFromFile('ListView',$this->customFile,$this->module_name);
-			$this->listViewDefs = $loaded['viewdefs'] [ $this->module_name ] ;
+			$loaded = $this->_loadFromFile('ListView', $this->customFile, $this->module_name);
+			$this->listViewDefs = $loaded['viewdefs'] [$this->module_name];
 			$this->_variables = $loaded['variables'];
 		} else
 		{
-			$this->listViewDefs = & $this->originalListViewDefs ;
+			$this->listViewDefs = & $this->originalListViewDefs;
 		}
 
-		$this->fixKeys ( $this->originalListViewDefs ) ;
-		$this->fixKeys ( $this->listViewDefs ) ;
-		$this->language_module = $this->module_name ;
+		$this->fixKeys($this->originalListViewDefs);
+		$this->fixKeys($this->listViewDefs);
+		$this->language_module = $this->module_name;
 	}
 	
 	function getLanguage()
@@ -84,102 +84,102 @@ 
 	    return $this->language_module;
 	}
 	// re-key array so that every entry has a key=name and all keys are lowercase - makes it easier in handleSave() later...
-	function fixKeys ( &$defs )
+	function fixKeys(&$defs)
 	{
-		$temp = array ( ) ;
-		foreach ( $defs as $key => $value )
+		$temp = array( );
+		foreach ($defs as $key => $value)
 		{
-			if (! is_array ( $value ))
+			if (!is_array($value))
 			{
-				$key = $value ;
-				$def = array ( ) ;
-				$def [ 'name' ] = (isset ( $this->module->field_defs [ $key ] )) ? $this->module->field_defs [ $key ] [ 'name' ] : $key ;
-				$value = $def ;
+				$key = $value;
+				$def = array( );
+				$def ['name'] = (isset ($this->module->field_defs [$key])) ? $this->module->field_defs [$key] ['name'] : $key;
+				$value = $def;
 			}
-			if (isset ( $value [ 'name' ] ))
+			if (isset ($value ['name']))
 			{
-				$key = $value [ 'name' ] ; // override key with name, needed when the entry lacks a key
+				$key = $value ['name']; // override key with name, needed when the entry lacks a key
 			}
-			$temp [ strtolower ( $key ) ] = $value ;
+			$temp [strtolower($key)] = $value;
 		}
-		$defs = $temp ;
+		$defs = $temp;
 	}
 	
 	/**
 	 * returns the default fields for a listview
 	 * Called only when displaying the listview for editing; not called when saving
 	 */
-	function getDefaultFields ()
+	function getDefaultFields()
 	{
-		$this->defaults = array ( ) ;
-		foreach ( $this->listViewDefs as $key => $def )
+		$this->defaults = array( );
+		foreach ($this->listViewDefs as $key => $def)
 		{
 		    // add in the default fields from the listviewdefs, stripping out any field with 'studio' set to a value other than true
 		    // Important: the 'studio' fields must be added back into the layout on save, as they're not editable rather than hidden
-			if (! empty ( $def [ 'default' ] ))
+			if (!empty ($def ['default']))
 			{
-			    if (! isset($def['studio']) || $def['studio'] === true)
+			    if (!isset($def['studio']) || $def['studio'] === true)
 			    {
-			        $this->defaults [ $key ] = $def ;
+			        $this->defaults [$key] = $def;
 			    }
 			    else
 			    // anything which doesn't go into the defaults is a reserved field - this makes sure we don't miss anything
 			    {
-			        $this->reserved [ $key ] = $def;
+			        $this->reserved [$key] = $def;
 			    }
 			}
 		}
-		return $this->defaults ;
+		return $this->defaults;
 	}
 	/**
 	 * returns additional fields available for users to create fields
 	 */
-	function getAdditionalFields ()
+	function getAdditionalFields()
 	{
-		$this->additional = array ( ) ;
-		foreach ( $this->listViewDefs as $key => $def )
+		$this->additional = array( );
+		foreach ($this->listViewDefs as $key => $def)
 		{
-			if (empty ( $def [ 'default' ] ))
+			if (empty ($def ['default']))
 			{
-				$key = strtolower ( $key ) ;
-				$this->additional [ $key ] = $def ;
+				$key = strtolower($key);
+				$this->additional [$key] = $def;
 			}
 		}
-		return $this->additional ;
+		return $this->additional;
 	}
 	/**
 	 * returns unused fields that are available for using in either default or additional list views
 	 */
-	function getAvailableFields ()
+	function getAvailableFields()
 	{
-		$this->availableFields = array ( ) ;
-		$lowerFieldList = array_change_key_case ( $this->listViewDefs ) ;
-		foreach ( $this->originalListViewDefs as $key => $def )
+		$this->availableFields = array( );
+		$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));
+		$GLOBALS['log']->debug('parser.modifylistview.php->getAvailableFields(): field_defs='.print_r($this->availableFields, true));
 		$modFields = !empty($this->module->field_name_map) ? $this->module->field_name_map : $this->module->field_defs;
-		foreach ( $modFields as $key => $def )
+		foreach ($modFields as $key => $def)
 		{
-			$fieldName = strtolower ( $key ) ;
+			$fieldName = strtolower($key);
             if ($fieldName == 'currency_id')
                 continue;
-			if (!isset ( $lowerFieldList [ $fieldName ] )) // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
+			if (!isset ($lowerFieldList [$fieldName])) // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
 			{
             // bug 19656: this test changed after 5.0.0b - we now remove all ID type fields - whether set as type, or dbtype, from the fielddefs
-            if ($this->isValidField($key, $def)){
-					$label = (isset ( $def [ 'vname' ] )) ? $def [ 'vname' ] : (isset($def [ 'label' ]) ? $def['label'] : $def['name']) ;
-					$this->availableFields [ $fieldName ] = array ( 'width' => '10' , 'label' => $label ) ;
+            if ($this->isValidField($key, $def)) {
+					$label = (isset ($def ['vname'])) ? $def ['vname'] : (isset($def ['label']) ? $def['label'] : $def['name']);
+					$this->availableFields [$fieldName] = array('width' => '10', 'label' => $label);
 				}
 			}
 		}
 
-		return $this->availableFields ;
+		return $this->availableFields;
 	}
 
     function getFieldDefs()
@@ -190,19 +190,19 @@ 
 	
 	function isValidField($key, $def) {
 	    //Allow fields that are studio visible  
-		if (! empty ( $def [ 'studio' ] ) && $def [ 'studio' ] == 'visible')
+		if (!empty ($def ['studio']) && $def ['studio'] == 'visible')
 		  return true;
 		  
 		//No ID fields
-		if  ((!empty ( $def [ 'dbType' ] ) && $def [ 'dbType' ] == 'id') || (!empty ( $def [ 'type' ] ) && $def [ 'type' ] == 'id'))
+		if ((!empty ($def ['dbType']) && $def ['dbType'] == 'id') || (!empty ($def ['type']) && $def ['type'] == 'id'))
 		  return false;
 		  
 		//only allow DB and custom fields (if a source is specified)
-	    if (!empty($def [ 'source' ]) && $def [ 'source' ] != 'db' && $def [ 'source' ] != 'custom_fields')
+	    if (!empty($def ['source']) && $def ['source'] != 'db' && $def ['source'] != 'custom_fields')
 		  return false;
 
 		//Dont ever show the "deleted" fields or "_name" fields
-		if (strcmp ( $key, 'deleted' ) == 0 || (isset ( $def [ 'name' ] ) && strpos ( $def [ 'name' ], "_name" ) !== false))
+		if (strcmp($key, 'deleted') == 0 || (isset ($def ['name']) && strpos($def ['name'], "_name") !== false))
 	       return false;
 
 	    //If none of the "ifs" are true, the field is valid
@@ -210,124 +210,124 @@ 
 	}
 	
 	
-	function getField ( $fieldName )
+	function getField($fieldName)
 	{
-		$fieldName = strtolower ( $fieldName ) ;
-		foreach ( $this->listViewDefs as $key => $def )
+		$fieldName = strtolower($fieldName);
+		foreach ($this->listViewDefs as $key => $def)
 		{
-			$key = strtolower ( $key ) ;
+			$key = strtolower($key);
 			if ($key == $fieldName)
 			{
-				return $def ;
+				return $def;
 			}
 		}
-		foreach ( $this->module->field_defs as $key => $def )
+		foreach ($this->module->field_defs as $key => $def)
 		{
-			$key = strtolower ( $key ) ;
+			$key = strtolower($key);
 			if ($key == $fieldName)
 			{
-				return $def ;
+				return $def;
 			}
 		}
-		return array ( ) ;
+		return array( );
 	}
 	function addRelateData($fieldname, $listfielddef) {
-		$modFieldDef = $this->module->field_defs [ strtolower ( $fieldname ) ];
+		$modFieldDef = $this->module->field_defs [strtolower($fieldname)];
 		if (!empty($modFieldDef['module']) && !empty($modFieldDef['id_name'])) {
 			$listfielddef['module'] = $modFieldDef['module'];
 			$listfielddef['id'] = strtoupper($modFieldDef['id_name']);
 			$listfielddef['link'] = true;
-			$listfielddef['related_fields'] = array (strtolower($modFieldDef['id_name']));
+			$listfielddef['related_fields'] = array(strtolower($modFieldDef['id_name']));
 		}
 		return $listfielddef;
 	}
-	function _loadLayoutFromRequest ()
+	function _loadLayoutFromRequest()
 	{
 	    $GLOBALS['log']->debug("ParserModifyListView->_loadLayoutFromRequest()");
-		$fields = array ( ) ;
-		$rejectTypes = array ( 'html' , 'enum' , 'text' ) ;
-		for ( $i = 0 ; isset ( $_POST [ 'group_' . $i ] ) && $i < 2 ; $i ++ )
+		$fields = array( );
+		$rejectTypes = array('html', 'enum', 'text');
+		for ($i = 0; isset ($_POST ['group_'.$i]) && $i < 2; $i++)
 		{
 			//echo "\n***group-$i Size:".sizeof($_POST['group_' . $i])."\n";
-			foreach ( $_POST [ 'group_' . $i ] as $field )
+			foreach ($_POST ['group_'.$i] as $field)
 			{
-				$fieldname = strtoupper ( $field ) ;
+				$fieldname = strtoupper($field);
 				//originalListViewDefs are all lower case
-				$lowerFieldName = strtolower ( $field ) ;
-				if (isset ( $this->originalListViewDefs [ $lowerFieldName ] ))
+				$lowerFieldName = strtolower($field);
+				if (isset ($this->originalListViewDefs [$lowerFieldName]))
 				{
-					$fields [ $fieldname ] = $this->originalListViewDefs [ $lowerFieldName ] ;
+					$fields [$fieldname] = $this->originalListViewDefs [$lowerFieldName];
 				} else
 				{
 					//check if we have the case wrong for custom fields
-					if (! isset ( $this->module->field_defs [ $fieldname ] ))
+					if (!isset ($this->module->field_defs [$fieldname]))
 					{
-						foreach ( $this->module->field_defs as $key => $value )
+						foreach ($this->module->field_defs as $key => $value)
 						{
-							if (strtoupper ( $key ) == $fieldname)
+							if (strtoupper($key) == $fieldname)
 							{
-								$fields [ $fieldname ] = array ( 'width' => 10 , 'label' => $this->module->field_defs [ $key ] [ 'vname' ] ) ;
-								break ;
+								$fields [$fieldname] = array('width' => 10, 'label' => $this->module->field_defs [$key] ['vname']);
+								break;
 							}
 						}
 					} else
 					{
-						$fields [ $fieldname ] = array ( 'width' => 10 , 'label' => $this->module->field_defs [ $fieldname ] [ 'vname' ] ) ;
+						$fields [$fieldname] = array('width' => 10, 'label' => $this->module->field_defs [$fieldname] ['vname']);
 					}
 					// sorting fields of certain types will cause a database engine problems
 					// we only check this for custom fields, as we assume that OOB fields have been independently confirmed as ok
-					if (isset ( $this->module->field_defs [ strtolower ( $fieldname ) ] ) && (in_array ( $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ], $rejectTypes ) || isset($this->module->field_defs [ strtolower ( $fieldname ) ]['custom_module'])))
+					if (isset ($this->module->field_defs [strtolower($fieldname)]) && (in_array($this->module->field_defs [strtolower($fieldname)] ['type'], $rejectTypes) || isset($this->module->field_defs [strtolower($fieldname)]['custom_module'])))
 					{
-						$fields [ $fieldname ] [ 'sortable' ] = false ;
+						$fields [$fieldname] ['sortable'] = false;
 					}
 					// Bug 23728 - Make adding a currency type field default to setting the 'currency_format' to true
-					if (isset ( $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type ' ] ) && $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ] == 'currency') 
+					if (isset ($this->module->field_defs [strtolower($fieldname)] ['type ']) && $this->module->field_defs [strtolower($fieldname)] ['type'] == 'currency') 
 					{
-						$fields [ $fieldname ] [ 'currency_format' ] = true;
+						$fields [$fieldname] ['currency_format'] = true;
 					}
 				}
-				if (isset ( $_REQUEST [ strtolower ( $fieldname ) . 'width' ] ))
+				if (isset ($_REQUEST [strtolower($fieldname).'width']))
 				{
-					$width = substr ( $_REQUEST [ strtolower ( $fieldname ) . 'width' ], 6, 3 ) ;
-					if (strpos ( $width, "%" ) !== false)
+					$width = substr($_REQUEST [strtolower($fieldname).'width'], 6, 3);
+					if (strpos($width, "%") !== false)
 					{
-						$width = substr ( $width, 0, 2 ) ;
+						$width = substr($width, 0, 2);
 					}
 					if ($width < 101 && $width > 0)
 					{
-						$fields [ $fieldname ] [ 'width' ] = $width ;
+						$fields [$fieldname] ['width'] = $width;
 					}
-				} else if (isset ( $this->listViewDefs [ $fieldname ] [ 'width' ] ))
+				} else if (isset ($this->listViewDefs [$fieldname] ['width']))
 				{
-					$fields [ $fieldname ] [ 'width' ] = $this->listViewDefs [ $fieldname ] [ 'width' ] ;
+					$fields [$fieldname] ['width'] = $this->listViewDefs [$fieldname] ['width'];
 				}
 				//Get additional Data for relate fields
-				if (isset($this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ]) && $this->module->field_defs [ strtolower ( $fieldname ) ] [ 'type' ] == 'relate') {
-					$fields [ $fieldname ] = $this->addRelateData($field, $fields [ $fieldname ]);
+				if (isset($this->module->field_defs [strtolower($fieldname)] ['type']) && $this->module->field_defs [strtolower($fieldname)] ['type'] == 'relate') {
+					$fields [$fieldname] = $this->addRelateData($field, $fields [$fieldname]);
 				}
-				$fields [ $fieldname ] [ 'default' ] = ($i == 0) ;
+				$fields [$fieldname] ['default'] = ($i == 0);
 			}
 		}
 		// Add the reserved fields back in to the end of the default fields in the layout
 		// ASSUMPTION: reserved fields go back at the end
 		// First, load the reserved fields - we cannot assume that getDefaultFields has been called earlier when saving
 		$this->getDefaultFields();
-		foreach ( $this->reserved as $key => $def)
+		foreach ($this->reserved as $key => $def)
 		{
-		    $fields[ $key ] = $def;
+		    $fields[$key] = $def;
 		}
 		
-		return $fields ;
+		return $fields;
 	}
-	function handleSave ()
+	function handleSave()
 	{
 		$fields = $this->_loadLayoutFromRequest();
-		$this->_writeToFile($this->customFile,'ListView',$this->module_name,$fields,$this->_variables);
+		$this->_writeToFile($this->customFile, 'ListView', $this->module_name, $fields, $this->_variables);
 
-		$GLOBALS [ "listViewDefs" ] [ $this->module_name ] = $fields ;
+		$GLOBALS ["listViewDefs"] [$this->module_name] = $fields;
 		// now clear the cache so that the results are immediately visible
-		include_once ('include/TemplateHandler/TemplateHandler.php') ;
-		TemplateHandler::clearCache ( $this->module_name, "ListView.tpl" ) ; // not currently cached, but here for the future
+		include_once ('include/TemplateHandler/TemplateHandler.php');
+		TemplateHandler::clearCache($this->module_name, "ListView.tpl"); // not currently cached, but here for the future
 	}
 }
 ?>

Braces +22 added lines, -15 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
-die ( 'Not A Valid Entry Point' ) ;
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
+    die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -121,8 +122,7 @@ 
 			    if (! isset($def['studio']) || $def['studio'] === true)
 			    {
 			        $this->defaults [ $key ] = $def ;
-			    }
-			    else
+			    } else
 			    // anything which doesn't go into the defaults is a reserved field - this makes sure we don't miss anything
 			    {
 			        $this->reserved [ $key ] = $def;
@@ -167,13 +167,16 @@ 
 		foreach ( $modFields as $key => $def )
 		{
 			$fieldName = strtolower ( $key ) ;
-            if ($fieldName == 'currency_id')
-                continue;
-			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 ($fieldName == 'currency_id') {
+                            continue;
+            }
+			if (!isset ( $lowerFieldList [ $fieldName ] )) {
+			    // bug 16728 - check this first, so that other conditions (e.g., studio == visible) can't override and add duplicate entries
 			{
             // bug 19656: this test changed after 5.0.0b - we now remove all ID type fields - whether set as type, or dbtype, from the fielddefs
             if ($this->isValidField($key, $def)){
 					$label = (isset ( $def [ 'vname' ] )) ? $def [ 'vname' ] : (isset($def [ 'label' ]) ? $def['label'] : $def['name']) ;
+			}
 					$this->availableFields [ $fieldName ] = array ( 'width' => '10' , 'label' => $label ) ;
 				}
 			}
@@ -190,20 +193,24 @@ 
 	
 	function isValidField($key, $def) {
 	    //Allow fields that are studio visible  
-		if (! empty ( $def [ 'studio' ] ) && $def [ 'studio' ] == 'visible')
-		  return true;
+		if (! empty ( $def [ 'studio' ] ) && $def [ 'studio' ] == 'visible') {
+				  return true;
+		}
 		  
 		//No ID fields
-		if  ((!empty ( $def [ 'dbType' ] ) && $def [ 'dbType' ] == 'id') || (!empty ( $def [ 'type' ] ) && $def [ 'type' ] == 'id'))
-		  return false;
+		if  ((!empty ( $def [ 'dbType' ] ) && $def [ 'dbType' ] == 'id') || (!empty ( $def [ 'type' ] ) && $def [ 'type' ] == 'id')) {
+				  return false;
+		}
 		  
 		//only allow DB and custom fields (if a source is specified)
-	    if (!empty($def [ 'source' ]) && $def [ 'source' ] != 'db' && $def [ 'source' ] != 'custom_fields')
-		  return false;
+	    if (!empty($def [ 'source' ]) && $def [ 'source' ] != 'db' && $def [ 'source' ] != 'custom_fields') {
+	    		  return false;
+	    }
 
 		//Dont ever show the "deleted" fields or "_name" fields
-		if (strcmp ( $key, 'deleted' ) == 0 || (isset ( $def [ 'name' ] ) && strpos ( $def [ 'name' ], "_name" ) !== false))
-	       return false;
+		if (strcmp ( $key, 'deleted' ) == 0 || (isset ( $def [ 'name' ] ) && strpos ( $def [ 'name' ], "_name" ) !== false)) {
+			       return false;
+		}
 
 	    //If none of the "ifs" are true, the field is valid
 	    return true;