adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.history.php

Indentation +20 added lines, -20 removed lines

@@ -47,19 +47,19 @@ 
     var $pageSize = 10 ;
 
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display ()
+    function display ()
     {
         $this->layout = strtolower ( $_REQUEST [ 'view' ] ) ;
         
@@ -135,7 +135,7 @@ 
         }
         echo "<input type='button' name='close$sid' value='". translate ( 'LBL_BTN_CLOSE' )."' " . 
                 "class='button' onclick='ModuleBuilder.tabPanel.removeTab(ModuleBuilder.tabPanel.get(\"activeTab\"));' style='margin:5px;'>" . 
-             "<input type='button' name='restore$sid' value='" . translate ( 'LBL_MB_RESTORE' ) . "' " .  
+                "<input type='button' name='restore$sid' value='" . translate ( 'LBL_MB_RESTORE' ) . "' " .  
                 "class='button' onclick='ModuleBuilder.history.revert(\"$this->module\",\"{$this->layout}\",\"$sid\"$subpanel);' style='margin:5px;'>" ;
         $this->history->restoreByTimestamp ( $sid ) ;
         $view ;
@@ -149,12 +149,12 @@ 
             $view = new ViewSearchView ( ) ;
         } else if ($this->layout == 'dashlet' || $this->layout == 'dashletsearch')
         {
-        	require_once ("modules/ModuleBuilder/views/view.dashlet.php") ;
-        	$view = new ViewDashlet ( ) ;
+            require_once ("modules/ModuleBuilder/views/view.dashlet.php") ;
+            $view = new ViewDashlet ( ) ;
         }  else if ($this->layout == 'popuplist' || $this->layout == 'popupsearch')
         {
-        	require_once ("modules/ModuleBuilder/views/view.popupview.php") ;
-        	$view = new ViewPopupview ( ) ;
+            require_once ("modules/ModuleBuilder/views/view.popupview.php") ;
+            $view = new ViewPopupview ( ) ;
         } else
         {
             require_once ("modules/ModuleBuilder/views/view.layoutview.php") ;
@@ -175,12 +175,12 @@ 
         $this->history->restoreByTimestamp ( $sid ) ;
     }
 
-	/**
- 	 * Restores a layout to its current customized state. 
- 	 * Called when leaving a restored layout without saving.
- 	 */
+    /**
+     * Restores a layout to its current customized state. 
+     * Called when leaving a restored layout without saving.
+     */
     function unrestore() 
     {
-    	$this->history->undoRestore () ;
+        $this->history->undoRestore () ;
     }
 }

modules/ModuleBuilder/views/view.labels.php

Indentation +89 added lines, -89 removed lines

