adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.displaydeploy.php

Indentation +22 added lines, -22 removed lines

@@ -41,29 +41,29 @@
 
 class ViewDisplaydeploy extends SugarView 
 {
-	function ViewDisplaydeploy()
-	{
-		$smarty = new Sugar_Smarty();
- 		$smarty->assign('package', $_REQUEST['name']);
-		$smarty->assign('message', $GLOBALS['mod_strings']['LBL_DEPLOY_IN_PROGRESS']);
-		$ajax = new AjaxCompose();
-		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
-		$ajax->addCrumb($_REQUEST['name'],'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$_REQUEST['name'].'")');
-		$ajax->addCrumb(translate('LBL_SECTION_DEPLOY', 'ModuleBuilder'), '');
-		$ajax->addSection('center', translate('LBL_SECTION_DEPLOY', 'ModuleBuilder'), $smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/deploy.tpl'));
-		echo $ajax->getJavascript();
-	}
+    function ViewDisplaydeploy()
+    {
+        $smarty = new Sugar_Smarty();
+            $smarty->assign('package', $_REQUEST['name']);
+        $smarty->assign('message', $GLOBALS['mod_strings']['LBL_DEPLOY_IN_PROGRESS']);
+        $ajax = new AjaxCompose();
+        $ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
+        $ajax->addCrumb($_REQUEST['name'],'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$_REQUEST['name'].'")');
+        $ajax->addCrumb(translate('LBL_SECTION_DEPLOY', 'ModuleBuilder'), '');
+        $ajax->addSection('center', translate('LBL_SECTION_DEPLOY', 'ModuleBuilder'), $smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/deploy.tpl'));
+        echo $ajax->getJavascript();
+    }
 	
-	/**
-	 * @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(),
+            );
     }
 }

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/parser.searchfields.php

Indentation +22 added lines, -22 removed lines

@@ -45,8 +45,8 @@ 
 class ParserSearchFields extends ModuleBuilderParser
 {
 
-	var $searchFields;
-	var $packageKey; 
+    var $searchFields;
+    var $packageKey; 
 	
     function ParserSearchFields ($moduleName, $packageName='')
     {
@@ -63,36 +63,36 @@ 
     
     function addSearchField($name, $searchField)
     {
-    	if(empty($name) || empty($searchField) || !is_array($searchField))
-    	{
-    		return;
-    	}
+        if(empty($name) || empty($searchField) || !is_array($searchField))
+        {
+            return;
+        }
     	
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+        $key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
         $this->searchFields[$key][$name] = $searchField;
     }
     
     function removeSearchField($name) 
     {
 
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+        $key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
 
-    	if(isset($this->searchFields[$key][$name]))
-    	{
-    		unset($this->searchFields[$key][$name]);
-    	}
+        if(isset($this->searchFields[$key][$name]))
+        {
+            unset($this->searchFields[$key][$name]);
+        }
     }
     
     function getSearchFields()
     {
-    	$searchFields = array();
+        $searchFields = array();
         if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) //we are in Module builder
         {
-			include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");      	        	
+            include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");      	        	
         } else if(file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
-			include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");      	        	
+            include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");      	        	
         } else if(file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
-			include("modules/{$this->moduleName}/metadata/SearchFields.php");      	        	        	
+            include("modules/{$this->moduleName}/metadata/SearchFields.php");      	        	        	
         }
         
         return $searchFields;
@@ -102,19 +102,19 @@ 
     {
         if (!empty($this->packageName)) //we are in Module builder
         {
-			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
+            $header = file_get_contents('modules/ModuleBuilder/MB/header.php');
             if(!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
-               mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");
+                mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");
             }
-			write_array_to_file("searchFields['{$this->packageKey}_{$this->moduleName}']", $searchFields["{$this->packageKey}_{$this->moduleName}"], "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);                	        	
+            write_array_to_file("searchFields['{$this->packageKey}_{$this->moduleName}']", $searchFields["{$this->packageKey}_{$this->moduleName}"], "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);                	        	
         } else {
-			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
+            $header = file_get_contents('modules/ModuleBuilder/MB/header.php');
             if(!file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
-               mkdir_recursive("custom/modules/{$this->moduleName}/metadata");
+                mkdir_recursive("custom/modules/{$this->moduleName}/metadata");
             }			
-			write_array_to_file("searchFields['{$this->moduleName}']", $searchFields[$this->moduleName], "custom/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);                	        	
+            write_array_to_file("searchFields['{$this->moduleName}']", $searchFields[$this->moduleName], "custom/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);                	        	
         }
         $this->searchFields = $searchFields;
     }

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

modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php

Indentation +13 added lines, -13 removed lines

@@ -104,13 +104,13 @@ 
                         
 
                         if (! empty ( $dictionary ) && ! empty ( $dictionary [ $name ] ) ) {
-                        	if (! empty ( $dictionary [ $name ] [ 'true_relationship_type' ] )) {
-                        		$definition [ 'relationship_type' ] = $dictionary [ $name ] [ 'true_relationship_type' ] ;
-                        	}
+                            if (! empty ( $dictionary [ $name ] [ 'true_relationship_type' ] )) {
+                                $definition [ 'relationship_type' ] = $dictionary [ $name ] [ 'true_relationship_type' ] ;
+                            }
                             if (! empty ( $dictionary [ $name ] [ 'from_studio' ] )) {
                                 $definition [ 'from_studio' ] = $dictionary [ $name ] [ 'from_studio' ] ;
                             }
-                        	$definition [ 'is_custom' ] = true;
+                            $definition [ 'is_custom' ] = true;
                         }
                             
                         
@@ -155,23 +155,23 @@ 
      */
     function delete ($rel_name)
     {
-    	//Remove any fields from layouts
+        //Remove any fields from layouts
         $rel = $this->get($rel_name);
         if (!empty($rel))
         {
             $this->removeFieldsFromDeployedLayout($rel);
         }
         require_once("ModuleInstall/ModuleInstaller.php");
-    	require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
-    	$mi = new ModuleInstaller();
-    	$mi->silent = true;
+        require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
+        $mi = new ModuleInstaller();
+        $mi->silent = true;
         $mi->id_name = 'custom' . $rel_name; // provide the moduleinstaller with a unique name for this relationship - normally this value is set to the package key...
-    	$mi->uninstall_relationship("custom/metadata/{$rel_name}MetaData.php");
+        $mi->uninstall_relationship("custom/metadata/{$rel_name}MetaData.php");
         $mi->uninstallLabels('custom/Extension/modules/relationships/language/',$rel->buildLabels());
         $mi->uninstallExtLabels($rel->buildLabels());
     	
-    	// now clear all caches so that our changes are visible
-    	Relationship::delete_cache();
+        // now clear all caches so that our changes are visible
+        Relationship::delete_cache();
         $mi->rebuild_tabledictionary();
         
         $MBmodStrings = $GLOBALS [ 'mod_strings' ];
@@ -313,7 +313,7 @@ 
         foreach ( $this->relationships as $name => $relationship )
         {
             $relationship->setFromStudio();
-        	$GLOBALS [ 'mod_strings' ] = $MBModStrings ;
+            $GLOBALS [ 'mod_strings' ] = $MBModStrings ;
             $installDefs = parent::build ( $basepath, "<basepath>",  array ($name => $relationship ) ) ;
 
             // and mark as built so that the next time we come through we'll know and won't build again
@@ -407,7 +407,7 @@ 
      * @param $relationship    The relationship that is getting deleted
      * return null
      */
-	private function removeFieldsFromDeployedLayout ($relationship)
+    private function removeFieldsFromDeployedLayout ($relationship)
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...