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

Indentation +47 added lines, -47 removed lines

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

modules/ModuleBuilder/parsers/ParserFactory.php

Indentation +1 added lines, -1 removed lines

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