@@ -48,73 +48,73 @@ 
 class ViewLabels extends ViewModulefields
 {
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
- 	//STUDIO LABELS ONLY//
- 	//TODO Bundle Studio and ModuleBuilder label handling to increase maintainability.
- 	function display()
- 	{
-		$editModule = $_REQUEST['view_module'];
-		$allLabels = (!empty($_REQUEST['labels']) && $_REQUEST['labels']== 'all');
+        //STUDIO LABELS ONLY//
+        //TODO Bundle Studio and ModuleBuilder label handling to increase maintainability.
+        function display()
+        {
+        $editModule = $_REQUEST['view_module'];
+        $allLabels = (!empty($_REQUEST['labels']) && $_REQUEST['labels']== 'all');
 
- 		if (!isset($_REQUEST['MB']))
-		{
-		    global $app_list_strings;
-		    $moduleNames = array_change_key_case($app_list_strings['moduleList']);
-		    $translatedEditModule = $moduleNames[strtolower($editModule)];
-		}
-		$selected_lang = (!empty($_REQUEST['selected_lang'])? $_REQUEST['selected_lang']:$_SESSION['authenticated_user_language']);
-		if(empty($selected_lang)){
-		    $selected_lang = $GLOBALS['sugar_config']['default_language'];
-		}
+            if (!isset($_REQUEST['MB']))
+        {
+            global $app_list_strings;
+            $moduleNames = array_change_key_case($app_list_strings['moduleList']);
+            $translatedEditModule = $moduleNames[strtolower($editModule)];
+        }
+        $selected_lang = (!empty($_REQUEST['selected_lang'])? $_REQUEST['selected_lang']:$_SESSION['authenticated_user_language']);
+        if(empty($selected_lang)){
+            $selected_lang = $GLOBALS['sugar_config']['default_language'];
+        }
 
-		$smarty = new Sugar_Smarty();
-		global $mod_strings;
+        $smarty = new Sugar_Smarty();
+        global $mod_strings;
         $smarty->assign('mod_strings', $mod_strings);
-		$smarty->assign('available_languages',get_languages());
+        $smarty->assign('available_languages',get_languages());
 
 
         $objectName = BeanFactory::getObjectName($editModule);
         VardefManager::loadVardef($editModule, $objectName);
         global $dictionary;
         $vnames = array();
-		//jchi 24557 . We should list all the lables in viewdefs(list,detail,edit,quickcreate) that the user can edit them.
-		require_once 'modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php' ;
+        //jchi 24557 . We should list all the lables in viewdefs(list,detail,edit,quickcreate) that the user can edit them.
+        require_once 'modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php' ;
         $parser = new ListLayoutMetaDataParser ( MB_LISTVIEW, $editModule ) ;
         foreach ( $parser->getLayout() as $key => $def )
         {
-        	if(isset($def['label']) ) {
-               $vnames[$def['label']] = $def['label'];
-        	}
+            if(isset($def['label']) ) {
+                $vnames[$def['label']] = $def['label'];
+            }
         }
 
-       require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
+        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
         $variableMap = $this->getVariableMap($editModule);
         foreach($variableMap as $key => $value){
-        	$gridLayoutMetaDataParserTemp = new GridLayoutMetaDataParser ( $value, $editModule) ;
-        	foreach ( $gridLayoutMetaDataParserTemp->getLayout() as $panel)
-	        {
-	                foreach ( $panel as $row )
-	                {
-	                    foreach ( $row as $fieldArray )
-	                    { // fieldArray is an array('name'=>name,'label'=>label)
-	                        if (isset ( $fieldArray [ 'label' ] ))
-	                        {
-	                            $vnames[$fieldArray [ 'label' ] ] = $fieldArray [ 'label' ] ;
-	                        }
-	                    }
-	                }
-	        }
+            $gridLayoutMetaDataParserTemp = new GridLayoutMetaDataParser ( $value, $editModule) ;
+            foreach ( $gridLayoutMetaDataParserTemp->getLayout() as $panel)
+            {
+                    foreach ( $panel as $row )
+                    {
+                        foreach ( $row as $fieldArray )
+                        { // fieldArray is an array('name'=>name,'label'=>label)
+                            if (isset ( $fieldArray [ 'label' ] ))
+                            {
+                                $vnames[$fieldArray [ 'label' ] ] = $fieldArray [ 'label' ] ;
+                            }
+                        }
+                    }
+            }
         }
         //end
 
@@ -122,23 +122,23 @@ 
         require_once ('include/SubPanel/SubPanel.php') ;
         $subList =  SubPanel::getModuleSubpanels ( $editModule );
         foreach($subList as $subpanel => $titleLabel) {
-        	$vnames[$titleLabel] = $titleLabel;
+            $vnames[$titleLabel] = $titleLabel;
         }
 
         foreach($dictionary[$objectName]['fields'] as $name=>$def) {
-        	if(isset($def['vname'])) {
-               $vnames[$def['vname']] = $def['vname'];
-        	}
-		}
- 	    $formatted_mod_strings = array();
+            if(isset($def['vname'])) {
+                $vnames[$def['vname']] = $def['vname'];
+            }
+        }
+            $formatted_mod_strings = array();
 
- 	    //we shouldn't set the $refresh=true here, or will lost template language mod_strings.
- 	    //return_module_language($selected_lang, $editModule,false) : the mod_strings will be included from cache files here.
+            //we shouldn't set the $refresh=true here, or will lost template language mod_strings.
+            //return_module_language($selected_lang, $editModule,false) : the mod_strings will be included from cache files here.
         foreach(return_module_language($selected_lang, $editModule,false) as $name=>$label) {
-        		//#25294
-        	 	if($allLabels || isset($vnames[$name]) || preg_match( '/lbl_city|lbl_country|lbl_billing_address|lbl_alt_address|lbl_shipping_address|lbl_postal_code|lbl_state$/si' , $name)) {
+                //#25294
+                    if($allLabels || isset($vnames[$name]) || preg_match( '/lbl_city|lbl_country|lbl_billing_address|lbl_alt_address|lbl_shipping_address|lbl_postal_code|lbl_state$/si' , $name)) {
                     $formatted_mod_strings[$name] = htmlentities($label, ENT_QUOTES, 'UTF-8');
-        	 	}
+                    }
         }
         //Grab everything from the custom files
         $mod_bak = $mod_strings;
@@ -147,49 +147,49 @@ 
             "custom/modules/$editModule/Ext/Language/$selected_lang.lang.ext.php"
         );
         foreach($files as $langfile){
-        	$mod_strings = array();
-        	if (is_file($langfile))
-        	{
-        	   include($langfile);
-        	   foreach($mod_strings as $key => $label)
-        	   {
+            $mod_strings = array();
+            if (is_file($langfile))
+            {
+                include($langfile);
+                foreach($mod_strings as $key => $label)
+                {
                     $formatted_mod_strings[$key] = htmlentities($label, ENT_QUOTES, 'UTF-8');
-        	   }
-        	}
+                }
+            }
         }
         $mod_strings = $mod_bak;
         ksort($formatted_mod_strings);
-		$smarty->assign('MOD', $formatted_mod_strings);
-		$smarty->assign('view_module', $editModule);
-		$smarty->assign('APP', $GLOBALS['app_strings']);
-		$smarty->assign('selected_lang', $selected_lang);
-		$smarty->assign('defaultHelp', 'labelsBtn');
-		$smarty->assign('assistant', array('key'=>'labels', 'group'=>'module'));
-		$smarty->assign('labels_choice', $mod_strings['labelTypes']);
-		$smarty->assign('labels_current', $allLabels?"all":"");
+        $smarty->assign('MOD', $formatted_mod_strings);
+        $smarty->assign('view_module', $editModule);
+        $smarty->assign('APP', $GLOBALS['app_strings']);
+        $smarty->assign('selected_lang', $selected_lang);
+        $smarty->assign('defaultHelp', 'labelsBtn');
+        $smarty->assign('assistant', array('key'=>'labels', 'group'=>'module'));
+        $smarty->assign('labels_choice', $mod_strings['labelTypes']);
+        $smarty->assign('labels_current', $allLabels?"all":"");
 
-		$ajax = new AjaxCompose();
-		$ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
-		$ajax->addCrumb($translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$editModule.'")');
-		$ajax->addCrumb($mod_strings['LBL_LABELS'], '');
+        $ajax = new AjaxCompose();
+        $ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
+        $ajax->addCrumb($translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$editModule.'")');
+        $ajax->addCrumb($mod_strings['LBL_LABELS'], '');
 
- 		$html = $smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl');
- 		$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_SECTION_EDLABELS'], $html);
- 		echo $ajax->getJavascript();
- 	}
+            $html = $smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl');
+            $ajax->addSection('center', $GLOBALS['mod_strings']['LBL_SECTION_EDLABELS'], $html);
+            echo $ajax->getJavascript();
+        }
     
     // fixing bug #39749: Quick Create in Studio
     function getVariableMap($module)
     {
         $variableMap = array(MB_EDITVIEW => 'EditView', 
-                             MB_DETAILVIEW => 'DetailView', 
-                             MB_QUICKCREATE => 'QuickCreate');
+                                MB_DETAILVIEW => 'DetailView', 
+                                MB_QUICKCREATE => 'QuickCreate');
         
         $hideQuickCreateForModules = array('KBDocuments',
-                                           'ProjectTask',
-                                           'Campaigns',
-                                           'Quotes',
-                                           'ProductTemplates');
+                                            'ProjectTask',
+                                            'Campaigns',
+                                            'Quotes',
+                                            'ProductTemplates');
         
         if(in_array($module, $hideQuickCreateForModules))
         {

modules/ModuleBuilder/views/view.modulefield.php

Indentation +65 added lines, -65 removed lines

@@ -43,20 +43,20 @@ 
 class ViewModulefield extends SugarView
 {
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
+    function display()
+    {
         $ac = $this->fetch();
         echo $ac->getJavascript();
     }
@@ -76,21 +76,21 @@ 
             $field_name = '';
 
         $action = 'saveField'; // tyoung bug 17606: default action is to save as a dynamic field; but for standard OOB
-                               // fields we override this so don't create a new dynamic field instead of updating the existing field
+                                // fields we override this so don't create a new dynamic field instead of updating the existing field
 
         $isClone = false;
         if(!empty($this->view_object_map['is_clone']) && $this->view_object_map['is_clone']
             && (strcmp($field_name, "name") != 0)   // bug #35767, do not allow cloning of name field
             )
             $isClone = true;
-		/*
+        /*
 		$field_types =  array('varchar'=>'YourField', 'int'=>'Integer', 'float'=>'Decimal','bool'=>'Checkbox','enum'=>'DropDown',
 				'date'=>'Date', 'phone' => 'Phone', 'currency' => 'Currency', 'html' => 'HTML', 'radioenum' => 'Radio',
 				'relate' => 'Relate', 'address' => 'Address', 'text' => 'TextArea', 'url' => 'Link');
 		*/
-		$field_types = $GLOBALS['mod_strings']['fieldTypes'];
-		if (isset($field_types['encrypt']))
-		  unset($field_types['encrypt']);
+        $field_types = $GLOBALS['mod_strings']['fieldTypes'];
+        if (isset($field_types['encrypt']))
+            unset($field_types['encrypt']);
         $field_name_exceptions = array(
             //bug 22264: Field name must not be an SQL keyword.
             //Taken from SQL Server's list of reserved keywords; http://msdn.microsoft.com/en-us/library/aa238507(SQL.80).aspx
@@ -110,26 +110,26 @@ 
             'DROP','OPENROWSET','VIEW','DUMMY','OPENXML','WAITFOR','DUMP','OPTION','WHEN','ELSE','OR','WHERE',
             'END','ORDER','WHILE','ERRLVL','OUTER','WITH','ESCAPE','OVER','WRITETEXT',
             //Mysql Keywords from http://dev.mysql.com/doc/refman/5.0/en/reserved-words.html (those not in MSSQL's list)
-			'ANALYZE', 'ASENSITIVE', 'BEFORE', 'BIGINT', 'BINARY', 'BOTH', 'CALL', 'CHANGE', 'CHARACTER',
-			'CONDITION', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DELAYED',
-			'DESCRIBE', 'DETERMINISTIC', 'DISTINCTROW', 'DIV', 'DUAL', 'EACH', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXPLAIN',
-			'FALSE', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FORCE', 'FULLTEXT', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE',
-			'HOUR_SECOND', 'IGNORE', 'INFILE', 'INOUT', 'INSENSITIVE', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8',
-			'INTEGER', 'ITERATE', 'KEYS', 'LEADING', 'LEAVE', 'LIMIT', 'LINES', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK',
-			'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT',
-			'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NO_WRITE_TO_BINLOG', 'NUMERIC', 'OPTIMIZE',
-			'OPTIONALLY', 'OUT', 'OUTFILE', 'PURGE', 'READS', 'REAL', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE',
-			'REQUIRE', 'RLIKE', 'SCHEMAS', 'SECOND_MICROSECOND', 'SENSITIVE', 'SEPARATOR', 'SHOW', 'SMALLINT', 'SONAME',
-			'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS',
-			'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TERMINATED', 'TINYBLOB', 'TINYINT', 'TINYTEXT',
-			'TRAILING', 'TRUE', 'UNDO', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP',
-			'VARBINARY', 'VARCHARACTER', 'WRITE', 'XOR', 'YEAR_MONTH', 'ZEROFILL', 'CONNECTION', 'LABEL', 'UPGRADE',
-			//Oracle datatypes
+            'ANALYZE', 'ASENSITIVE', 'BEFORE', 'BIGINT', 'BINARY', 'BOTH', 'CALL', 'CHANGE', 'CHARACTER',
+            'CONDITION', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DELAYED',
+            'DESCRIBE', 'DETERMINISTIC', 'DISTINCTROW', 'DIV', 'DUAL', 'EACH', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXPLAIN',
+            'FALSE', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FORCE', 'FULLTEXT', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE',
+            'HOUR_SECOND', 'IGNORE', 'INFILE', 'INOUT', 'INSENSITIVE', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8',
+            'INTEGER', 'ITERATE', 'KEYS', 'LEADING', 'LEAVE', 'LIMIT', 'LINES', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK',
+            'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT',
+            'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NO_WRITE_TO_BINLOG', 'NUMERIC', 'OPTIMIZE',
+            'OPTIONALLY', 'OUT', 'OUTFILE', 'PURGE', 'READS', 'REAL', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE',
+            'REQUIRE', 'RLIKE', 'SCHEMAS', 'SECOND_MICROSECOND', 'SENSITIVE', 'SEPARATOR', 'SHOW', 'SMALLINT', 'SONAME',
+            'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS',
+            'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TERMINATED', 'TINYBLOB', 'TINYINT', 'TINYTEXT',
+            'TRAILING', 'TRUE', 'UNDO', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP',
+            'VARBINARY', 'VARCHARACTER', 'WRITE', 'XOR', 'YEAR_MONTH', 'ZEROFILL', 'CONNECTION', 'LABEL', 'UPGRADE',
+            //Oracle datatypes
             'DATE','VARCHAR','VARCHAR2','NVARCHAR2','CHAR','NCHAR','NUMBER','PLS_INTEGER','BINARY_INTEGER','LONG','TIMESTAMP',
-			'INTERVAL','RAW','ROWID','UROWID','MLSLABEL','CLOB','NCLOB','BLOB','BFILE','XMLTYPE',
-			//SugarCRM reserved
-        	'ID', 'ID_C', 'PARENT_NAME', 'PARENT_ID',
-			);
+            'INTERVAL','RAW','ROWID','UROWID','MLSLABEL','CLOB','NCLOB','BLOB','BFILE','XMLTYPE',
+            //SugarCRM reserved
+            'ID', 'ID_C', 'PARENT_NAME', 'PARENT_ID',
+            );
 
 
         //C.L. - Add support to mark related module id columns as reserved keywords
@@ -173,14 +173,14 @@ 
                 $fv->ss->assign('hideLevel', 3);
             }
             if($isClone && isset($vardef['type']) && $vardef['type'] == 'datetime'){
-            	$vardef['type'] = 'datetimecombo';
+                $vardef['type'] = 'datetimecombo';
             }
             
