adamjakab / SuiteCRM

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

modules/ModuleBuilder/parsers/parser.modifylayoutview.php

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

modules/SchedulersJobs/field_arrays.php

Spacing +5 added lines, -5 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,8 +39,8 @@ 
  ********************************************************************************/
 
 
-$fields_array['Schedulers_jobs'] = array (
-	'column_fields' => array (
+$fields_array['Schedulers_jobs'] = array(
+	'column_fields' => array(
 		'id',
 		'deleted',
 		'date_entered',
@@ -49,12 +49,12 @@ 
 		'execute_time',
 		'status',
 	),
-	'list_fields' => array (
+	'list_fields' => array(
 		'id',
 		'job_id',
 		'execute_time'
 	),
-	'required_fields' => array (
+	'required_fields' => array(
 		'job_id' => 1,
 		'execute_time' => 1
 	)

modules/Import/maps/ImportMapGoogle.php

Spacing +5 added lines, -5 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.
@@ -86,13 +86,13 @@ 
              'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
 
              'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
-             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
+             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP', 'sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
             );
 
-        if($module == 'Users')
+        if ($module == 'Users')
         {
-            $return_array['status'] =  array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
-            $return_array['full_name'] =  array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
+            $return_array['status'] = array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
+            $return_array['full_name'] = array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
         }
         return $return_array;
     }

modules/Import/maps/ImportMapSalesforce.php

Spacing +2 added lines, -2 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.
@@ -158,7 +158,7 @@ 
 		$module
 		)
 	{
-		return array_merge(parent::getIgnoredFields($module),array('id'));
+		return array_merge(parent::getIgnoredFields($module), array('id'));
 	}
 }
 

modules/Import/maps/ImportMapOther.php

Spacing +2 added lines, -2 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.
@@ -126,7 +126,7 @@ 
             break;
         case 'Opportunities':
             return array(
-                "Opportunity Name"=>"name" ,
+                "Opportunity Name"=>"name",
                 "Type"=>"opportunity_type",
                 "Lead Source"=>"lead_source",
                 "Amount"=>"amount",

modules/Import/maps/ImportMap.php

Spacing +38 added lines, -38 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.
@@ -107,11 +107,11 @@ 
     public function getMapping()
     {
         $mapping_arr = array();
-        if ( !empty($this->content) )
+        if (!empty($this->content))
         {
-            $pairs = explode("&",$this->content);
-            foreach ($pairs as $pair){
-                list($name,$value) = explode("=",$pair);
+            $pairs = explode("&", $this->content);
+            foreach ($pairs as $pair) {
+                list($name, $value) = explode("=", $pair);
                 $mapping_arr[trim($name)] = $value;
             }
         }
@@ -128,7 +128,7 @@ 
         $mapping_arr
         )
     {
-        $output = array ();
+        $output = array();
         foreach ($mapping_arr as $key => $item) {
             $output[] = "$key=$item";
         }
@@ -143,11 +143,11 @@ 
     public function getDefaultValues()
     {
         $defa_arr = array();
-        if ( !empty($this->default_values) )
+        if (!empty($this->default_values))
         {
-            $pairs = explode("&",$this->default_values);
-            foreach ($pairs as $pair){
-                list($name,$value) = explode("=",$pair);
+            $pairs = explode("&", $this->default_values);
+            foreach ($pairs as $pair) {
+                list($name, $value) = explode("=", $pair);
                 $defa_arr[trim($name)] = $value;
             }
         }
@@ -164,7 +164,7 @@ 
         $defa_arr
         )
     {
-        $output = array ();
+        $output = array();
         foreach ($defa_arr as $key => $item) {
             $output[] = "$key=$item";
         }
@@ -174,15 +174,15 @@ 
     /**
      * @see SugarBean::retrieve()
      */
-    public function retrieve($id = -1, $encode=true,$deleted=true)
+    public function retrieve($id = -1, $encode = true, $deleted = true)
 	{
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
+	    $returnVal = parent::retrieve($id, $encode, $deleted);
 
-	    if ( !($returnVal instanceOf $this) ) {
+	    if (!($returnVal instanceOf $this)) {
 	        return $returnVal;
 	    }
 
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
+	    if ($this->source == 'tab' && $this->delimiter == '') {
 	        $this->delimiter = "\t";
 	    }
 
@@ -227,7 +227,7 @@ 
 
         // Bug 23354 - Make sure enclosure gets saved as an empty string if
         // it is an empty string, instead of as a null
-        if ( strlen($enclosure) <= 0 ) $enclosure = ' ';
+        if (strlen($enclosure) <= 0) $enclosure = ' ';
 
         $this->assigned_user_id = $owner_id;
         $this->name             = $name;
@@ -242,7 +242,7 @@ 
         parent::save();
 
         // Bug 29365 - The enclosure character isn't saved correctly if it's a tab using MssqlManager, so resave it
-        if ( $enclosure == '\\t' && $this->db instanceOf MssqlManager ) {
+        if ($enclosure == '\\t' && $this->db instanceOf MssqlManager) {
             $this->enclosure = $enclosure;
             parent::save();
         }
@@ -262,11 +262,11 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) ) {
+        if (!is_admin($current_user)) {
             $other_map = new ImportMap();
             $other_map->retrieve_by_string_fields(array('id'=> $id), false);
 
-            if ( $other_map->assigned_user_id != $current_user->id )
+            if ($other_map->assigned_user_id != $current_user->id)
                 return false;
         }
 
@@ -287,7 +287,7 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) )
+        if (!is_admin($current_user))
             return false;
 
         // check for problems
@@ -313,16 +313,16 @@ 
         $other_map->retrieve_by_string_fields($query_arr, false);
 
         // if we find this other map, quit
-        if ( isset($other_map->id) )
+        if (isset($other_map->id))
             return false;
 
         // otherwise update the is_published flag
         $query = "UPDATE $this->table_name
-                    SET is_published = '". ($flag?'yes':'no') . "',
+                    SET is_published = '".($flag ? 'yes' : 'no')."',
                         assigned_user_id = '$user_id'
                     WHERE id = '{$this->id}'";
 
-        $this->db->query($query,true,"Error marking import map published: ");
+        $this->db->query($query, true, "Error marking import map published: ");
 
         return true;
     }
@@ -339,21 +339,21 @@ 
     {
         $query = "SELECT *
                     FROM {$this->table_name}
-                    " . $this->get_where($fields_array);
+                    ".$this->get_where($fields_array);
 
-        $result = $this->db->query($query,true," Error: ");
+        $result = $this->db->query($query, true, " Error: ");
         $obj_arr = array();
 
-        while ($row = $this->db->fetchByAssoc($result,FALSE) ) {
+        while ($row = $this->db->fetchByAssoc($result, FALSE)) {
             $focus = new ImportMap();
 
-            foreach($this->column_fields as $field) {
-                if(isset($row[$field])) {
+            foreach ($this->column_fields as $field) {
+                if (isset($row[$field])) {
                     $focus->$field = $row[$field];
                 }
             }
             $focus->fill_in_additional_detail_fields();
-            $obj_arr[]=$focus;
+            $obj_arr[] = $focus;
         }
 
         return $obj_arr;
@@ -376,37 +376,37 @@ 
         //step2
            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
          //step3
-            'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
+            'display_tabs_def', 'custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',
         '   importlocale_default_locale_name_format');
 
         //retrieve user preferences and populate preference array
         $preference_values_str = $current_user->getPreference('field_values', 'import');
-        $preference_values = json_decode($preference_values_str,true);
+        $preference_values = json_decode($preference_values_str, true);
 
-        foreach ($import_step_fields as $val){
+        foreach ($import_step_fields as $val) {
             //overwrite preference array with new values from request if the value is different or new
-            if((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])){
+            if ((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])) {
                 $preference_values[$val] = $_REQUEST[$val];
                 $set = true;
             }
         }
 
         //force the values to passed in array if array is set
-        if(!empty($ForceValsArr) && is_array($ForceValsArr)){
-            foreach ($ForceValsArr as $forceKey=>$forceVal){
+        if (!empty($ForceValsArr) && is_array($ForceValsArr)) {
+            foreach ($ForceValsArr as $forceKey=>$forceVal) {
                 $preference_values[$forceKey] = $forceVal;
                 $set = true;
             }
         }
 
         //set preferences if any changes were made and return the new array
-        if($set){
-            $preference_values_str =  json_encode($preference_values);
+        if ($set) {
+            $preference_values_str = json_encode($preference_values);
             $current_user->setPreference('field_values', $preference_values_str, 0, 'import');
         }
-        if(empty($preference_values)){
+        if (empty($preference_values)) {
             return array();
         }
 

modules/Cases/metadata/accountsquickcreatedefs.php

Spacing +9 added lines, -9 removed lines

@@ -39,9 +39,9 @@ 
 
 $viewdefs['Cases']['AccountsQuickCreate'] = array(
 'templateMeta' => array('form' => 
-                            array (
+                            array(
                               'hidden' => 
-                              array (
+                              array(
                                 0 => '<input type="hidden" name="account_id" value="{$smarty.request.account_id}">',
                                 1 => '<input type="hidden" name="account_name" value="{$smarty.request.account_name}">',
                               ),
@@ -54,22 +54,22 @@ 
                        ),
 'panels' =>
 
-array (
+array(
   
-  array (
-    array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
+  array(
+    array('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
     'priority'
   ),
   
-  array (
+  array(
     'status',
     array('name'=>'account_name', 'type'=>'readonly'),
   ),
   
-  array (
-    array (
+  array(
+    array(
       'name' => 'description',
-      'displayParams' => array ('rows' => '4','cols' => '60'),
+      'displayParams' => array('rows' => '4', 'cols' => '60'),
       'nl2br' => true,
     ),
   ),

modules/Cases/metadata/additionalDetails.php

Spacing +8 added lines, -8 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.
@@ -43,21 +43,21 @@ 
 }
 function additionalDetailsaCase($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Cases');
 	}
 		
 	$overlib_string = '';
 		
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 		$overlib_string .= '<br>';
 	}
-	if(!empty($fields['RESOLUTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['RESOLUTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_RESOLUTION'].'</b> '.substr($fields['RESOLUTION'], 0, 300);
+		if (strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
 	}		
 	
 	return array('fieldToAddTo' => 'NAME',