adamjakab / SuiteCRM

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;

modules/AOR_Fields/vardefs.php

Spacing +20 added lines, -20 removed lines

@@ -26,9 +26,9 @@ 
 	'table'=>'aor_fields',
 	'audited'=>false,
 	'duplicate_merge'=>true,
-	'fields'=>array (
+	'fields'=>array(
         'aor_report_id' =>
-        array (
+        array(
             'required' => false,
             'name' => 'aor_report_id',
             'vname' => 'LBL_AOR_REPORT_ID',
@@ -47,7 +47,7 @@ 
             'size' => '20',
         ),
         'field_order' =>
-        array (
+        array(
             'required' => false,
             'name' => 'field_order',
             'vname' => 'LBL_ORDER',
@@ -68,14 +68,14 @@ 
             'disable_num_format' => '',
         ),
         'module_path' =>
-        array (
+        array(
             'name' => 'module_path',
             'type' => 'longtext',
             'vname' => 'LBL_MODULE_PATH',
             'isnull' => true,
         ),
         'field' =>
-        array (
+        array(
             'required' => false,
             'name' => 'field',
             'vname' => 'LBL_FIELD',
@@ -97,7 +97,7 @@ 
             'dependency' => false,
         ),
         'display' =>
-        array (
+        array(
             'required' => false,
             'name' => 'display',
             'vname' => 'LBL_DISPLAY',
@@ -115,7 +115,7 @@ 
             'studio' => 'visible',
         ),
         'link' =>
-        array (
+        array(
             'required' => false,
             'name' => 'link',
             'vname' => 'LBL_LINK',
@@ -133,7 +133,7 @@ 
             'studio' => 'visible',
         ),
         'label' =>
-        array (
+        array(
             'required' => false,
             'name' => 'label',
             'vname' => 'LBL_LABEL',
@@ -152,7 +152,7 @@ 
             'size' => '20',
         ),
         'field_function' =>
-        array (
+        array(
             'required' => false,
             'name' => 'field_function',
             'vname' => 'LBL_FUNCTION',
@@ -174,7 +174,7 @@ 
             'dependency' => false,
         ),
         'sort_by' =>
-        array (
+        array(
             'required' => false,
             'name' => 'sort_by',
             'vname' => 'LBL_SORT',
@@ -196,7 +196,7 @@ 
             'dependency' => false,
         ),
         'format' =>
-            array (
+            array(
                 'required' => false,
                 'name' => 'format',
                 'vname' => 'LBL_FORMAT',
@@ -218,7 +218,7 @@ 
                 'dependency' => false,
             ),
         'total' =>
-            array (
+            array(
                 'required' => false,
                 'name' => 'total',
                 'vname' => 'LBL_TOTAL',
@@ -240,7 +240,7 @@ 
                 'dependency' => false,
             ),
         'sort_order' =>
-        array (
+        array(
             'required' => false,
             'name' => 'sort_order',
             'vname' => 'LBL_SORT_ORDER',
@@ -262,7 +262,7 @@ 
             'dependency' => false,
         ),
         'group_by' =>
-        array (
+        array(
             'required' => false,
             'name' => 'group_by',
             'vname' => 'LBL_GROUP',
@@ -280,7 +280,7 @@ 
             'studio' => 'visible',
         ),
         'group_order' =>
-        array (
+        array(
             'required' => false,
             'name' => 'group_order',
             'vname' => 'LBL_GROUP_ORDER',
@@ -302,7 +302,7 @@ 
             'dependency' => false,
         ),
         'group_display' =>
-        array (
+        array(
             'required' => false,
             'name' => 'group_display',
             'vname' => 'LBL_GROUP_DISPLAY',
@@ -320,7 +320,7 @@ 
             'studio' => 'visible',
         ),
         'aor_reports' =>
-        array (
+        array(
             'name' => 'aor_reports',
             'type' => 'link',
             'relationship' => 'aor_report_aor_fields',
@@ -329,7 +329,7 @@ 
             'source'=>'non-db',
         ),
     ),
-    'relationships'=>array (
+    'relationships'=>array(
     ),
     'indices' => array(
         array(
@@ -341,7 +341,7 @@ 
 	'optimistic_locking'=>true,
 		'unified_search'=>true,
 );
-if (!class_exists('VardefManager')){
+if (!class_exists('VardefManager')) {
         require_once('include/SugarObjects/VardefManager.php');
 }
-VardefManager::createVardef('AOR_Fields','AOR_Field', array('basic'));
+VardefManager::createVardef('AOR_Fields', 'AOR_Field', array('basic'));

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@ 
  */
 
 $dictionary['AOR_Field'] = array(
-	'table'=>'aor_fields',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
+    'table'=>'aor_fields',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
         'aor_report_id' =>
         array (
             'required' => false,
@@ -338,8 +338,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-		'unified_search'=>true,
+    'optimistic_locking'=>true,
+        'unified_search'=>true,
 );
 if (!class_exists('VardefManager')){
         require_once('include/SugarObjects/VardefManager.php');

modules/Reminders_Invitees/Reminder_Invitee.php

Spacing +12 added lines, -12 removed lines

@@ -60,8 +60,8 @@ 
         parent::Basic();
     }
 
-    public function bean_implements($interface){
-        switch($interface){
+    public function bean_implements($interface) {
+        switch ($interface) {
             case 'ACL': return true;
         }
         return false;
@@ -75,13 +75,13 @@ 
 	 */
     public static function saveRemindersInviteesData($reminderId, $inviteesData) {
         $savedInviteeIds = array();
-        foreach($inviteesData as $k => $inviteeData) {
-            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $inviteeData->id = '';
+        foreach ($inviteesData as $k => $inviteeData) {
+            if (isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $inviteeData->id = '';
             $reminderInviteeBean = BeanFactory::getBean('Reminders_Invitees', $inviteeData->id);
             $reminderInviteeBean->reminder_id = $reminderId;
             $reminderInviteeBean->related_invitee_module = $inviteeData->module;
             $reminderInviteeBean->related_invitee_module_id = $inviteeData->module_id;
-            if(!$inviteeData->id) {
+            if (!$inviteeData->id) {
                 $reminderInviteeBean->save();
                 $savedInviteeIds[] = $reminderInviteeBean->id;
             }
@@ -108,7 +108,7 @@ 
 		$ret = array();
 		$reminderInviteeBeen = new Reminder_Invitee();
 		$reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
-        if($reminderInvitees) {
+        if ($reminderInvitees) {
             foreach ($reminderInvitees as $reminderInvitee) {
                 $ret[] = array(
                     'id' => $isDuplicate ? null : $reminderInvitee->id,
@@ -125,21 +125,21 @@ 
         $retValue = "unknown";
 
         $bean = BeanFactory::getBean($module, $moduleId);
-        switch($module) {
+        switch ($module) {
             case 'Users':
             case 'Contacts':
             case 'Leads':
             default:
-                if(isset($bean->first_name) && isset($bean->last_name)) {
+                if (isset($bean->first_name) && isset($bean->last_name)) {
                     $retValue = "{$bean->first_name} {$bean->last_name}";
                 }
-                else if(isset($bean->name)) {
+                else if (isset($bean->name)) {
                     $retValue = $bean->name;
                 }
-                else if(isset($bean->email)) {
+                else if (isset($bean->email)) {
                     $retValue = $bean->email;
                 }
-                if(!$retValue) {
+                if (!$retValue) {
                     $retValue = "$module ($moduleId)";
                 }
                 break;
@@ -155,7 +155,7 @@ 
 	 */
     public static function deleteRemindersInviteesMultiple($reminderId, $inviteeIds = array()) {
         $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list("", "reminders_invitees.reminder_id = '$reminderId'");
-        if($invitees) {
+        if ($invitees) {
             foreach ($invitees as $invitee) {
                 if (!in_array($invitee->id, $inviteeIds)) {
                     $invitee->mark_deleted($invitee->id);

Braces +6 added lines, -7 removed lines

@@ -76,7 +76,9 @@ 
     public static function saveRemindersInviteesData($reminderId, $inviteesData) {
         $savedInviteeIds = array();
         foreach($inviteesData as $k => $inviteeData) {
-            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $inviteeData->id = '';
+            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) {
+                $inviteeData->id = '';
+            }
             $reminderInviteeBean = BeanFactory::getBean('Reminders_Invitees', $inviteeData->id);
             $reminderInviteeBean->reminder_id = $reminderId;
             $reminderInviteeBean->related_invitee_module = $inviteeData->module;
@@ -84,8 +86,7 @@ 
             if(!$inviteeData->id) {
                 $reminderInviteeBean->save();
                 $savedInviteeIds[] = $reminderInviteeBean->id;
-            }
-            else {
+            } else {
                 $addedInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list("", "reminders_invitees.id != '{$inviteeData->id}' AND reminders_invitees.reminder_id = '{$reminderInviteeBean->reminder_id}' AND reminders_invitees.related_invitee_module = '{$reminderInviteeBean->related_invitee_module}' AND reminders_invitees.related_invitee_module_id = '{$reminderInviteeBean->related_invitee_module_id}'");
                 if (!$addedInvitees) {
                     $reminderInviteeBean->save();
@@ -132,11 +133,9 @@ 
             default:
                 if(isset($bean->first_name) && isset($bean->last_name)) {
                     $retValue = "{$bean->first_name} {$bean->last_name}";
-                }
-                else if(isset($bean->name)) {
+                } else if(isset($bean->name)) {
                     $retValue = $bean->name;
-                }
-                else if(isset($bean->email)) {
+                } else if(isset($bean->email)) {
                     $retValue = $bean->email;
                 }
                 if(!$retValue) {

Indentation +24 added lines, -24 removed lines

@@ -67,12 +67,12 @@ 
         return false;
     }
 
-	/**
-	 * Save multiple reminders invitees data.
-	 *
-	 * @param string $reminderId Related Reminder GUID
-	 * @param array $inviteesData Invitees Data
-	 */
+    /**
+     * Save multiple reminders invitees data.
+     *
+     * @param string $reminderId Related Reminder GUID
+     * @param array $inviteesData Invitees Data
+     */
     public static function saveRemindersInviteesData($reminderId, $inviteesData) {
         $savedInviteeIds = array();
         foreach($inviteesData as $k => $inviteeData) {
@@ -98,16 +98,16 @@ 
         self::deleteRemindersInviteesMultiple($reminderId, $savedInviteeIds);
     }
 
-	/**
-	 * Load reminders invitees data.
-	 *
-	 * @param string $reminderId Related Reminder GUID
-	 * @return array Invitees data
-	 */
-	public static function loadRemindersInviteesData($reminderId, $isDuplicate = false) {
-		$ret = array();
-		$reminderInviteeBeen = new Reminder_Invitee();
-		$reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
+    /**
+     * Load reminders invitees data.
+     *
+     * @param string $reminderId Related Reminder GUID
+     * @return array Invitees data
+     */
+    public static function loadRemindersInviteesData($reminderId, $isDuplicate = false) {
+        $ret = array();
+        $reminderInviteeBeen = new Reminder_Invitee();
+        $reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
         if($reminderInvitees) {
             foreach ($reminderInvitees as $reminderInvitee) {
                 $ret[] = array(
@@ -118,8 +118,8 @@ 
                 );
             }
         }
-		return $ret;
-	}
+        return $ret;
+    }
 
     private static function getInviteeName($module, $moduleId) {
         $retValue = "unknown";
@@ -147,12 +147,12 @@ 
         return $retValue;
     }
 
-	/**
-	 * Delete reminders invitees multiple.
-	 *
-	 * @param string $reminderId Related Reminder GUID
-	 * @param array $inviteeIds (optional) Exluded Invitees GUIDs, the invitee will not deleted if this argument contains that. Default is empty array.
-	 */
+    /**
+     * Delete reminders invitees multiple.
+     *
+     * @param string $reminderId Related Reminder GUID
+     * @param array $inviteeIds (optional) Exluded Invitees GUIDs, the invitee will not deleted if this argument contains that. Default is empty array.
+     */
     public static function deleteRemindersInviteesMultiple($reminderId, $inviteeIds = array()) {
         $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list("", "reminders_invitees.reminder_id = '$reminderId'");
         if($invitees) {

modules/AOP_Case_Updates/Case_Updates.php

Braces +6 added lines, -4 removed lines

@@ -159,7 +159,7 @@ 
         $bDate = $b->fetched_row['date_entered'];
         if($aDate < $bDate){
             return -1;
-        }elseif($aDate > $bDate){
+        } elseif($aDate > $bDate){
             return 1;
         }
         return 0;
@@ -195,9 +195,9 @@ 
     global $mod_strings;
     if($update->contact_id){
         $name = $update->getUpdateContact()->name;
-    }elseif($update->assigned_user_id){
+    } elseif($update->assigned_user_id){
         $name = $update->getUpdateUser()->name;
-    }else{
+    } else{
         $name = "Unknown";
     }
     $html = "<a href='' onclick='toggleCaseUpdate(\"".$update->id."\");return false;'>";
@@ -281,7 +281,9 @@ 
     global $action;
 
     //on DetailView only
-    if($action != 'DetailView') return;
+    if($action != 'DetailView') {
+        return;
+    }
 
     //current record id
     $record = $_GET['record'];

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 
-function display_updates($focus, $field, $value, $view){
+function display_updates($focus, $field, $value, $view) {
     global $mod_strings;
 
     $hideImage = SugarThemeRegistry::current()->getImageURL('basic_search.gif');
@@ -127,8 +127,8 @@ 
 </script>
 A;
 
-    $updates = $focus->get_linked_beans('aop_case_updates',"AOP_Case_Updates");
-    if(!$updates || is_null($focus->id)){
+    $updates = $focus->get_linked_beans('aop_case_updates', "AOP_Case_Updates");
+    if (!$updates || is_null($focus->id)) {
         $html .= quick_edit_case_updates($focus);
         return $html;
         //return $mod_strings['LBL_NO_CASE_UPDATES'];
@@ -154,18 +154,18 @@ 
 EOD;
 
 
-    usort($updates,function($a,$b){
+    usort($updates, function($a, $b) {
         $aDate = $a->fetched_row['date_entered'];
         $bDate = $b->fetched_row['date_entered'];
-        if($aDate < $bDate){
+        if ($aDate < $bDate) {
             return -1;
-        }elseif($aDate > $bDate){
+        }elseif ($aDate > $bDate) {
             return 1;
         }
         return 0;
     });
 
-    foreach($updates as $update){
+    foreach ($updates as $update) {
         $html .= display_single_update($update, $hideImage);
     }
     $html .= "</div>";
@@ -178,9 +178,9 @@ 
 /**
  * @return mixed|string|void
  */
-function display_update_form(){
+function display_update_form() {
     global $mod_strings, $app_strings;
-    $sugar_smarty	= new Sugar_Smarty();
+    $sugar_smarty = new Sugar_Smarty();
     $sugar_smarty->assign('MOD', $mod_strings);
     $sugar_smarty->assign('APP', $app_strings);
     return $sugar_smarty->fetch('modules/AOP_Case_Updates/tpl/caseUpdateForm.tpl');
@@ -191,23 +191,23 @@ 
  * @param SugarBean $update
  * @return string - html to be displayed
  */
-function getUpdateDisplayHead(SugarBean $update){
+function getUpdateDisplayHead(SugarBean $update) {
     global $mod_strings;
-    if($update->contact_id){
+    if ($update->contact_id) {
         $name = $update->getUpdateContact()->name;
-    }elseif($update->assigned_user_id){
+    }elseif ($update->assigned_user_id) {
         $name = $update->getUpdateUser()->name;
-    }else{
+    } else {
         $name = "Unknown";
     }
     $html = "<a href='' onclick='toggleCaseUpdate(\"".$update->id."\");return false;'>";
     $html .= "<img  id='caseUpdate".$update->id."Image' class='caseUpdateImage' src='".SugarThemeRegistry::current()->getImageURL('basic_search.gif')."'>";
     $html .= "</a>";
-    $html .= "<span>".($update->internal ? "<strong>" . $mod_strings['LBL_INTERNAL'] . "</strong> " : '') .$name . " ".$update->date_entered."</span><br>";
-    $notes = $update->get_linked_beans('notes','Notes');
-    if($notes){
-        $html.= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
-        foreach($notes as $note){
+    $html .= "<span>".($update->internal ? "<strong>".$mod_strings['LBL_INTERNAL']."</strong> " : '').$name." ".$update->date_entered."</span><br>";
+    $notes = $update->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        $html .= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -220,12 +220,12 @@ 
  * @param AOP_Case_Updates $update
  * @return string - the html for the update
  */
-function display_single_update(AOP_Case_Updates $update){
+function display_single_update(AOP_Case_Updates $update) {
 
     /*if assigned user*/
-    if($update->assigned_user_id){
+    if ($update->assigned_user_id) {
         /*if internal update*/
-        if ($update->internal){
+        if ($update->internal) {
             $html = "<div id='caseStyleInternal'>".getUpdateDisplayHead($update);
             $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
             $html .= nl2br(html_entity_decode($update->description));
@@ -243,7 +243,7 @@ 
     }
 
     /*if contact user*/
-    if($update->contact_id){
+    if ($update->contact_id) {
         $html = "<div id='extramargin'><div id='caseStyleContact'>".getUpdateDisplayHead($update);
         $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
         $html .= nl2br(html_entity_decode($update->description));
@@ -259,11 +259,11 @@ 
  * @param $case
  * @return string - html link
  */
-function display_case_attachments($case){
+function display_case_attachments($case) {
     $html = '';
-    $notes = $case->get_linked_beans('notes','Notes');
-    if($notes){
-        foreach($notes as $note){
+    $notes = $case->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -277,11 +277,11 @@ 
  *
  * @return string - the html to be displayed and javascript
  */
-function quick_edit_case_updates($case){
+function quick_edit_case_updates($case) {
     global $action;
 
     //on DetailView only
-    if($action != 'DetailView') return;
+    if ($action != 'DetailView') return;
 
     //current record id
     $record = $_GET['record'];
@@ -294,12 +294,12 @@ 
     $roles = $acl->getUserRoles($id);
 
     //Return if user cannot edit cases
-    if(in_array( "no edit cases", $roles) || $roles === "no edit cases"){
+    if (in_array("no edit cases", $roles) || $roles === "no edit cases") {
 
         return;
     }
     $internalChecked = '';
-    if($case->internal){
+    if ($case->internal) {
         $internalChecked = "checked='checked'";
     }
     $html = <<< EOD

modules/AOP_Case_Updates/AOPAssignManager.php

Spacing +46 added lines, -46 removed lines

@@ -1,76 +1,76 @@ 
 <?php
-class AOPAssignManager{
+class AOPAssignManager {
     private $ieX = false;
     private $distributionMethod = '';
     private $aopFallback = true;
     private $assignableUsers = array();
 
-    function __construct($ieX = false){
+    function __construct($ieX = false) {
         global $sugar_config;
         $this->ieX = $ieX;
-        if($ieX) {
+        if ($ieX) {
             $inboundDistribMethod = $ieX->get_stored_options("distrib_method", "");
-        }else{
+        } else {
             $inboundDistribMethod = '';
         }
-        if($this->isAOPFallback($inboundDistribMethod)){
+        if ($this->isAOPFallback($inboundDistribMethod)) {
             $this->distributionMethod = $sugar_config['aop']['distribution_method'];
             $this->aopFallback = true;
-        }else{
+        } else {
             $this->distributionMethod = $inboundDistribMethod;
             $this->aopFallback = false;
         }
         $this->assignableUsers = $this->getAssignableUsers();
     }
 
-    private function isAOPFallback($distribMethod){
+    private function isAOPFallback($distribMethod) {
         return empty($distribMethod) || $distribMethod == 'AOPDefault';
     }
 
-    private function getDistributionOptions(){
+    private function getDistributionOptions() {
         global $sugar_config;
-        if($this->aopFallback){
+        if ($this->aopFallback) {
             return $sugar_config['aop']['distribution_options'];
-        }else{
+        } else {
             return $this->ieX->get_stored_options("distribution_options", '');
         }
     }
 
-    private function getRoleUsers($roleId){
+    private function getRoleUsers($roleId) {
         require_once('modules/ACLRoles/ACLRole.php');
         $role = new ACLRole();
         $role->retrieve($roleId);
-        $role_users = $role->get_linked_beans( 'users','User');
+        $role_users = $role->get_linked_beans('users', 'User');
         $r_users = array();
-        foreach($role_users as $role_user){
+        foreach ($role_users as $role_user) {
             $r_users[$role_user->id] = $role_user->name;
         }
         return $r_users;
     }
 
-    private function getAssignableUsers(){
-        if($this->distributionMethod == 'singleUser'){
+    private function getAssignableUsers() {
+        if ($this->distributionMethod == 'singleUser') {
             return array();
         }
         $distributionOptions = $this->getDistributionOptions();
 
-        if(empty($distributionOptions)){
+        if (empty($distributionOptions)) {
             return array();
         }
-        switch($distributionOptions[0]) {
+        switch ($distributionOptions[0]) {
             Case 'security_group':
-                if(file_exists('modules/SecurityGroups/SecurityGroup.php')){
+                if (file_exists('modules/SecurityGroups/SecurityGroup.php')) {
                     require_once('modules/SecurityGroups/SecurityGroup.php');
                     $security_group = new SecurityGroup();
                     $security_group->retrieve($distributionOptions[1]);
-                    $group_users = $security_group->get_linked_beans( 'users','User');
+                    $group_users = $security_group->get_linked_beans('users', 'User');
                     $users = array();
                     $r_users = array();
-                    if($distributionOptions[2] != ''){
+                    if ($distributionOptions[2] != '') {
                         $r_users = $this->getRoleUsers($distributionOptions[2]);
                     }
-                    foreach($group_users as $group_user){
-                        if($distributionOptions[2] != '' && !isset($r_users[$group_user->id])){
+                    foreach ($group_users as $group_user) {
+                        if ($distributionOptions[2] != '' && !isset($r_users[$group_user->id])) {
                             continue;
                         }
                         $users[$group_user->id] = $group_user->name;
@@ -90,57 +90,57 @@ 
 
     }
 
-    private function getSingleUser(){
+    private function getSingleUser() {
         global $sugar_config;
-        if($this->singleUser){
+        if ($this->singleUser) {
             return $this->singleUser;
         }
-        if($this->aopFallback){
+        if ($this->aopFallback) {
             $this->singleUser = !empty($sugar_config['aop']['distribution_user_id']) ? $sugar_config['aop']['distribution_user_id'] : '';
-        }else{
+        } else {
             $this->singleUser = $this->ieX->get_stored_options("distribution_user_id", "");
         }
         return $this->singleUser;
     }
 
-    private function getLeastBusyCounts(){
-        if($this->leastBusyUsers){
+    private function getLeastBusyCounts() {
+        if ($this->leastBusyUsers) {
             return $this->leastBusyUsers;
         }
         global $db;
-        $idIn = implode("','",$db->arrayQuote(array_keys($this->assignableUsers)));
-        if($idIn){
+        $idIn = implode("','", $db->arrayQuote(array_keys($this->assignableUsers)));
+        if ($idIn) {
             $idIn = "'".$idIn."'";
         }
         $res = $db->query("SELECT assigned_user_id, COUNT(*) AS c FROM cases WHERE assigned_user_id IN ({$idIn}) AND deleted = 0 GROUP BY assigned_user_id ORDER BY COUNT(*)");
         $this->leastBusyUsers = array();
-        while($row = $db->fetchByAssoc($res)){
+        while ($row = $db->fetchByAssoc($res)) {
             $this->leastBusyUsers[$row['assigned_user_id']] = $row['c'];
         }
         return $this->leastBusyUsers;
     }
 
-    private function getLeastBusyUser(){
+    private function getLeastBusyUser() {
         $leastBusyCounts = $this->getLeastBusyCounts();
         asort($leastBusyCounts);
         reset($leastBusyCounts);
         return key($leastBusyCounts);
     }
 
-    private function updateLeastBusy($id){
-        if(!$this->leastBusyUsers){
+    private function updateLeastBusy($id) {
+        if (!$this->leastBusyUsers) {
             $this->getLeastBusyCounts();
         }
         $this->leastBusyUsers[$id] = $this->leastBusyUsers[$id] + 1;
     }
 
-    private function getRandomUser(){
+    private function getRandomUser() {
         $randKey = array_rand($this->assignableUsers);
         return $this->assignableUsers[$randKey];
     }
 
-    function getNextAssignedUser(){
-        switch($this->distributionMethod){
+    function getNextAssignedUser() {
+        switch ($this->distributionMethod) {
             case 'singleUser':
                 $userId = $this->getSingleUser();
                 break;
@@ -163,20 +163,20 @@ 
 
     private function getRoundRobinUser() {
         $id = empty($this->ieX) ? '' : $this->ieX->id;
-        $file = create_cache_directory('modules/AOP_Case_Updates/Users/') . $id . 'lastUser.cache.php';
-        if(isset($_SESSION['AOPlastuser'][$id]) && $_SESSION['AOPlastuser'][$id] != '') {
+        $file = create_cache_directory('modules/AOP_Case_Updates/Users/').$id.'lastUser.cache.php';
+        if (isset($_SESSION['AOPlastuser'][$id]) && $_SESSION['AOPlastuser'][$id] != '') {
             $lastUserId = $_SESSION['AOPlastuser'][$id];
         }
-        else if (is_file($file)){
+        else if (is_file($file)) {
             include $file;
-            if(isset($lastUser['User']) && $lastUser['User'] != '') {
+            if (isset($lastUser['User']) && $lastUser['User'] != '') {
                 $lastUserId = $lastUser['User'];
             }
         }
         $users = array_keys($this->assignableUsers);
-        $lastOffset = array_search($lastUserId,$users);
+        $lastOffset = array_search($lastUserId, $users);
         $newOffset = ($lastOffset + 1) % count($users);
-        if(!empty($users[$newOffset])) {
+        if (!empty($users[$newOffset])) {
             return $users[$newOffset];
         }
         return reset($users);
@@ -185,14 +185,14 @@ 
     private function setLastRoundRobinUser($user_id) {
         $id = empty($this->ieX) ? '' : $this->ieX->id;
         $_SESSION['AOPlastuser'][$id] = $user_id;
-        $file = create_cache_directory('modules/AOP_Case_Updates/Users/') . $id . 'lastUser.cache.php';
+        $file = create_cache_directory('modules/AOP_Case_Updates/Users/').$id.'lastUser.cache.php';
         $arrayString = var_export_helper(array('User' => $user_id));
-        $content =<<<eoq
+        $content = <<<eoq
 <?php
 	\$lastUser = {$arrayString};
 ?>
 eoq;
-        if($fh = @sugar_fopen($file, 'w')) {
+        if ($fh = @sugar_fopen($file, 'w')) {
             fputs($fh, $content);
             fclose($fh);
         }

Braces +5 added lines, -6 removed lines

@@ -10,13 +10,13 @@ 
         $this->ieX = $ieX;
         if($ieX) {
             $inboundDistribMethod = $ieX->get_stored_options("distrib_method", "");
-        }else{
+        } else{
             $inboundDistribMethod = '';
         }
         if($this->isAOPFallback($inboundDistribMethod)){
             $this->distributionMethod = $sugar_config['aop']['distribution_method'];
             $this->aopFallback = true;
-        }else{
+        } else{
             $this->distributionMethod = $inboundDistribMethod;
             $this->aopFallback = false;
         }
@@ -31,7 +31,7 @@ 
         global $sugar_config;
         if($this->aopFallback){
             return $sugar_config['aop']['distribution_options'];
-        }else{
+        } else{
             return $this->ieX->get_stored_options("distribution_options", '');
         }
     }
@@ -97,7 +97,7 @@ 
         }
         if($this->aopFallback){
             $this->singleUser = !empty($sugar_config['aop']['distribution_user_id']) ? $sugar_config['aop']['distribution_user_id'] : '';
-        }else{
+        } else{
             $this->singleUser = $this->ieX->get_stored_options("distribution_user_id", "");
         }
         return $this->singleUser;
@@ -166,8 +166,7 @@ 
         $file = create_cache_directory('modules/AOP_Case_Updates/Users/') . $id . 'lastUser.cache.php';
         if(isset($_SESSION['AOPlastuser'][$id]) && $_SESSION['AOPlastuser'][$id] != '') {
             $lastUserId = $_SESSION['AOPlastuser'][$id];
-        }
-        else if (is_file($file)){
+        } else if (is_file($file)){
             include $file;
             if(isset($lastUser['User']) && $lastUser['User'] != '') {
                 $lastUserId = $lastUser['User'];

modules/SchedulersJobs/field_arrays.php

Indentation +18 added lines, -18 removed lines

@@ -40,23 +40,23 @@
 
 
 $fields_array['Schedulers_jobs'] = array (
-	'column_fields' => array (
-		'id',
-		'deleted',
-		'date_entered',
-		'date_modified',
-		'job_id',
-		'execute_time',
-		'status',
-	),
-	'list_fields' => array (
-		'id',
-		'job_id',
-		'execute_time'
-	),
-	'required_fields' => array (
-		'job_id' => 1,
-		'execute_time' => 1
-	)
+    'column_fields' => array (
+        'id',
+        'deleted',
+        'date_entered',
+        'date_modified',
+        'job_id',
+        'execute_time',
+        'status',
+    ),
+    'list_fields' => array (
+        'id',
+        'job_id',
+        'execute_time'
+    ),
+    'required_fields' => array (
+        'job_id' => 1,
+        'execute_time' => 1
+    )
 );
 ?>

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
 	)

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/Import/ImportFieldSanitize.php

Spacing +36 added lines, -36 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
@@ -87,24 +87,24 @@ 
     {
         static $sfh;
         
-        if(!isset($sfh)) {
+        if (!isset($sfh)) {
             require_once('include/SugarFields/SugarFieldHandler.php');
             $sfh = new SugarFieldHandler();
         }
         $value = $params[0];
         $vardef = $params[1];
-        if ( isset($params[2]) )
+        if (isset($params[2]))
             $focus = $params[2];
         else
             $focus = null;
-        if ( $name == 'relate' && !empty($params[3]) )
+        if ($name == 'relate' && !empty($params[3]))
             $this->addRelatedBean = true;
         else
             $this->addRelatedBean = false;
         
         $field = $sfh->getSugarField(ucfirst($name));
-        if ( $field instanceOf SugarFieldBase ) {
-            $value = $field->importSanitize($value,$vardef,$focus,$this);
+        if ($field instanceOf SugarFieldBase) {
+            $value = $field->importSanitize($value, $vardef, $focus, $this);
         }
         
         return $value;
@@ -128,10 +128,10 @@ 
 
         $format = $this->dateformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
+        if (!$timedate->check_matching_format($value, $format))
             return false;
 
-        if ( !$this->isValidTimeDate($value, $format) )
+        if (!$this->isValidTimeDate($value, $format))
             return false;
 
         $value = $timedate->swap_formats(
@@ -156,11 +156,11 @@ 
         // cache $sea instance
         static $sea;
         
-        if ( !($sea instanceof SugarEmailAddress) ) {
+        if (!($sea instanceof SugarEmailAddress)) {
             $sea = new SugarEmailAddress;
         }
         
-        if ( !empty($value) && !preg_match($sea->regex,$value) ) {
+        if (!empty($value) && !preg_match($sea->regex, $value)) {
             return false;
         }
 
@@ -184,18 +184,18 @@ 
         static $focus_user;
 
         // cache this object since we'll be reusing it a bunch
-        if ( !($focus_user instanceof User) ) {
+        if (!($focus_user instanceof User)) {
 
             $focus_user = new User();
         }
 
 
-        if ( !empty($value) && strtolower($value) != "all" ) {
-            $theList   = explode(",",$value);
+        if (!empty($value) && strtolower($value) != "all") {
+            $theList   = explode(",", $value);
             $isValid   = true;
             $bad_names = array();
             foreach ($theList as $eachItem) {
-                if ( $focus_user->retrieve_user_id($eachItem)
+                if ($focus_user->retrieve_user_id($eachItem)
                         || $focus_user->retrieve($eachItem)
                 ) {
                     // all good
@@ -206,7 +206,7 @@ 
                     continue;
                 }
             }
-            if(!$isValid) {
+            if (!$isValid) {
                 return false;
             }
         }
@@ -232,10 +232,10 @@ 
 
         $format = $this->timeformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
+        if (!$timedate->check_matching_format($value, $format))
             return false;
 
-        if ( !$this->isValidTimeDate($value, $format) )
+        if (!$this->isValidTimeDate($value, $format))
             return false;
 
         $value = $timedate->swap_formats(
@@ -266,46 +266,46 @@ 
         $reg = $timedate->get_regular_expression($format);
         preg_match('@'.$reg['format'].'@', $value, $dateparts);
 
-        if ( empty($dateparts) )
+        if (empty($dateparts))
             return false;
-        if ( isset($reg['positions']['a'])
-                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) )
+        if (isset($reg['positions']['a'])
+                && !in_array($dateparts[$reg['positions']['a']], array('am', 'pm')))
             return false;
-        if ( isset($reg['positions']['A'])
-                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) )
+        if (isset($reg['positions']['A'])
+                && !in_array($dateparts[$reg['positions']['A']], array('AM', 'PM')))
             return false;
-        if ( isset($reg['positions']['h']) && (
+        if (isset($reg['positions']['h']) && (
                 !is_numeric($dateparts[$reg['positions']['h']])
                 || $dateparts[$reg['positions']['h']] < 1
-                || $dateparts[$reg['positions']['h']] > 12 ) )
+                || $dateparts[$reg['positions']['h']] > 12 ))
             return false;
-        if ( isset($reg['positions']['H']) && (
+        if (isset($reg['positions']['H']) && (
                 !is_numeric($dateparts[$reg['positions']['H']])
                 || $dateparts[$reg['positions']['H']] < 0
-                || $dateparts[$reg['positions']['H']] > 23 ) )
+                || $dateparts[$reg['positions']['H']] > 23 ))
             return false;
-        if ( isset($reg['positions']['i']) && (
+        if (isset($reg['positions']['i']) && (
                 !is_numeric($dateparts[$reg['positions']['i']])
                 || $dateparts[$reg['positions']['i']] < 0
-                || $dateparts[$reg['positions']['i']] > 59 ) )
+                || $dateparts[$reg['positions']['i']] > 59 ))
             return false;
-        if ( isset($reg['positions']['s']) && (
+        if (isset($reg['positions']['s']) && (
                 !is_numeric($dateparts[$reg['positions']['s']])
                 || $dateparts[$reg['positions']['s']] < 0
-                || $dateparts[$reg['positions']['s']] > 59 ) )
+                || $dateparts[$reg['positions']['s']] > 59 ))
             return false;
-        if ( isset($reg['positions']['d']) && (
+        if (isset($reg['positions']['d']) && (
                 !is_numeric($dateparts[$reg['positions']['d']])
                 || $dateparts[$reg['positions']['d']] < 1
-                || $dateparts[$reg['positions']['d']] > 31 ) )
+                || $dateparts[$reg['positions']['d']] > 31 ))
             return false;
-        if ( isset($reg['positions']['m']) && (
+        if (isset($reg['positions']['m']) && (
                 !is_numeric($dateparts[$reg['positions']['m']])
                 || $dateparts[$reg['positions']['m']] < 1
-                || $dateparts[$reg['positions']['m']] > 12 ) )
+                || $dateparts[$reg['positions']['m']] > 12 ))
             return false;
-        if ( isset($reg['positions']['Y']) &&
-                !is_numeric($dateparts[$reg['positions']['Y']]) )
+        if (isset($reg['positions']['Y']) &&
+                !is_numeric($dateparts[$reg['positions']['Y']]))
             return false;
 
         return true;

Braces +56 added lines, -39 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
@@ -93,14 +95,16 @@ 
         }
         $value = $params[0];
         $vardef = $params[1];
-        if ( isset($params[2]) )
-            $focus = $params[2];
-        else
-            $focus = null;
-        if ( $name == 'relate' && !empty($params[3]) )
-            $this->addRelatedBean = true;
-        else
-            $this->addRelatedBean = false;
+        if ( isset($params[2]) ) {
+                    $focus = $params[2];
+        } else {
+                    $focus = null;
+        }
+        if ( $name == 'relate' && !empty($params[3]) ) {
+                    $this->addRelatedBean = true;
+        } else {
+                    $this->addRelatedBean = false;
+        }
         
         $field = $sfh->getSugarField(ucfirst($name));
         if ( $field instanceOf SugarFieldBase ) {
@@ -128,11 +132,13 @@ 
 
         $format = $this->dateformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
-            return false;
+        if ( !$timedate->check_matching_format($value, $format) ) {
+                    return false;
+        }
 
-        if ( !$this->isValidTimeDate($value, $format) )
-            return false;
+        if ( !$this->isValidTimeDate($value, $format) ) {
+                    return false;
+        }
 
         $value = $timedate->swap_formats(
             $value, $format, $timedate->get_date_format());
@@ -199,8 +205,7 @@ 
                         || $focus_user->retrieve($eachItem)
                 ) {
                     // all good
-                }
-                else {
+                } else {
                     $isValid     = false;
                     $bad_names[] = $eachItem;
                     continue;
@@ -232,11 +237,13 @@ 
 
         $format = $this->timeformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
-            return false;
+        if ( !$timedate->check_matching_format($value, $format) ) {
+                    return false;
+        }
 
-        if ( !$this->isValidTimeDate($value, $format) )
-            return false;
+        if ( !$this->isValidTimeDate($value, $format) ) {
+                    return false;
+        }
 
         $value = $timedate->swap_formats(
             $value, $format, $timedate->get_time_format());
@@ -266,47 +273,57 @@ 
         $reg = $timedate->get_regular_expression($format);
         preg_match('@'.$reg['format'].'@', $value, $dateparts);
 
-        if ( empty($dateparts) )
-            return false;
+        if ( empty($dateparts) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['a'])
-                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) )
-            return false;
+                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['A'])
-                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) )
-            return false;
+                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['h']) && (
                 !is_numeric($dateparts[$reg['positions']['h']])
                 || $dateparts[$reg['positions']['h']] < 1
-                || $dateparts[$reg['positions']['h']] > 12 ) )
-            return false;
+                || $dateparts[$reg['positions']['h']] > 12 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['H']) && (
                 !is_numeric($dateparts[$reg['positions']['H']])
                 || $dateparts[$reg['positions']['H']] < 0
-                || $dateparts[$reg['positions']['H']] > 23 ) )
-            return false;
+                || $dateparts[$reg['positions']['H']] > 23 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['i']) && (
                 !is_numeric($dateparts[$reg['positions']['i']])
                 || $dateparts[$reg['positions']['i']] < 0
-                || $dateparts[$reg['positions']['i']] > 59 ) )
-            return false;
+                || $dateparts[$reg['positions']['i']] > 59 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['s']) && (
                 !is_numeric($dateparts[$reg['positions']['s']])
                 || $dateparts[$reg['positions']['s']] < 0
-                || $dateparts[$reg['positions']['s']] > 59 ) )
-            return false;
+                || $dateparts[$reg['positions']['s']] > 59 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['d']) && (
                 !is_numeric($dateparts[$reg['positions']['d']])
                 || $dateparts[$reg['positions']['d']] < 1
-                || $dateparts[$reg['positions']['d']] > 31 ) )
-            return false;
+                || $dateparts[$reg['positions']['d']] > 31 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['m']) && (
                 !is_numeric($dateparts[$reg['positions']['m']])
                 || $dateparts[$reg['positions']['m']] < 1
-                || $dateparts[$reg['positions']['m']] > 12 ) )
-            return false;
+                || $dateparts[$reg['positions']['m']] > 12 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['Y']) &&
-                !is_numeric($dateparts[$reg['positions']['Y']]) )
-            return false;
+                !is_numeric($dateparts[$reg['positions']['Y']]) ) {
+                    return false;
+        }
 
         return true;
     }

modules/Import/maps/ImportMapOutlook.php

Indentation +4 added lines, -4 removed lines

@@ -49,11 +49,11 @@ 
 
 class ImportMapOutlook extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'outlook';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter = ',';
@@ -61,7 +61,7 @@ 
      * Field enclosure
      */
     public $enclosure = '"';
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
@@ -72,7 +72,7 @@ 
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {

Switch Indentation +13 added lines, -13 removed lines

@@ -78,19 +78,19 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Job Title"=>"title",
-                "Home Country"=>"alt_address_country",
-                "E-mail 2 Address"=>"email2",
-                );
-            break;
-        case 'Accounts':
-            return $return_array;
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Job Title"=>"title",
+                    "Home Country"=>"alt_address_country",
+                    "E-mail 2 Address"=>"email2",
+                    );
+                break;
+            case 'Accounts':
+                return $return_array;
+                break;
+            default:
+                return $return_array;
         }
     }
 }

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

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/Import/maps/ImportMapGoogle.php

Indentation +27 added lines, -27 removed lines

@@ -44,7 +44,7 @@ 
 
 class ImportMapGoogle extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'google';
@@ -55,38 +55,38 @@ 
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping($module)
+    public function getMapping($module)
     {
-         $return_array = array(
-             'first_name' => array('sugar_key' => 'first_name', 'sugar_label' => '', 'default_label' => 'Given Name'),
-             'last_name' => array('sugar_key' => 'last_name', 'sugar_label' => '', 'default_label' => 'Family Name'),
-             'birthday' => array('sugar_key' => 'birthdate', 'sugar_label' => '', 'default_label' => 'Birthday'),
-             'title' => array('sugar_key' => 'title', 'sugar_label' => '', 'default_label' => 'Title'),
-             'notes' => array('sugar_key' => 'description', 'sugar_label' => '', 'default_label' => 'Notes'),
+            $return_array = array(
+                'first_name' => array('sugar_key' => 'first_name', 'sugar_label' => '', 'default_label' => 'Given Name'),
+                'last_name' => array('sugar_key' => 'last_name', 'sugar_label' => '', 'default_label' => 'Family Name'),
+                'birthday' => array('sugar_key' => 'birthdate', 'sugar_label' => '', 'default_label' => 'Birthday'),
+                'title' => array('sugar_key' => 'title', 'sugar_label' => '', 'default_label' => 'Title'),
+                'notes' => array('sugar_key' => 'description', 'sugar_label' => '', 'default_label' => 'Notes'),
 
-             'alt_address_street' => array('sugar_key' => 'alt_address_street', 'sugar_label' => '', 'default_label' => 'Home Street'),
-             'alt_address_postcode' => array('sugar_key' => 'alt_address_postalcode', 'sugar_label' => '', 'default_label' => 'Home Postcode'),
-             'alt_address_city' => array('sugar_key' => 'alt_address_city', 'sugar_label' => '', 'default_label' => 'Home City'),
-             'alt_address_state' => array('sugar_key' => 'alt_address_state', 'sugar_label' => '', 'default_label' => 'Home State'),
-             'alt_address_country' => array('sugar_key' => 'alt_address_country', 'sugar_label' => '', 'default_label' => 'Home Country'),
+                'alt_address_street' => array('sugar_key' => 'alt_address_street', 'sugar_label' => '', 'default_label' => 'Home Street'),
+                'alt_address_postcode' => array('sugar_key' => 'alt_address_postalcode', 'sugar_label' => '', 'default_label' => 'Home Postcode'),
+                'alt_address_city' => array('sugar_key' => 'alt_address_city', 'sugar_label' => '', 'default_label' => 'Home City'),
+                'alt_address_state' => array('sugar_key' => 'alt_address_state', 'sugar_label' => '', 'default_label' => 'Home State'),
+                'alt_address_country' => array('sugar_key' => 'alt_address_country', 'sugar_label' => '', 'default_label' => 'Home Country'),
 
-             'primary_address_street' => array('sugar_key' => 'primary_address_street', 'sugar_label' => '', 'default_label' => 'Work Street'),
-             'primary_address_postcode' => array('sugar_key' => 'primary_address_postalcode', 'sugar_label' => '', 'default_label' => 'Work Postcode'),
-             'primary_address_city' => array('sugar_key' => 'primary_address_city', 'sugar_label' => '', 'default_label' => 'Work City'),
-             'primary_address_state' => array('sugar_key' => 'primary_address_state', 'sugar_label' => '', 'default_label' => 'Work State'),
-             'primary_address_country' => array('sugar_key' => 'primary_address_country', 'sugar_label' => '', 'default_label' => 'Work Country'),
+                'primary_address_street' => array('sugar_key' => 'primary_address_street', 'sugar_label' => '', 'default_label' => 'Work Street'),
+                'primary_address_postcode' => array('sugar_key' => 'primary_address_postalcode', 'sugar_label' => '', 'default_label' => 'Work Postcode'),
+                'primary_address_city' => array('sugar_key' => 'primary_address_city', 'sugar_label' => '', 'default_label' => 'Work City'),
+                'primary_address_state' => array('sugar_key' => 'primary_address_state', 'sugar_label' => '', 'default_label' => 'Work State'),
+                'primary_address_country' => array('sugar_key' => 'primary_address_country', 'sugar_label' => '', 'default_label' => 'Work Country'),
 
-             'phone_main' => array('sugar_key' => 'phone_other', 'sugar_label' => '', 'default_label' => 'Main Phone'),
-             'phone_mobile' => array('sugar_key' => 'phone_mobile', 'sugar_label' => '', 'default_label' => 'Mobile Phone'),
-             'phone_home' => array('sugar_key' => 'phone_home', 'sugar_label' => '', 'default_label' => 'Home phone'),
-             'phone_work' => array('sugar_key' => 'phone_work', 'sugar_label' => '', 'default_label' => 'Work phone'),
-             'phone_fax' => array('sugar_key' => 'phone_fax', 'sugar_label' => '', 'default_label' => 'Fax phone'),
+                'phone_main' => array('sugar_key' => 'phone_other', 'sugar_label' => '', 'default_label' => 'Main Phone'),
+                'phone_mobile' => array('sugar_key' => 'phone_mobile', 'sugar_label' => '', 'default_label' => 'Mobile Phone'),
+                'phone_home' => array('sugar_key' => 'phone_home', 'sugar_label' => '', 'default_label' => 'Home phone'),
+                'phone_work' => array('sugar_key' => 'phone_work', 'sugar_label' => '', 'default_label' => 'Work phone'),
+                'phone_fax' => array('sugar_key' => 'phone_fax', 'sugar_label' => '', 'default_label' => 'Fax phone'),
 
-             'email1' => array('sugar_key' => 'email1', 'sugar_label' => 'LBL_EMAIL_ADDRESS', 'default_label' => 'Email Address'),
-             'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
+                'email1' => array('sugar_key' => 'email1', 'sugar_label' => 'LBL_EMAIL_ADDRESS', 'default_label' => 'Email Address'),
+                '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'),
+                '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'),
             );
 
         if($module == 'Users')

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

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.