adamjakab / SuiteCRM

modules/ModuleBuilder/parsers/ParserFactory.php

Indentation +1 added lines, -1 removed lines

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

Spacing +41 added lines, -41 removed lines

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

Braces +17 added lines, -11 removed lines

@@ -67,7 +67,9 @@ 
             $packageName = null ;
             //For studio modules, check for view parser overrides
             $parser = self::checkForStudioParserOverride($view, $moduleName, $packageName);
-            if ($parser) return $parser;
+            if ($parser) {
+                return $parser;
+            }
             $sm = StudioModuleFactory::getStudioModule($moduleName);
             //If we didn't find a specofic parser, see if there is a view to type mapping
             foreach($sm->sources as $file => $def)
@@ -117,8 +119,9 @@ 
                 return new ParserVisibility ( $moduleName, $packageName ) ;
             default :
                 $parser = self::checkForParserClass($view, $moduleName, $packageName);
-                if ($parser)
-                    return $parser;
+                if ($parser) {
+                                    return $parser;
+                }
 
         }
 
@@ -171,16 +174,19 @@ 
             {
                 $pName = $def['parser'];
                 $path = "modules/ModuleBuilder/parsers/views/{$pName}.php";
-                if (file_exists("custom/$path"))
-                    require_once("custom/$path");
-                else if (file_exists($path))
-                    require_once($path);
-                if (class_exists ( $pName ))
-                    return new $pName($view, $moduleName, $packageName);
+                if (file_exists("custom/$path")) {
+                                    require_once("custom/$path");
+                } else if (file_exists($path)) {
+                                    require_once($path);
+                }
+                if (class_exists ( $pName )) {
+                                    return new $pName($view, $moduleName, $packageName);
+                }
                 //If it wasn't defined directly, check for a generic parser name for the view
                 $parser = self::checkForParserClass($view, $moduleName, $packageName);
-                if ($parser)
-                    return $parser;
+                if ($parser) {
+                                    return $parser;
+                }
             }
         }
         return false;

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 +117 added lines, -117 removed lines

@@ -43,43 +43,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()
@@ -87,102 +87,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()
@@ -193,19 +193,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
@@ -213,124 +213,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 +19 added lines, -13 removed lines

@@ -124,8 +124,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;
@@ -170,13 +169,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 ) ;
 				}
 			}
@@ -193,20 +195,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/Reminders_Invitees/Reminder_Invitee.php

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

Spacing +10 added lines, -10 removed lines

@@ -64,13 +64,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;
             }
@@ -97,7 +97,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,
@@ -114,21 +114,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;
@@ -144,7 +144,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);

Indentation +24 added lines, -24 removed lines

@@ -56,12 +56,12 @@ 
     var $related_invitee_module;
     var $related_invitee_module_id;
 
-	/**
-	 * 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) {
@@ -87,16 +87,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(
@@ -107,8 +107,8 @@ 
                 );
             }
         }
-		return $ret;
-	}
+        return $ret;
+    }
 
     private static function getInviteeName($module, $moduleId) {
         $retValue = "unknown";
@@ -136,12 +136,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/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/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.

modules/Import/maps/ImportMapSalesforce.php

Indentation +13 added lines, -13 removed lines

@@ -49,11 +49,11 @@ 
 
 class ImportMapSalesforce extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'salesforce';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter = ',';
@@ -61,18 +61,18 @@ 
      * Field enclosure
      */
     public $enclosure = '"';
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
 
-	/**
+    /**
      * Gets the default mapping for a module
      *
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {
@@ -151,15 +151,15 @@ 
         }
     }
 	
-	/**
-	* @see ImportMapOther::getIgnoredFields()
+    /**
+     * @see ImportMapOther::getIgnoredFields()
      */
-	public function getIgnoredFields(
-		$module
-		)
-	{
-		return array_merge(parent::getIgnoredFields($module),array('id'));
-	}
+    public function getIgnoredFields(
+        $module
+        )
+    {
+        return array_merge(parent::getIgnoredFields($module),array('id'));
+    }
 }
 
 

Switch Indentation +70 added lines, -70 removed lines

