adamjakab / SuiteCRM

modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php

Indentation +6 added lines, -6 removed lines

@@ -99,13 +99,13 @@ 
         $source = "";
         if ($this->rhs_module == $this->lhs_module)
         {
-        	$source = $this->getJoinKeyLHS();
+            $source = $this->getJoinKeyLHS();
         }
  
         return array( 
-        	$this->lhs_module => $this->getSubpanelDefinition ( 
-        		$this->relationship_name, $this->rhs_module, $this->rhs_subpanel , $this->getRightModuleSystemLabel() , $source
-        	) 
+            $this->lhs_module => $this->getSubpanelDefinition ( 
+                $this->relationship_name, $this->rhs_module, $this->rhs_subpanel , $this->getRightModuleSystemLabel() , $source
+            ) 
         );
     }
 
@@ -113,7 +113,7 @@ 
     /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-	function buildVardefs ( )
+    function buildVardefs ( )
     {
         $vardefs = array ( ) ;
         
@@ -123,7 +123,7 @@ 
         ) ;
         if ($this->rhs_module != $this->lhs_module )
         {
-        	$vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, true,
+            $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, true,
                 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()  ) . '_TITLE');
         }
         if (! $this->relationship_only)

modules/ModuleBuilder/parsers/relationships/ManyToOneRelationship.php

Indentation +20 added lines, -20 removed lines

@@ -60,21 +60,21 @@ 
     function __construct ($definition) 
     {
         
-    	parent::__construct ( $definition ) ;
-    	$onetomanyDef = array_merge($definition, array(
-	        'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
-	        'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
-	        'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
-	        'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
-	        'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
-	        'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
-	        'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
-	        'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
-	        'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
-	        'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
-	        'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
-	        'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
-	        'relationship_type' => MB_ONETOMANY,
+        parent::__construct ( $definition ) ;
+        $onetomanyDef = array_merge($definition, array(
+            'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
+            'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
+            'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
+            'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
+            'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
+            'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
+            'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
+            'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
+            'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
+            'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
+            'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
+            'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
+            'relationship_type' => MB_ONETOMANY,
         ));
         $this->one_to_many = new OneToManyRelationship($onetomanyDef);
     }
@@ -83,7 +83,7 @@ 
      * BUILD methods called during the build
      */
 	
-	function buildLabels ()
+    function buildLabels ()
     {
         return $this->one_to_many->buildLabels();
     }
@@ -104,7 +104,7 @@ 
      */
     function buildVardefs ( )
     {
-       return $this->one_to_many->buildVardefs();
+        return $this->one_to_many->buildVardefs();
     }
     
     /*
@@ -130,19 +130,19 @@ 
     public function setName ($relationshipName)
     {
         parent::setName($relationshipName);
-    	$this->one_to_many->setname($relationshipName);
+        $this->one_to_many->setname($relationshipName);
     }
     
     public function setReadonly ()
     {
         parent::setReadonly();
-    	$this->one_to_many->setReadonly();
+        $this->one_to_many->setReadonly();
     }
     
     public function delete ()
     {
         parent::delete();
-    	$this->one_to_many->delete();
+        $this->one_to_many->delete();
     }
     
     public function setRelationship_only ()

modules/ModuleBuilder/parsers/relationships/ActivitiesRelationship.php

Indentation +16 added lines, -16 removed lines

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

modules/ModuleBuilder/parsers/constants.php

Indentation +2 added lines, -2 removed lines

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

modules/ModuleBuilder/parsers/parser.label.php

Indentation +36 added lines, -36 removed lines

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

modules/ModuleBuilder/parsers/parser.dropdown.php

Indentation +119 added lines, -119 removed lines

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

modules/ModuleBuilder/parsers/parser.modifylayoutview.php

Indentation +3 added lines, -3 removed lines

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

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

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
+    }
 }
 ?>