-			require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/DynamicFields/FieldCases.php') ;
             $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
             $tf->module = $module;
             $tf->populateFromRow($vardef);
-			$vardef = array_merge($vardef, $tf->get_field_def());
+            $vardef = array_merge($vardef, $tf->get_field_def());
 
             //          $GLOBALS['log']->debug('vardefs after loading = '.print_r($vardef,true));
            
@@ -190,10 +190,10 @@ 
             $enumFields = array();
             foreach($module->field_defs as $field => $def)
             {
-            	if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
-            	   $allowAutoInc = false;
-            	   continue;
-            	}
+                if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
+                    $allowAutoInc = false;
+                    continue;
+                }
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
                     if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
@@ -210,7 +210,7 @@ 
             }
             $fv->ss->assign('module', $module);
             if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+                $field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
             $edit_or_add = 'editField' ;
 
@@ -244,7 +244,7 @@ 
                 }
             }
 
-			require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/DynamicFields/FieldCases.php') ;
             $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
             $tf->module = $module;
             $tf->populateFromRow($vardef);
@@ -258,8 +258,8 @@ 
 
             if(isset($vardef['vname']))
                 $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
-			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
+                $field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
@@ -280,7 +280,7 @@ 
         }
 
         if($_REQUEST['action'] == 'RefreshField'){
-        	require_once('modules/DynamicFields/FieldCases.php');
+            require_once('modules/DynamicFields/FieldCases.php');
             $field = get_widget($_POST['type']);
             $field->populateFromPost();
             $vardef = $field->get_field_def();
@@ -289,16 +289,16 @@ 
         }
 
         foreach(array("formula", "default", "comments", "help", "visiblityGrid") as $toEscape)