@@ -78,76 +78,76 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Description"=>"description",
-                "Birthdate"=>"birthdate",
-                "Lead Source"=>"lead_source",
-                "Assistant"=>"assistant",
-                "Asst. Phone"=>"assistant_phone",
-                "Mailing Street"=>"primary_address_street",
-                "Mailing Address Line1"=>"primary_address_street_2",
-                "Mailing Address Line2"=>"primary_address_street_3",
-                "Mailing Address Line3"=>"primary_address_street_4",
-                "Mailing City"=>"primary_address_city",
-                "Mailing State"=>"primary_address_state",
-                "Mailing Zip/Postal Code"=>"primary_address_postalcode",
-                "Mailing Country"=>"primary_address_country",
-                "Other Street"=>"alt_address_street",
-                "Other Address Line 1"=>"alt_address_street_2",
-                "Other Address Line 2"=>"alt_address_street_3",
-                "Other Address Line 3"=>"alt_address_street_4",
-                "Other City"=>"alt_address_city",
-                "Other State"=>"alt_address_state",
-                "Other Zip/Postal Code"=>"alt_address_postalcode",
-                "Other Country"=>"alt_address_country",
-                "Phone"=>"phone_work",
-                "Mobile"=>"phone_mobile",
-                "Home Phone"=>"phone_home",
-                "Other Phone"=>"phone_other",
-                "Fax"=>"phone_fax",
-                "Email"=>"email1",
-                "Email Opt Out"=>"email_opt_out",
-                "Do Not Call"=>"do_not_call",
-                "Account Name"=>"account_name",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Account Name"=>"name",
-                "Annual Revenue"=>"annual_revenue",
-                "Type"=>"account_type",
-                "Ticker Symbol"=>"ticker_symbol",
-                "Rating"=>"rating",
-                "Industry"=>"industry",
-                "SIC Code"=>"sic_code",
-                "Ownership"=>"ownership",
-                "Employees"=>"employees",
-                "Description"=>"description",
-                "Billing Street"=>"billing_address_street",
-                "Billing Address Line1"=>"billing_address_street_2",
-                "Billing Address Line2"=>"billing_address_street_3",
-                "Billing City"=>"billing_address_city",
-                "Billing State"=>"billing_address_state",
-                "Billing State/Province"=>"billing_address_state",
-                "Billing Zip/Postal Code"=>"billing_address_postalcode",
-                "Billing Country"=>"billing_address_country",
-                "Shipping Street"=>"shipping_address_street",
-                "Shipping Address Line1"=>"shipping_address_street_2",
-                "Shipping Address Line2"=>"shipping_address_street_3",
-                "Shipping City"=>"shipping_address_city",
-                "Shipping State"=>"shipping_address_state",
-                "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
-                "Shipping Country"=>"shipping_address_country",
-                "Phone"=>"phone_office",
-                "Fax"=>"phone_fax",
-                "Website"=>"website",
-                "Created Date"=>"date_entered",
-                );
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Description"=>"description",
+                    "Birthdate"=>"birthdate",
+                    "Lead Source"=>"lead_source",
+                    "Assistant"=>"assistant",
+                    "Asst. Phone"=>"assistant_phone",
+                    "Mailing Street"=>"primary_address_street",
+                    "Mailing Address Line1"=>"primary_address_street_2",
+                    "Mailing Address Line2"=>"primary_address_street_3",
+                    "Mailing Address Line3"=>"primary_address_street_4",
+                    "Mailing City"=>"primary_address_city",
+                    "Mailing State"=>"primary_address_state",
+                    "Mailing Zip/Postal Code"=>"primary_address_postalcode",
+                    "Mailing Country"=>"primary_address_country",
+                    "Other Street"=>"alt_address_street",
+                    "Other Address Line 1"=>"alt_address_street_2",
+                    "Other Address Line 2"=>"alt_address_street_3",
+                    "Other Address Line 3"=>"alt_address_street_4",
+                    "Other City"=>"alt_address_city",
+                    "Other State"=>"alt_address_state",
+                    "Other Zip/Postal Code"=>"alt_address_postalcode",
+                    "Other Country"=>"alt_address_country",
+                    "Phone"=>"phone_work",
+                    "Mobile"=>"phone_mobile",
+                    "Home Phone"=>"phone_home",
+                    "Other Phone"=>"phone_other",
+                    "Fax"=>"phone_fax",
+                    "Email"=>"email1",
+                    "Email Opt Out"=>"email_opt_out",
+                    "Do Not Call"=>"do_not_call",
+                    "Account Name"=>"account_name",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Account Name"=>"name",
+                    "Annual Revenue"=>"annual_revenue",
+                    "Type"=>"account_type",
+                    "Ticker Symbol"=>"ticker_symbol",
+                    "Rating"=>"rating",
+                    "Industry"=>"industry",
+                    "SIC Code"=>"sic_code",
+                    "Ownership"=>"ownership",
+                    "Employees"=>"employees",
+                    "Description"=>"description",
+                    "Billing Street"=>"billing_address_street",
+                    "Billing Address Line1"=>"billing_address_street_2",
+                    "Billing Address Line2"=>"billing_address_street_3",
+                    "Billing City"=>"billing_address_city",
+                    "Billing State"=>"billing_address_state",
+                    "Billing State/Province"=>"billing_address_state",
+                    "Billing Zip/Postal Code"=>"billing_address_postalcode",
+                    "Billing Country"=>"billing_address_country",
+                    "Shipping Street"=>"shipping_address_street",
+                    "Shipping Address Line1"=>"shipping_address_street_2",
+                    "Shipping Address Line2"=>"shipping_address_street_3",
+                    "Shipping City"=>"shipping_address_city",
+                    "Shipping State"=>"shipping_address_state",
+                    "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
+                    "Shipping Country"=>"shipping_address_country",
+                    "Phone"=>"phone_office",
+                    "Fax"=>"phone_fax",
+                    "Website"=>"website",
+                    "Created Date"=>"date_entered",
+                    );
+                break;
+            default:
+                return $return_array;
         }
     }
 	