-		{
-			if (!empty($vardef[$toEscape]) && is_string($vardef[$toEscape])) {
-	        	$vardef[$toEscape] = htmlentities($vardef[$toEscape], ENT_QUOTES, 'UTF-8');
-	        }
-		}
+        {
+            if (!empty($vardef[$toEscape]) && is_string($vardef[$toEscape])) {
+                $vardef[$toEscape] = htmlentities($vardef[$toEscape], ENT_QUOTES, 'UTF-8');
+            }
+        }
 		
         if((!empty($vardef['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
            || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) // bug #35767, do not allow cloning of name field
             {
-               $fv->ss->assign('no_duplicate', true);
+                $fv->ss->assign('no_duplicate', true);
             }
 
         $fv->ss->assign('action',$action);
@@ -318,25 +318,25 @@ 
         $existing_field_names = array () ;
         foreach ( $module->mbvardefs->vardefs['fields'] as $field )
         {
-        	if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
-        	{
-        		$triggers [] = $field [ 'name' ] ;
-        	}
+            if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
+            {
+                $triggers [] = $field [ 'name' ] ;
+            }
         	
-        	if (!isset($field['source']) || $field['source'] != 'non-db') {
-        		if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
-        		{
-        			$existing_field_names [] = strtoupper($matches[1]);	
-        		}
-        	}
+            if (!isset($field['source']) || $field['source'] != 'non-db') {
+                if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
+                {
+                    $existing_field_names [] = strtoupper($matches[1]);	
+                }
+            }
         }
         
         $fv->ss->assign('triggers',$triggers);
         $fv->ss->assign('existing_field_names', $json->encode($existing_field_names));
         $fv->ss->assign('mod_strings',$GLOBALS['mod_strings']);
 
-		// jchi #24880
-		// end
+        // jchi #24880
+        // end
 
 
         $layout = $fv->getLayout($vardef);

modules/ModuleBuilder/views/view.deletepackage.php

Indentation +12 added lines, -12 removed lines

@@ -42,20 +42,20 @@ 
 
 class Viewdeletepackage extends SugarView
 {
- 	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+        /**
+         * @see SugarView::_getModuleTitleParams()
+         */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
+    function display()
     {
         global $mod_strings;
         
@@ -63,5 +63,5 @@ 
         $ajax->addSection('center', $mod_strings['LBL_PACKAGE_DELETED'], 
             str_replace('[[package]]',$_REQUEST['package'],$mod_strings['LBL_PACKAGE_WAS_DELETED']));
         echo $ajax->getJavascript();
- 	}
+        }
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.home.php

Indentation +38 added lines, -38 removed lines

@@ -40,51 +40,51 @@
 require_once('modules/ModuleBuilder/MB/AjaxCompose.php');
 class ViewHome extends SugarView
 {
-	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+    /**
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
-		global $current_user;
-		global $mod_strings;
-		$smarty = new Sugar_Smarty();
-		$smarty->assign('title' , $mod_strings['LBL_DEVELOPER_TOOLS']);
-		$smarty->assign('question', $mod_strings['LBL_QUESTION_EDITOR']);
-		$smarty->assign('defaultHelp', 'mainHelp');
-		$this->generateHomeButtons();
-		$smarty->assign('buttons', $this->buttons);
-		$assistant=array('group'=>'main', 'key'=>'welcome');
-		$smarty->assign('assistant',$assistant);
-		//initialize Assistant's display property.
-		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
-		$smarty->assign('userPref',$userPref);
-		$ajax = new AjaxCompose();
-		$ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
-		echo $ajax->getJavascript();
-	}
+    function display()
+    {
+        global $current_user;
+        global $mod_strings;
+        $smarty = new Sugar_Smarty();
+        $smarty->assign('title' , $mod_strings['LBL_DEVELOPER_TOOLS']);
+        $smarty->assign('question', $mod_strings['LBL_QUESTION_EDITOR']);
+        $smarty->assign('defaultHelp', 'mainHelp');
+        $this->generateHomeButtons();
+        $smarty->assign('buttons', $this->buttons);
+        $assistant=array('group'=>'main', 'key'=>'welcome');
+        $smarty->assign('assistant',$assistant);
+        //initialize Assistant's display property.
+        $userPref = $current_user->getPreference('mb_assist', 'Assistant');
+        if(!$userPref) $userPref="na";
+        $smarty->assign('userPref',$userPref);
+        $ajax = new AjaxCompose();
+        $ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
+        echo $ajax->getJavascript();
+    }
 
 
-	function generateHomeButtons() 
-	{
-	    global $current_user;
+    function generateHomeButtons() 
+    {
+        global $current_user;
         if(displayStudioForCurrentUser() == true) {
-		//$this->buttons['Application'] = array ('action' => '', 'imageTitle' => 'Application', 'size' => '128', 'help'=>'appBtn');
-		$this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array ('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
+        //$this->buttons['Application'] = array ('action' => '', 'imageTitle' => 'Application', 'size' => '128', 'help'=>'appBtn');
+        $this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array ('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
         }
         if(is_admin($current_user)) {
-		$this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array ('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
+        $this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array ('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
         }
-		$this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array ('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
-	}
+        $this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array ('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
+    }
 }
\ No newline at end of file

modules/ModuleBuilder/parsers/StandardField.php

Indentation +16 added lines, -16 removed lines

@@ -44,9 +44,9 @@ 
 
 class StandardField extends DynamicField
 {
-	var $custom_def = array();
-	var $base_def = array();
-	var $baseField;
+    var $custom_def = array();
+    var $base_def = array();
+    var $baseField;
 	
 
     function __construct($module = '') {
@@ -54,15 +54,15 @@ 
     }
     
     protected function loadCustomDef($field){
-    	global $beanList;
-    	if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
-    	{
+        global $beanList;
+        if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
+        {
             $bean_name = get_valid_bean_name($this->module);
             $dictionary = array($bean_name => array("fields" => array($field => array())));
             include("$this->base_path/sugarfield_$field.php");
             if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field]))
                 $this->custom_def = $dictionary[$bean_name]["fields"][$field];
-    	}
+        }
     }
 
     protected function loadBaseDef($field){
@@ -118,24 +118,24 @@ 
         $this->baseField = get_widget ( $field->type) ;
         foreach ($field->vardef_map as $property => $fmd_col){
            
-        	if ($property == "action" || $property == "label_value" || $property == "label"
-            	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
+            if ($property == "action" || $property == "label_value" || $property == "label"
+                || ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
             ) 
-            	continue;
+                continue;
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
-            	((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
-            		|| (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
-            	)
+                ((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
+                    || (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
+                )
             ){
-            	$this->custom_def[$property] =
+                $this->custom_def[$property] =
                     is_string($newDef[$property]) ? htmlspecialchars_decode($newDef[$property], ENT_QUOTES) : $newDef[$property];
             }
             
             //Remove any orphaned entries
             if (isset($this->custom_def[$property]) && !isset($newDef[$property]))
-            	unset($this->custom_def[$property]);
+                unset($this->custom_def[$property]);
 
             //Handle overrides of out of the box definitions with empty
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
@@ -153,7 +153,7 @@ 
         }
         
         if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"]))
-        	unset($this->custom_def["duplicate_merge_dom_value"]);
+            unset($this->custom_def["duplicate_merge_dom_value"]);
         
         $this->writeVardefExtension($bean_name, $field, $this->custom_def);
     }

modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php

Indentation +84 added lines, -84 removed lines

@@ -59,7 +59,7 @@ 
     public static $definitionKeys = array ( 
         // atttributes of this relationship - here in the definition so they are preserved across saves and loads
         'for_activities',
-    	'is_custom',
+        'is_custom',
         'from_studio',
         'readonly' , // a readonly relationship cannot be Built by subclasses of AbstractRelationships
         'deleted' , // a deleted relationship will not be built, and if it had been built previously the built relationship will be removed
@@ -221,48 +221,48 @@ 
         $labelDefinitions = array ( ) ;
         if (!$this->relationship_only)
         {
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
-        		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
-        			$rightSysLabel = $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
-        		}
-        		$layout_defs = array();
-        	}
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
-        		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
-        			$leftSysLabel = $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
-        		}
-        		$layout_defs = array();
-        	}
-        	$labelDefinitions [] = array (
-        		'module' => $this->rhs_module ,
-        		'system_label' => isset($rightSysLabel)?$rightSysLabel : 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
-        		'display_label' => ($update && !empty($_REQUEST [ 'lhs_label' ] ))?$_REQUEST [ 'lhs_label' ] :(empty($this->lhs_label) ? translate ( $this->lhs_module ) : $this->lhs_label),
-        	) ;
+            if(!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+                include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
+                if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+                    $rightSysLabel = $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
+                }
+                $layout_defs = array();
+            }
+            if(!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+                include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
+                if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+                    $leftSysLabel = $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
+                }
+                $layout_defs = array();
+            }
+            $labelDefinitions [] = array (
+                'module' => $this->rhs_module ,
+                'system_label' => isset($rightSysLabel)?$rightSysLabel : 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
+                'display_label' => ($update && !empty($_REQUEST [ 'lhs_label' ] ))?$_REQUEST [ 'lhs_label' ] :(empty($this->lhs_label) ? translate ( $this->lhs_module ) : $this->lhs_label),
+            ) ;
             $labelDefinitions [] = array (
-            	'module' => $this->lhs_module ,
-            	'system_label' =>  isset($leftSysLabel)?$leftSysLabel :'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel() ) . '_TITLE' ,
-            	'display_label' => ($update && !empty($_REQUEST [ 'rhs_label' ] ))?$_REQUEST [ 'rhs_label' ] :(empty($this->rhs_label) ? translate ( $this->rhs_module ) : $this->rhs_label),
+                'module' => $this->lhs_module ,
+                'system_label' =>  isset($leftSysLabel)?$leftSysLabel :'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel() ) . '_TITLE' ,
+                'display_label' => ($update && !empty($_REQUEST [ 'rhs_label' ] ))?$_REQUEST [ 'rhs_label' ] :(empty($this->rhs_label) ? translate ( $this->rhs_module ) : $this->rhs_label),
             ) ;
         }
         return $labelDefinitions ;
     }
 
-	function getLeftModuleSystemLabel()
+    function getLeftModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
-			return $this->lhs_module.'_L';
-		}
-		return $this->lhs_module;
+        if($this->lhs_module == $this->rhs_module){
+            return $this->lhs_module.'_L';
+        }
+        return $this->lhs_module;
     }
 
     function getRightModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
-			return $this->rhs_module.'_R';
-		}
-		return $this->rhs_module;
+        if($this->lhs_module == $this->rhs_module){
+            return $this->rhs_module.'_R';
+        }
+        return $this->rhs_module;
     }
 
     /**
@@ -298,24 +298,24 @@ 
     protected function getSubpanelDefinition ($relationshipName , $sourceModule , $subpanelName, $titleKeyName = '', $source = "")
     {
         if (empty($source)) 
-        	$source = $this->getValidDBName($relationshipName);
-    	$subpanelDefinition = array ( ) ;
+            $source = $this->getValidDBName($relationshipName);
+        $subpanelDefinition = array ( ) ;
         $subpanelDefinition [ 'order' ] = 100 ;
         $subpanelDefinition [ 'module' ] = $sourceModule ;
         $subpanelDefinition [ 'subpanel_name' ] = $subpanelName ;
         // following two lines are required for the subpanel pagination code in ListView.php->processUnionBeans() to correctly determine the relevant field for sorting
         $subpanelDefinition [ 'sort_order' ] = 'asc' ;
         $subpanelDefinition [ 'sort_by' ] = 'id' ;
-		if(!empty($titleKeyName)){
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
-		}
+        if(!empty($titleKeyName)){
+            $subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
+        }else{
+            $subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        }
         $subpanelDefinition [ 'get_subpanel_data' ] = $source ;
         $subpanelDefinition [ 'top_buttons' ] = array(
-		    array('widget_class' => "SubPanelTopButtonQuickCreate"),
-		    array('widget_class' => 'SubPanelTopSelectButton', 'mode'=>'MultiSelect')
-		);
+            array('widget_class' => "SubPanelTopButtonQuickCreate"),
+            array('widget_class' => 'SubPanelTopSelectButton', 'mode'=>'MultiSelect')
+        );
         
         return array ( $subpanelDefinition );
     }
@@ -339,7 +339,7 @@ 
         $vardef [ 'module' ] = $sourceModule ;
         $vardef [ 'bean_name' ] = BeanFactory::getObjectName($sourceModule) ;
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+            $vardef [ 'side' ] = 'right' ;
         if (!empty($vname))
             $vardef [ 'vname' ] = $vname;
         if (!empty($id_name))
@@ -364,11 +364,11 @@ 
         $vardef [ 'type' ] = 'link' ;
         $vardef [ 'relationship' ] = $relationshipName ;
         $vardef [ 'source' ] = 'non-db' ;
-		$vardef ['reportable'] = false;
+        $vardef ['reportable'] = false;
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+            $vardef [ 'side' ] = 'right' ;
         else
-        	$vardef [ 'side' ] = 'left' ;
+            $vardef [ 'side' ] = 'left' ;
         if (!empty($vname))
             $vardef [ 'vname' ] = $vname;
 
@@ -389,11 +389,11 @@ 
         $vardef [ 'type' ] = 'relate' ;
 
         $vardef [ 'source' ] = 'non-db' ;
-		if(!empty($vnameLabel)){
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
-		}else{
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
-		}
+        if(!empty($vnameLabel)){
+            $vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
+        }else{
+            $vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        }
         
         $vardef [ 'save' ] = true; // the magic value to tell SugarBean to save this relate field even though it is not listed in the $relationship_fields array
        
@@ -421,7 +421,7 @@ 
             if (in_array( 'file' , array_keys ( $module->config [ 'templates' ] ) ) ){
                 $vardef [ 'rname' ] = 'document_name' ;
             }elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
-            	$vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+                $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
             }
         }
         else
@@ -450,11 +450,11 @@ 
                     require_once ( $GLOBALS ['beanFiles'] [ $object ] );
                     $bean = new $object();
                     if ( isset ( $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    	if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		$vardef [ 'rname' ] = 'document_name' ;
-                    	}elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		 $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
-                    	}
+                        if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
+                            $vardef [ 'rname' ] = 'document_name' ;
+                        }elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
+                                $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+                        }
                     }
                         
             }
@@ -634,7 +634,7 @@ 
     function getJoinKeyLHS()
     {
         if (!isset($this->joinKeyLHS))
-        	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+            $this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
         
         return $this->joinKeyLHS;
     }
@@ -642,7 +642,7 @@ 
     function getJoinKeyRHS()
     {
         if (!isset($this->joinKeyRHS))
-        	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+            $this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
     	
         return $this->joinKeyRHS;
     }
@@ -674,32 +674,32 @@ 
     }
 
     public function getTitleKey($left=false){
-		if(!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
-    		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
-    			return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
-    		}
-    	}else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
-    		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
-    			return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
-    		}
-    	}
+        if(!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+            include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
+            if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+                return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
+            }
+        }else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+            include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
+            if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+                return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
+            }
+        }
     	
-    	if($left){
-    		$titleKeyName = $this->getRightModuleSystemLabel();
-    		$sourceModule = $this->rhs_module;
-    	}else{
-    		$titleKeyName = $this->getLeftModuleSystemLabel();
-    		$sourceModule = $this->lhs_module;
-    	}
+        if($left){
+            $titleKeyName = $this->getRightModuleSystemLabel();
+            $sourceModule = $this->rhs_module;
+        }else{
+            $titleKeyName = $this->getLeftModuleSystemLabel();
+            $sourceModule = $this->lhs_module;
+        }
     	
-		if(!empty($titleKeyName)){
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
-		}
+        if(!empty($titleKeyName)){
+            $title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
+        }else{
+            $title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        }
 		
-		return $title_key;
-	}
+        return $title_key;
+    }
 }
\ No newline at end of file

modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php

Indentation +40 added lines, -40 removed lines

@@ -66,15 +66,15 @@ 
     // have different actual relationship names other than <relationshipName>
     // e.g $dictionary[ 'quotes_accounts' ] has two relationships: quotes_billto_accounts, quotes_shipto_accounts
     protected $specialCaseBaseNames = array( 'quotes_accounts',
-                                             'quotes_contacts',
-                                             'emails_beans',
-                                             'linked_documents',
-                                             'project_relation',
-                                             'prospect_lists_prospects',
-                                             'queues_beans',
-                                             'queues_queue',
-                                             'tracker_sessions'
-                                          );
+                                                'quotes_contacts',
+                                                'emails_beans',
+                                                'linked_documents',
+                                                'project_relation',
+                                                'prospect_lists_prospects',
+                                                'queues_beans',
+                                                'queues_queue',
+                                                'tracker_sessions'
+                                            );
     /*
      * Find all deployed modules that can participate in a relationship
      * Return a list of modules with associated subpanels
@@ -333,7 +333,7 @@ 
     protected function build ($basepath , $installDefPrefix , $relationships )
     {
         global $sugar_config;
-    	// keep the relationships data separate from any other build data by ading /relationships to the basepath
+        // keep the relationships data separate from any other build data by ading /relationships to the basepath
         $basepath .= '/relationships' ;
 
         $installDefs = array ( ) ;
@@ -393,34 +393,34 @@ 
     {
         global $sugar_config;
         
-       	mkdir_recursive ( "$basepath/language" ) ;
+            mkdir_recursive ( "$basepath/language" ) ;
     	
-       	$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
+            $headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
         $installDefs = array ( ) ;
         foreach ( $labelDefinitions as $definition )
         {
-        	$mod_strings = array();
-        	$app_list_strings = array();
+            $mod_strings = array();
+            $app_list_strings = array();
         	
-        	$out = $headerString;
+            $out = $headerString;
         	
-        	$filename = "{$basepath}/language/{$definition['module']}.php" ;
+            $filename = "{$basepath}/language/{$definition['module']}.php" ;
     	
-	    	if (file_exists ( $filename ))
-	    		include ($filename);
+            if (file_exists ( $filename ))
+                include ($filename);
 	    		
             
             //Check for app strings
             $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveLabels(): saving the following to {$filename}" 
-                                      . print_r ( $definition, true ) ) ;
+                                        . print_r ( $definition, true ) ) ;
             if ($definition['module'] == 'application') {
-            	$app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($app_list_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
+                $app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
+                foreach ($app_list_strings as $key => $val)
+                    $out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
             } else {
-            	$mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($mod_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+                $mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
+                foreach ($mod_strings as $key => $val)
+                    $out .= override_value_to_string_recursive2('mod_strings', $key, $val);
             }
             
             $fh = fopen ( $filename, 'w' ) ;
@@ -430,17 +430,17 @@ 
         	
             foreach($sugar_config['languages'] as $lk => $lv)
             {
-            	$installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
-            		'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
-            		'to_module' => $definition [ 'module' ] , 
-            		'language' => $lk 
-            	) ;                                 		
+                $installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
+                    'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
+                    'to_module' => $definition [ 'module' ] , 
+                    'language' => $lk 
+                ) ;                                 		
             }
             
             /* do not use the following write_array_to_file method to write the label file - 
              * module installer appends each of the label files together (as it does for all files) 
 			 * into a combined label file and so the last $mod_strings is the only one received by the application */
-        	// write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
+            // write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
         }
         
         return $installDefs ;
@@ -534,11 +534,11 @@ 
             $relName = $moduleName;
             foreach ( $definitions as $definition )
             {
-            	if (!empty($definition['relationship']))
-            	{
-            		$relName = $definition['relationship'];
-            		break;
-            	}
+                if (!empty($definition['relationship']))
+                {
+                    $relName = $definition['relationship'];
+                    break;
+                }
             }
             
             $filename = "$basepath/vardefs/{$relName}_{$moduleName}.php" ;
@@ -547,14 +547,14 @@ 
             foreach ( $definitions as $definition )
             {
                 $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): saving the following to {$filename}" . print_r ( $definition, true ) ) ;
-               	$out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
-               		  . var_export_helper($definition) . ";\n";
+                    $out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
+                            . var_export_helper($definition) . ";\n";
             }
             file_put_contents($filename, $out);
             
             $installDefs [ $moduleName ] = array ( 
-            	'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
-            	'to_module' => $moduleName 
+                'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
+                'to_module' => $moduleName 
             ) ;
         }
         

modules/ModuleBuilder/parsers/relationships/UndeployedRelationships.php

Indentation +3 added lines, -3 removed lines

@@ -284,8 +284,8 @@ 
             }
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
-			//Bug42170================================
-		}
+            //Bug42170================================
+        }
         
         // use an installDefPrefix of <basepath>/SugarModules for compatibility with the rest of ModuleBuilder
         $this->installDefs = parent::build ( $basepath, "<basepath>/SugarModules", $relationships ) ;
@@ -418,7 +418,7 @@ 
                         $fieldsToAdd [$deployedModuleName] = $fieldName;
                     }
                 }
-        	}
+            }
         }
         return array(array('additional_fields' => $fieldsToAdd));
     }