Spacing +2 added lines, -2 removed lines

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

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

Indentation +12 added lines, -12 removed lines

@@ -47,11 +47,11 @@ 
 
 class ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'other';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter;
@@ -59,18 +59,18 @@ 
      * Field enclosure
      */
     public $enclosure;
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
 
-	/**
+    /**
      * Gets the default mapping for a module
      *
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {
@@ -142,18 +142,18 @@ 
         }
     }
 	
-	/**
+    /**
      * Returns a list of fields that should be ignorred for the module during import
      *
      * @param  string $module
      * @return array of fields to ignor
      */
-	public function getIgnoredFields(
-		$module
-		)
-	{
-		return array();
-	}
+    public function getIgnoredFields(
+        $module
+        )
+    {
+        return array();
+    }
 }
 
 

Switch Indentation +64 added lines, -64 removed lines

@@ -75,70 +75,70 @@
         )
     {
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return array(
-                "Salutation"=>"salutation",
-                "Full Name"=>"full_name",
-                "Company"=>"company",
-                "First Name"=>"first_name",
-                "Last Name"=>"last_name",
-                "Title"=>"title",
-                "Department"=>"department",
-                "Birthday"=>"birthdate",
-                "Home Phone"=>"phone_home",
-                "Mobile Phone"=>"phone_mobile",
-                "Business Phone"=>"phone_work",
-                "Other Phone"=>"phone_other",
-                "Business Fax"=>"phone_fax",
-                "E-mail Address"=>"email1",
-                "E-mail 2"=>"email2",
-                "Assistant's Name"=>"assistant",
-                "Assistant's Phone"=>"assistant_phone",
-                "Business Street"=>"primary_address_street",
-                "Business Street 2"=>"primary_address_street_2",
-                "Business Street 3"=>"primary_address_street_3",
-                "Business City"=>"primary_address_city",
-                "Business State"=>"primary_address_state",
-                "Business Postal Code"=>"primary_address_postalcode",
-                "Business Country/Region"=>"primary_address_country",
-                "Home Street"=>"alt_address_street",
-                "Home Street 2"=>"alt_address_street_2",
-                "Home Street 3"=>"alt_address_street_3",
-                "Home City"=>"alt_address_city",
-                "Home State"=>"alt_address_state",
-                "Home Postal Code"=>"alt_address_postalcode",
-                "Home Country/Region"=>"alt_address_country",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Company"=>"name",
-                "Business Street"=>"billing_address_street",
-                "Business City"=>"billing_address_city",
-                "Business State"=>"billing_address_state",
-                "Business Country"=>"billing_address_country",
-                "Business Postal Code"=>"billing_address_postalcode",
-                "Business Fax"=>"phone_fax",
-                "Company Main Phone"=>"phone_office",
-                "Web Page"=>"website",
-                );
-            break;
-        case 'Opportunities':
-            return array(
-                "Opportunity Name"=>"name" ,
-                "Type"=>"opportunity_type",
-                "Lead Source"=>"lead_source",
-                "Amount"=>"amount",
-                "Created Date"=>"date_entered",
-                "Close Date"=>"date_closed",
-                "Next Step"=>"next_step",
-                "Stage"=>"sales_stage",
-                "Probability (%)"=>"probability",
-                "Account Name"=>"account_name");
-            break;
-        default:
-            return array();
+            case 'Contacts':
+            case 'Leads':
+                return array(
+                    "Salutation"=>"salutation",
+                    "Full Name"=>"full_name",
+                    "Company"=>"company",
+                    "First Name"=>"first_name",
+                    "Last Name"=>"last_name",
+                    "Title"=>"title",
+                    "Department"=>"department",
+                    "Birthday"=>"birthdate",
+                    "Home Phone"=>"phone_home",
+                    "Mobile Phone"=>"phone_mobile",
+                    "Business Phone"=>"phone_work",
+                    "Other Phone"=>"phone_other",
+                    "Business Fax"=>"phone_fax",
+                    "E-mail Address"=>"email1",
+                    "E-mail 2"=>"email2",
+                    "Assistant's Name"=>"assistant",
+                    "Assistant's Phone"=>"assistant_phone",
+                    "Business Street"=>"primary_address_street",
+                    "Business Street 2"=>"primary_address_street_2",
+                    "Business Street 3"=>"primary_address_street_3",
+                    "Business City"=>"primary_address_city",
+                    "Business State"=>"primary_address_state",
+                    "Business Postal Code"=>"primary_address_postalcode",
+                    "Business Country/Region"=>"primary_address_country",
+                    "Home Street"=>"alt_address_street",
+                    "Home Street 2"=>"alt_address_street_2",
+                    "Home Street 3"=>"alt_address_street_3",
+                    "Home City"=>"alt_address_city",
+                    "Home State"=>"alt_address_state",
+                    "Home Postal Code"=>"alt_address_postalcode",
+                    "Home Country/Region"=>"alt_address_country",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Company"=>"name",
+                    "Business Street"=>"billing_address_street",
+                    "Business City"=>"billing_address_city",
+                    "Business State"=>"billing_address_state",
+                    "Business Country"=>"billing_address_country",
+                    "Business Postal Code"=>"billing_address_postalcode",
+                    "Business Fax"=>"phone_fax",
+                    "Company Main Phone"=>"phone_office",
+                    "Web Page"=>"website",
+                    );
+                break;
+            case 'Opportunities':
+                return array(
+                    "Opportunity Name"=>"name" ,
+                    "Type"=>"opportunity_type",
+                    "Lead Source"=>"lead_source",
+                    "Amount"=>"amount",
+                    "Created Date"=>"date_entered",
+                    "Close Date"=>"date_closed",
+                    "Next Step"=>"next_step",
+                    "Stage"=>"sales_stage",
+                    "Probability (%)"=>"probability",
+                    "Account Name"=>"account_name");
+                break;
+            default:
+                return array();
         }
     }
 	

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -126,7 +126,7 @@ 
             break;
         case 'Opportunities':
             return array(
-                "Opportunity Name"=>"name" ,
+                "Opportunity Name"=>"name",
                 "Type"=>"opportunity_type",
                 "Lead Source"=>"lead_source",
                 "Amount"=>"amount",

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

Indentation +13 added lines, -13 removed lines

@@ -175,19 +175,19 @@ 
      * @see SugarBean::retrieve()
      */
     public function retrieve($id = -1, $encode=true,$deleted=true)
-	{
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
+    {
+        $returnVal = parent::retrieve($id,$encode,$deleted);
 
-	    if ( !($returnVal instanceOf $this) ) {
-	        return $returnVal;
-	    }
+        if ( !($returnVal instanceOf $this) ) {
+            return $returnVal;
+        }
 
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
-	        $this->delimiter = "\t";
-	    }
+        if ( $this->source == 'tab' && $this->delimiter == '' ) {
+            $this->delimiter = "\t";
+        }
 
-	    return $this;
-	}
+        return $this;
+    }
 
     /**
      * Save
@@ -372,10 +372,10 @@ 
         //list of field values we track during import wizard
         $import_step_fields = array(
         //step1
-          //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
+            //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
         //step2
-           // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
-         //step3
+            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
+            //step3
             'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',

Spacing +38 added lines, -38 removed lines

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

Braces +16 added lines, -10 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.
@@ -227,7 +229,9 @@ 
 
         // Bug 23354 - Make sure enclosure gets saved as an empty string if
         // it is an empty string, instead of as a null
-        if ( strlen($enclosure) <= 0 ) $enclosure = ' ';
+        if ( strlen($enclosure) <= 0 ) {
+            $enclosure = ' ';
+        }
 
         $this->assigned_user_id = $owner_id;
         $this->name             = $name;
@@ -266,8 +270,9 @@ 
             $other_map = new ImportMap();
             $other_map->retrieve_by_string_fields(array('id'=> $id), false);
 
-            if ( $other_map->assigned_user_id != $current_user->id )
-                return false;
+            if ( $other_map->assigned_user_id != $current_user->id ) {
+                            return false;
+            }
         }
 
         return parent::mark_deleted($id);
@@ -287,8 +292,9 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) )
-            return false;
+        if ( !is_admin($current_user) ) {
+                    return false;
+        }
 
         // check for problems
         if ($flag) {
@@ -299,8 +305,7 @@ 
                 'name'         =>$this->name,
                 'is_published' =>'yes'
                 );
-        }
-        else {
+        } else {
             // if you are trying to unpublish a map
             // but you own an unpublished map by the same name
             $query_arr = array(
@@ -313,8 +318,9 @@ 
         $other_map->retrieve_by_string_fields($query_arr, false);
 
         // if we find this other map, quit
-        if ( isset($other_map->id) )
-            return false;
+        if ( isset($other_map->id) ) {
+                    return false;
+        }
 
         // otherwise update the is_published flag
         $query = "UPDATE $this->table_name