adamjakab / SuiteCRM

modules/Meetings/metadata/listviewdefs.php

Indentation +33 added lines, -33 removed lines

@@ -39,8 +39,8 @@ 
 
 $listViewDefs ['Meetings'] = 
 array (
-  'SET_COMPLETE' => 
-  array (
+    'SET_COMPLETE' => 
+    array (
     'width' => '1%',
     'label' => 'LBL_LIST_CLOSE',
     'link' => true,
@@ -48,18 +48,18 @@ 
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'status',
+        0 => 'status',
+    ),
     ),
-  ),
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '40%',
     'label' => 'LBL_LIST_SUBJECT',
     'link' => true,
     'default' => true,
-  ),
-  'CONTACT_NAME' => 
-  array (
+    ),
+    'CONTACT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_CONTACT',
     'link' => true,
@@ -67,9 +67,9 @@ 
     'module' => 'Contacts',
     'default' => true,
     'ACLTag' => 'CONTACT',
-  ),
-  'PARENT_NAME' => 
-  array (
+    ),
+    'PARENT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_RELATED_TO',
     'dynamic_module' => 'PARENT_TYPE',
@@ -80,47 +80,47 @@ 
     'ACLTag' => 'PARENT',
     'related_fields' => 
     array (
-      0 => 'parent_id',
-      1 => 'parent_type',
+        0 => 'parent_id',
+        1 => 'parent_type',
     ),
-  ),
-  'DATE_START' => 
-  array (
+    ),
+    'DATE_START' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_LIST_DATE',
     'link' => false,
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'time_start',
+        0 => 'time_start',
     ),
-  ),
-  'ASSIGNED_USER_NAME' => 
-  array (
+    ),
+    'ASSIGNED_USER_NAME' => 
+    array (
     'width' => '2%',
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
     'module' => 'Employees',
     'id' => 'ASSIGNED_USER_ID',
     'default' => true,
-  ),
-  'DIRECTION' => 
-  array (
+    ),
+    'DIRECTION' => 
+    array (
     'type' => 'enum',
     'label' => 'LBL_LIST_DIRECTION',
     'width' => '10%',
     'default' => false,
-  ),
-  'STATUS' => 
-  array (
+    ),
+    'STATUS' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_LIST_STATUS',
     'link' => false,
     'default' => false,
-  ),
-  'DATE_ENTERED' => array (
-	'width' => '10%',
-	'label' => 'LBL_DATE_ENTERED',
-	'default' => true
-  ),  
+    ),
+    'DATE_ENTERED' => array (
+    'width' => '10%',
+    'label' => 'LBL_DATE_ENTERED',
+    'default' => true
+    ),  
 );
 ?>

Spacing +13 added lines, -13 removed lines

@@ -38,28 +38,28 @@ 
  ********************************************************************************/
 
 $listViewDefs ['Meetings'] = 
-array (
+array(
   'SET_COMPLETE' => 
-  array (
+  array(
     'width' => '1%',
     'label' => 'LBL_LIST_CLOSE',
     'link' => true,
     'sortable' => false,
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'status',
     ),
   ),
   'NAME' => 
-  array (
+  array(
     'width' => '40%',
     'label' => 'LBL_LIST_SUBJECT',
     'link' => true,
     'default' => true,
   ),
   'CONTACT_NAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_LIST_CONTACT',
     'link' => true,
@@ -69,7 +69,7 @@ 
     'ACLTag' => 'CONTACT',
   ),
   'PARENT_NAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_LIST_RELATED_TO',
     'dynamic_module' => 'PARENT_TYPE',
@@ -79,24 +79,24 @@ 
     'sortable' => false,
     'ACLTag' => 'PARENT',
     'related_fields' => 
-    array (
+    array(
       0 => 'parent_id',
       1 => 'parent_type',
     ),
   ),
   'DATE_START' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_DATE',
     'link' => false,
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'time_start',
     ),
   ),
   'ASSIGNED_USER_NAME' => 
-  array (
+  array(
     'width' => '2%',
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
     'module' => 'Employees',
@@ -104,20 +104,20 @@ 
     'default' => true,
   ),
   'DIRECTION' => 
-  array (
+  array(
     'type' => 'enum',
     'label' => 'LBL_LIST_DIRECTION',
     'width' => '10%',
     'default' => false,
   ),
   'STATUS' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_STATUS',
     'link' => false,
     'default' => false,
   ),
-  'DATE_ENTERED' => array (
+  'DATE_ENTERED' => array(
 	'width' => '10%',
 	'label' => 'LBL_DATE_ENTERED',
 	'default' => true

modules/Meetings/views/view.edit.php

Indentation +35 added lines, -35 removed lines

@@ -44,45 +44,45 @@
 
 class MeetingsViewEdit extends ViewEdit
 {
- 	/**
- 	 * @see SugarView::preDisplay()
- 	 *
- 	 * Override preDisplay to check for presence of 'status' in $_REQUEST
- 	 * This is to support the "Close And Create New" operation.
- 	 */
- 	public function preDisplay()
- 	{
- 		if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
-	       $this->bean->status = 'Held';
- 		}
+        /**
+         * @see SugarView::preDisplay()
+         *
+         * Override preDisplay to check for presence of 'status' in $_REQUEST
+         * This is to support the "Close And Create New" operation.
+         */
+        public function preDisplay()
+        {
+            if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
+            $this->bean->status = 'Held';
+            }
 
- 		parent::preDisplay();
- 	}
+            parent::preDisplay();
+        }
 
- 	/**
- 	 * @see SugarView::display()
- 	 */
- 	public function display()
- 	{
- 		global $json;
+        /**
+         * @see SugarView::display()
+         */
+        public function display()
+        {
+            global $json;
         $json = getJSONobj();
         $json_config = new json_config();
-		if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
-		} else {
-			$this->bean->json_id = $this->bean->id;
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
-		}
- 		$this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
- 		if($this->ev->isDuplicate){
-	        $this->bean->status = $this->bean->getDefaultStatus();
- 		} //if
+        if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
+        } else {
+            $this->bean->json_id = $this->bean->id;
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
+        }
+            $this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
+            if($this->ev->isDuplicate){
+            $this->bean->status = $this->bean->getDefaultStatus();
+            } //if
 
-		$this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
-		$this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
-		$this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
-		$this->ss->assign('remindersDisabled', json_encode(false));
+        $this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
+        $this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
+        $this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
+        $this->ss->assign('remindersDisabled', json_encode(false));
 
- 		parent::display();
- 	}
+            parent::display();
+        }
 }

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -52,7 +52,7 @@ 
  	 */
  	public function preDisplay()
  	{
- 		if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
+ 		if (!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
 	       $this->bean->status = 'Held';
  		}
 
@@ -74,7 +74,7 @@ 
 			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
 		}
  		$this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
- 		if($this->ev->isDuplicate){
+ 		if ($this->ev->isDuplicate) {
 	        $this->bean->status = $this->bean->getDefaultStatus();
  		} //if
 

Braces +3 added lines, -1 removed lines

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

modules/ModuleBuilder/language/en_us.lang.php

Spacing +3 added lines, -3 removed lines

@@ -730,9 +730,9 @@
 
     'LBL_ILLEGAL_FIELD_VALUE' => "Drop down key cannot contain quotes.",
     'LBL_CONFIRM_SAVE_DROPDOWN' => "You are selecting this item for removal from the dropdown list. Any dropdown fields using this list with this item as a value will no longer display the value, and the value will no longer be able to be selected from the dropdown fields. Are you sure you want to continue?",
-    'LBL_POPHELP_VALIDATE_US_PHONE' => "Select to validate this field for the entry of a 10-digit<br>" .
-        "phone number, with allowance for the country code 1, and<br>" .
-        "to apply a U.S. format to the phone number when the record<br>" .
+    'LBL_POPHELP_VALIDATE_US_PHONE' => "Select to validate this field for the entry of a 10-digit<br>".
+        "phone number, with allowance for the country code 1, and<br>".
+        "to apply a U.S. format to the phone number when the record<br>".
         "is saved. The following format will be applied: (xxx) xxx-xxxx.",
     'LBL_ALL_MODULES' => 'All Modules',
     'LBL_RELATED_FIELD_ID_NAME_LABEL' => '{0} (related {1} ID)',

Braces +3 added lines, -1 removed lines

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

modules/ModuleBuilder/action_view_map.php

Indentation +19 added lines, -19 removed lines

@@ -43,28 +43,28 @@
  * To change the template for this generated file go to
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
- //format '<action_name>' => '<view_name>',
- $action_view_map = array(
- 						'index' => 'main',
- 						'module'=>'module',
- 						'modulefields'=>'modulefields',
- 						'modulelabels'=>'modulelabels',
- 						'relationships'=>'relationships',
- 						'relationship'=>'relationship',
+    //format '<action_name>' => '<view_name>',
+    $action_view_map = array(
+                            'index' => 'main',
+                            'module'=>'module',
+                            'modulefields'=>'modulefields',
+                            'modulelabels'=>'modulelabels',
+                            'relationships'=>'relationships',
+                            'relationship'=>'relationship',
                         'resetmodule'=>'resetmodule',
- 						'modulefield'=>'modulefield',
- 						'displaydeploy'=>'displaydeploy',
- 						'package'=>'package',
- 						'dropdown'=>'dropdown',
- 						'dropdowns'=>'dropdowns',
- 						'detailview' => 'detail',
- 						'editview' => 'edit',
- 						'popup' => 'popup',
- 						'home'=>'home',
+                            'modulefield'=>'modulefield',
+                            'displaydeploy'=>'displaydeploy',
+                            'package'=>'package',
+                            'dropdown'=>'dropdown',
+                            'dropdowns'=>'dropdowns',
+                            'detailview' => 'detail',
+                            'editview' => 'edit',
+                            'popup' => 'popup',
+                            'home'=>'home',
                         'visibilityeditor' => 'visibilityeditor',
- 						'exportcustomizations'=>'exportcustomizations',
+                            'exportcustomizations'=>'exportcustomizations',
 
- 					);
+                        );
     // add those we need from the global action_view_map
     $action_view_map['dc'] = 'dc';
     $action_view_map['dcajax'] = 'dcajax';

modules/ModuleBuilder/views/view.module.php

Indentation +43 added lines, -43 removed lines

@@ -41,36 +41,36 @@ 
 
 class ViewModule extends SugarView
 {
-	var $mbModule;
+    var $mbModule;
 	
- 	/**
-	 * @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 $mod_strings;
- 		$smarty = new Sugar_Smarty();
+    function display()
+    {
+        global $mod_strings;
+            $smarty = new Sugar_Smarty();
 
-		require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
-		$mb = new ModuleBuilder();
-		$mb->getPackage($_REQUEST['view_package']);
-		$package = $mb->packages[$_REQUEST['view_package']];
-		$module_name = (!empty($_REQUEST['view_module']))?$_REQUEST['view_module']:'';
-		$package->getModule($module_name);
-		$this->mbModule = $package->modules[$module_name];
-		$this->loadPackageHelp($module_name);
+        require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
+        $mb = new ModuleBuilder();
+        $mb->getPackage($_REQUEST['view_package']);
+        $package = $mb->packages[$_REQUEST['view_package']];
+        $module_name = (!empty($_REQUEST['view_module']))?$_REQUEST['view_module']:'';
+        $package->getModule($module_name);
+        $this->mbModule = $package->modules[$module_name];
+        $this->loadPackageHelp($module_name);
 		
-		// set up the list of either available types for a new module, or implemented types for an existing one
+        // set up the list of either available types for a new module, or implemented types for an existing one
         $types = (empty($module_name)) ? MBModule::getTypes() : $this->mbModule->mbvardefs->templates ;
         
         foreach( $types as $type=>$definition)
@@ -80,28 +80,28 @@ 
         natcasesort($translated_type);
         $smarty->assign('types',$translated_type);
 		
-		$smarty->assign('package', $package);
-		$smarty->assign('module', $this->mbModule);
-		$smarty->assign('mod_strings', $mod_strings);
+        $smarty->assign('package', $package);
+        $smarty->assign('module', $this->mbModule);
+        $smarty->assign('mod_strings', $mod_strings);
 
-		$ajax = new AjaxCompose();
-		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
-		$ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
-		if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
-		$ajax->addCrumb($module_name, '');
-		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
-		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
-			$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
-		$ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
+        $ajax = new AjaxCompose();
+        $ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
+        $ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
+        if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
+        $ajax->addCrumb($module_name, '');
+        $html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
+        if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
+            $html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+        $ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
 		
-		echo $ajax->getJavascript();
- 	}
+        echo $ajax->getJavascript();
+        }
  	
- 	function loadPackageHelp(
- 	    $name
- 	    )
- 	{
+        function loadPackageHelp(
+            $name
+            )
+        {
         $this->mbModule->help['default'] = (empty($name))?'create':'modify';
         $this->mbModule->help['group'] = 'module';
- 	}
+        }
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -65,20 +65,20 @@ 
 		$mb = new ModuleBuilder();
 		$mb->getPackage($_REQUEST['view_package']);
 		$package = $mb->packages[$_REQUEST['view_package']];
-		$module_name = (!empty($_REQUEST['view_module']))?$_REQUEST['view_module']:'';
+		$module_name = (!empty($_REQUEST['view_module'])) ? $_REQUEST['view_module'] : '';
 		$package->getModule($module_name);
 		$this->mbModule = $package->modules[$module_name];
 		$this->loadPackageHelp($module_name);
 		
 		// set up the list of either available types for a new module, or implemented types for an existing one
-        $types = (empty($module_name)) ? MBModule::getTypes() : $this->mbModule->mbvardefs->templates ;
+        $types = (empty($module_name)) ? MBModule::getTypes() : $this->mbModule->mbvardefs->templates;
         
-        foreach( $types as $type=>$definition)
+        foreach ($types as $type=>$definition)
         {
-            $translated_type[$type]=translate('LBL_TYPE_'.strtoupper($type),'ModuleBuilder');
+            $translated_type[$type] = translate('LBL_TYPE_'.strtoupper($type), 'ModuleBuilder');
         }
         natcasesort($translated_type);
-        $smarty->assign('types',$translated_type);
+        $smarty->assign('types', $translated_type);
 		
 		$smarty->assign('package', $package);
 		$smarty->assign('module', $this->mbModule);
@@ -86,12 +86,12 @@ 
 
 		$ajax = new AjaxCompose();
 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
-		$ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
-		if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
+		$ajax->addCrumb(' '.$package->name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
+		if (empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
 		$ajax->addCrumb($module_name, '');
-		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
-		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
-			$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+		$html = $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
+		if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'SaveModule')
+			$html .= "<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
 		$ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
 		
 		echo $ajax->getJavascript();
@@ -101,7 +101,7 @@ 
  	    $name
  	    )
  	{
-        $this->mbModule->help['default'] = (empty($name))?'create':'modify';
+        $this->mbModule->help['default'] = (empty($name)) ? 'create' : 'modify';
         $this->mbModule->help['group'] = 'module';
  	}
 }
\ No newline at end of file

Braces +6 added lines, -3 removed lines

@@ -87,11 +87,14 @@
 		$ajax = new AjaxCompose();
 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
 		$ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
-		if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
+		if(empty($module_name)) {
+		    $module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
+		}
 		$ajax->addCrumb($module_name, '');
 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
-		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
-			$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule') {
+					$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+		}
 		$ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
 		
 		echo $ajax->getJavascript();

modules/ModuleBuilder/views/view.searchview.php

Indentation +71 added lines, -71 removed lines

@@ -48,88 +48,88 @@
 
 class ViewSearchView extends ViewListView
 {
- 	function __construct()
- 	{
- 		parent::__construct();
- 		if (!empty($_REQUEST['searchlayout'])) {
- 			$this->editLayout = $_REQUEST['searchlayout'];
- 		}
- 	}
+        function __construct()
+        {
+            parent::__construct();
+            if (!empty($_REQUEST['searchlayout'])) {
+                $this->editLayout = $_REQUEST['searchlayout'];
+            }
+        }
  	
- 	/**
-	 * @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(),
+            );
     }
 
- 	// DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
- 	function preDisplay()
- 	{
- 	}
+        // DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
+        function preDisplay()
+        {
+        }
 
- 	function display(
- 	    $preview = false
- 	    )
- 	{
- 		$packageName = (isset ( $_REQUEST [ 'view_package' ] )) ? $_REQUEST [ 'view_package' ] : '' ;
- 		require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
- 		$parser = ParserFactory::getParser ( $this->editLayout , $this->editModule, $packageName ) ;
+        function display(
+            $preview = false
+            )
+        {
+            $packageName = (isset ( $_REQUEST [ 'view_package' ] )) ? $_REQUEST [ 'view_package' ] : '' ;
+            require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
+            $parser = ParserFactory::getParser ( $this->editLayout , $this->editModule, $packageName ) ;
 
- 		$smarty = parent::constructSmarty ( $parser ) ;
- 		$smarty->assign ( 'action', 'searchViewSave' ) ;
- 		$smarty->assign ( 'view', $this->editLayout ) ;
- 		$smarty->assign ( 'helpName', 'searchViewEditor' ) ;
- 		$smarty->assign ( 'helpDefault', 'modify' ) ;
+            $smarty = parent::constructSmarty ( $parser ) ;
+            $smarty->assign ( 'action', 'searchViewSave' ) ;
+            $smarty->assign ( 'view', $this->editLayout ) ;
+            $smarty->assign ( 'helpName', 'searchViewEditor' ) ;
+            $smarty->assign ( 'helpDefault', 'modify' ) ;
 
- 		if ($preview)
- 		{
- 			echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
- 		} else
- 		{
- 			$ajax = $this->constructAjax () ;
- 			$ajax->addSection ( 'center', translate ($this->title), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
- 			echo $ajax->getJavascript () ;
- 		}
- 	}
+            if ($preview)
+            {
+                echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
+            } else
+            {
+                $ajax = $this->constructAjax () ;
+                $ajax->addSection ( 'center', translate ($this->title), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
+                echo $ajax->getJavascript () ;
+            }
+        }
 
- 	function constructAjax()
- 	{
- 		require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
- 		$ajax = new AjaxCompose ( ) ;
- 		switch ( $this->editLayout )
- 		{
- 			default:
- 				$searchLabel = 'LBL_' . strtoupper ( $this->editLayout) ;
- 		}
+        function constructAjax()
+        {
+            require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
+            $ajax = new AjaxCompose ( ) ;
+            switch ( $this->editLayout )
+            {
+                default:
+                 $searchLabel = 'LBL_' . strtoupper ( $this->editLayout) ;
+            }
 
         $layoutLabel = 'LBL_LAYOUTS' ;
         $layoutView = 'layouts' ;
 
 
- 		if ($this->fromModuleBuilder)
- 		{
- 			$ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
- 			$ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
- 			$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
- 			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
- 			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
- 		} else
- 		{
- 			$ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
- 			$ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
- 			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
- 			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
- 		}
- 		$this->title = $searchLabel;
- 		return $ajax ;
- 	}
+            if ($this->fromModuleBuilder)
+            {
+                $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
+                $ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
+                $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
+                $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
+                if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
+                $ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
+            } else
+            {
+                $ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
+                $ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
+                $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
+                if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
+                $ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
+            }
+            $this->title = $searchLabel;
+            return $ajax ;
+        }
 }

Spacing +35 added lines, -35 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
-die ( 'Not A Valid Entry Point' ) ;
+if (!defined('sugarEntry') || !sugarEntry)
+die ('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,8 +43,8 @@ 
 
 
 
-require_once ('modules/ModuleBuilder/views/view.listview.php') ;
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once ('modules/ModuleBuilder/views/view.listview.php');
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 class ViewSearchView extends ViewListView
 {
@@ -64,7 +64,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -78,58 +78,58 @@ 
  	    $preview = false
  	    )
  	{
- 		$packageName = (isset ( $_REQUEST [ 'view_package' ] )) ? $_REQUEST [ 'view_package' ] : '' ;
- 		require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
- 		$parser = ParserFactory::getParser ( $this->editLayout , $this->editModule, $packageName ) ;
+ 		$packageName = (isset ($_REQUEST ['view_package'])) ? $_REQUEST ['view_package'] : '';
+ 		require_once 'modules/ModuleBuilder/parsers/ParserFactory.php';
+ 		$parser = ParserFactory::getParser($this->editLayout, $this->editModule, $packageName);
 
- 		$smarty = parent::constructSmarty ( $parser ) ;
- 		$smarty->assign ( 'action', 'searchViewSave' ) ;
- 		$smarty->assign ( 'view', $this->editLayout ) ;
- 		$smarty->assign ( 'helpName', 'searchViewEditor' ) ;
- 		$smarty->assign ( 'helpDefault', 'modify' ) ;
+ 		$smarty = parent::constructSmarty($parser);
+ 		$smarty->assign('action', 'searchViewSave');
+ 		$smarty->assign('view', $this->editLayout);
+ 		$smarty->assign('helpName', 'searchViewEditor');
+ 		$smarty->assign('helpDefault', 'modify');
 
  		if ($preview)
  		{
- 			echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
+ 			echo $smarty->fetch("modules/ModuleBuilder/tpls/Preview/listView.tpl");
  		} else
  		{
- 			$ajax = $this->constructAjax () ;
- 			$ajax->addSection ( 'center', translate ($this->title), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
- 			echo $ajax->getJavascript () ;
+ 			$ajax = $this->constructAjax();
+ 			$ajax->addSection('center', translate($this->title), $smarty->fetch("modules/ModuleBuilder/tpls/listView.tpl"));
+ 			echo $ajax->getJavascript();
  		}
  	}
 
  	function constructAjax()
  	{
- 		require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
- 		$ajax = new AjaxCompose ( ) ;
- 		switch ( $this->editLayout )
+ 		require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+ 		$ajax = new AjaxCompose( );
+ 		switch ($this->editLayout)
  		{
  			default:
- 				$searchLabel = 'LBL_' . strtoupper ( $this->editLayout) ;
+ 				$searchLabel = 'LBL_'.strtoupper($this->editLayout);
  		}
 
-        $layoutLabel = 'LBL_LAYOUTS' ;
-        $layoutView = 'layouts' ;
+        $layoutLabel = 'LBL_LAYOUTS';
+        $layoutView = 'layouts';
 
 
  		if ($this->fromModuleBuilder)
  		{
- 			$ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
- 			$ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
- 			$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
- 			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
- 			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
+ 			$ajax->addCrumb(translate('LBL_MODULEBUILDER', 'ModuleBuilder'), 'ModuleBuilder.main("mb")');
+ 			$ajax->addCrumb($_REQUEST ['view_package'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$_REQUEST ['view_package'].'")');
+ 			$ajax->addCrumb($this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$_REQUEST ['view_package']."&view_module={$this->editModule}".'")');
+ 			$ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module='.$this->editModule.'&view_package='.$_REQUEST['view_package'].'")');
+ 			if ($layoutLabel == 'LBL_LAYOUTS') $ajax->addCrumb(translate('LBL_SEARCH_FORMS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module='.$this->editModule.'&view_package='.$_REQUEST ['view_package'].'")');
+ 			$ajax->addCrumb(translate($searchLabel, 'ModuleBuilder'), '');
  		} else
  		{
- 			$ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
- 			$ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
- 			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
- 			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
+ 			$ajax->addCrumb(translate('LBL_STUDIO', 'ModuleBuilder'), 'ModuleBuilder.main("studio")');
+ 			$ajax->addCrumb($this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$this->editModule.'")');
+ 			$ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module='.$this->editModule.'")');
+ 			if ($layoutLabel == 'LBL_LAYOUTS') $ajax->addCrumb(translate('LBL_SEARCH_FORMS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module='.$this->editModule.'")');
+ 			$ajax->addCrumb(translate($searchLabel, 'ModuleBuilder'), '');
  		}
  		$this->title = $searchLabel;
- 		return $ajax ;
+ 		return $ajax;
  	}
 }

Braces +9 added lines, -4 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
-die ( 'Not A Valid Entry Point' ) ;
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
+    die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -119,14 +120,18 @@ 
  			$ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
  			$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
  			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
+ 			if ( $layoutLabel == 'LBL_LAYOUTS' ) {
+ 			    $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
+ 			}
  			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
  		} else
  		{
  			$ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
  			$ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
  			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
+ 			if ( $layoutLabel == 'LBL_LAYOUTS' ) {
+ 			    $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
+ 			}
  			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
  		}
  		$this->title = $searchLabel;

modules/ModuleBuilder/views/view.exportcustomizations.php

Indentation +33 added lines, -33 removed lines

@@ -40,40 +40,40 @@
 require_once('modules/ModuleBuilder/MB/AjaxCompose.php');
 class ViewExportcustomizations 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, $mod_strings;
- 		$smarty = new Sugar_Smarty();
- 		$mb = new MBPackage("packageCustom");
- 		$mod=$mb->getCustomModules();
- 		foreach($mod as $key => $value){
- 		    $modules[]=$key;
- 		    $custom[]=$value;
- 		}
- 		$nb_mod = count($modules);
- 		$smarty->assign('mod_strings', $mod_strings);
- 		$smarty->assign('modules', $mod);
- 		$smarty->assign('custom', $custom);
- 		$smarty->assign('nb_mod', $nb_mod);
- 		$smarty->assign('defaultHelp', 'exportHelp');
- 		$smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
- 		$smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
-		$ajax = new AjaxCompose();
-		$ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
-		$ajax->addSection('center', $mod_strings['LBL_EC_TITLE'],$smarty->fetch($this->getCustomFilePathIfExists('modules/ModuleBuilder/tpls/exportcustomizations.tpl')));
-		echo $ajax->getJavascript();
- 	}
+    function display()
+    {
+            global $current_user, $mod_strings;
+            $smarty = new Sugar_Smarty();
+            $mb = new MBPackage("packageCustom");
+            $mod=$mb->getCustomModules();
+            foreach($mod as $key => $value){
+                $modules[]=$key;
+                $custom[]=$value;
+            }
+            $nb_mod = count($modules);
+            $smarty->assign('mod_strings', $mod_strings);
+            $smarty->assign('modules', $mod);
+            $smarty->assign('custom', $custom);
+            $smarty->assign('nb_mod', $nb_mod);
+            $smarty->assign('defaultHelp', 'exportHelp');
+            $smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
+            $smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
+        $ajax = new AjaxCompose();
+        $ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
+        $ajax->addSection('center', $mod_strings['LBL_EC_TITLE'],$smarty->fetch($this->getCustomFilePathIfExists('modules/ModuleBuilder/tpls/exportcustomizations.tpl')));
+        echo $ajax->getJavascript();
+        }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -48,7 +48,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -58,10 +58,10 @@ 
  		global $current_user, $mod_strings;
  		$smarty = new Sugar_Smarty();
  		$mb = new MBPackage("packageCustom");
- 		$mod=$mb->getCustomModules();
- 		foreach($mod as $key => $value){
- 		    $modules[]=$key;
- 		    $custom[]=$value;
+ 		$mod = $mb->getCustomModules();
+ 		foreach ($mod as $key => $value) {
+ 		    $modules[] = $key;
+ 		    $custom[] = $value;
  		}
  		$nb_mod = count($modules);
  		$smarty->assign('mod_strings', $mod_strings);
@@ -69,11 +69,11 @@ 
  		$smarty->assign('custom', $custom);
  		$smarty->assign('nb_mod', $nb_mod);
  		$smarty->assign('defaultHelp', 'exportHelp');
- 		$smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
- 		$smarty->assign('moduleList',$GLOBALS['app_list_strings']['moduleList']);  
+ 		$smarty->assign('moduleList', $GLOBALS['app_list_strings']['moduleList']);  
+ 		$smarty->assign('moduleList', $GLOBALS['app_list_strings']['moduleList']);  
 		$ajax = new AjaxCompose();
 		$ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
-		$ajax->addSection('center', $mod_strings['LBL_EC_TITLE'],$smarty->fetch($this->getCustomFilePathIfExists('modules/ModuleBuilder/tpls/exportcustomizations.tpl')));
+		$ajax->addSection('center', $mod_strings['LBL_EC_TITLE'], $smarty->fetch($this->getCustomFilePathIfExists('modules/ModuleBuilder/tpls/exportcustomizations.tpl')));
 		echo $ajax->getJavascript();
  	}
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.relationship.php

Indentation +40 added lines, -40 removed lines

@@ -47,16 +47,16 @@ 
 class ViewRelationship 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 overrideDefinitionFromPOST(
@@ -66,9 +66,9 @@ 
         require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
         foreach ( AbstractRelationship::$definitionKeys as $key )
         {
-        	if(!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label')) ){
-        		continue;
-        	}
+            if(!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label')) ){
+                continue;
+            }
             if (! empty ( $_REQUEST [ $key ] ))
             {
                 $definition [ $key ] = $_REQUEST [ $key ] ;
@@ -92,15 +92,15 @@ 
             $fields = $module->fields ;
             require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
             $relatableModules = DeployedRelationships::findRelatableModules () ;
-        	$appStrings = return_app_list_strings_language( $selected_lang ) ;
-        	$modStrings = return_module_language( $selected_lang, $_REQUEST [ 'view_module' ], true ) ;
-        	$appStrings = $appStrings['moduleList'];
+            $appStrings = return_app_list_strings_language( $selected_lang ) ;
+            $modStrings = return_module_language( $selected_lang, $_REQUEST [ 'view_module' ], true ) ;
+            $appStrings = $appStrings['moduleList'];
         } else
         {
             $mb = new ModuleBuilder ( ) ;
-			$mb->getPackages();
-			//display the latest module name rather than what is in or not in the loaded app_list_strings.
-			$mb->getPackage($_REQUEST ['view_package'])->loadModuleTitles();
+            $mb->getPackages();
+            //display the latest module name rather than what is in or not in the loaded app_list_strings.
+            $mb->getPackage($_REQUEST ['view_package'])->loadModuleTitles();
             $module = $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
             $moduleName = empty($module->key_name) ? $module->getModuleName() : $module->key_name;
             $this->smarty->assign ( 'view_package', $_REQUEST [ 'view_package' ] ) ;
@@ -132,16 +132,16 @@ 
             $relationship->setName($_REQUEST [ 'relationship_name' ] );
             $definition = $relationship->getDefinition();
             if (!$this->fromModuleBuilder){
-        		$modStrings = return_module_language( $selected_lang, $relationship->rhs_module, true ) ;
-	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
-	            $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
-	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
-			}else{
-				#30624
-				if(!empty($_REQUEST['rhs_module'])){
-					$definition['rhs_label'] = $_REQUEST['rhs_module'];
-				}
-			}
+                $modStrings = return_module_language( $selected_lang, $relationship->rhs_module, true ) ;
+                $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
+                $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
+                $definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
+            }else{
+                #30624
+                if(!empty($_REQUEST['rhs_module'])){
+                    $definition['rhs_label'] = $_REQUEST['rhs_module'];
+                }
+            }
         } else
         {
             $definition = array ( ) ;
@@ -156,7 +156,7 @@ 
         
         if (empty($definition ['rhs_label']))
         {
-        	$definition ['rhs_label'] = translate($definition [ 'rhs_module' ]);
+            $definition ['rhs_label'] = translate($definition [ 'rhs_module' ]);
         }
         if (empty($definition ['lhs_label']))
         {
@@ -185,17 +185,17 @@ 
             }
 
             if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Activities') {
-            	$cardinality = array( MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ));
+                $cardinality = array( MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ));
             }
             //Bug 23139, Campaigns module current cannot display custom subpanels, so we need to ban it from any
             //relationships that would require a new subpanel to be shown in Campaigns.
-        	if (isset ($definition['lhs_module']) && $definition['lhs_module'] == 'Campaigns') {
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
-            	unset ( $cardinality [ MB_ONETOMANY ] ) ;
+            if (isset ($definition['lhs_module']) && $definition['lhs_module'] == 'Campaigns') {
+                unset ( $cardinality [ MB_MANYTOMANY ] ) ;
+                unset ( $cardinality [ MB_ONETOMANY ] ) ;
             }
-        	if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [ MB_MANYTOMANY ])) {
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
-            	unset ( $cardinality [ MB_MANYTOONE ] );
+            if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [ MB_MANYTOMANY ])) {
+                unset ( $cardinality [ MB_MANYTOMANY ] ) ;
+                unset ( $cardinality [ MB_MANYTOONE ] );
             }
             if (! isset($cardinality[$relationship->getType()]))
             {
@@ -206,12 +206,12 @@ 
             
             $this->smarty->assign ( 'is_new', true ) ;
         } else {
-        	$this->smarty->assign ( 'is_new', false ) ;
+            $this->smarty->assign ( 'is_new', false ) ;
         }
         
         //Remove Activities if one-to-many is not availible
-    	if (!isset($cardinality [ MB_ONETOMANY ]) && isset ($relatableModules['Activities'])) {
-        	unset ($relatableModules['Activities']);
+        if (!isset($cardinality [ MB_ONETOMANY ]) && isset ($relatableModules['Activities'])) {
+            unset ($relatableModules['Activities']);
         }
         
         
@@ -237,7 +237,7 @@ 
         $this->smarty->assign ( 'rhspanels', $rhs_subpanels ) ;
         $this->smarty->assign ( 'lhspanels', $lhs_subpanels ) ;
         $this->smarty->assign('selected_lang', $selected_lang);
-		$this->smarty->assign('available_languages',get_languages());
+        $this->smarty->assign('available_languages',get_languages());
         
         switch ( $relationship->relationship_type)
         {

Spacing +112 added lines, -112 removed lines

@@ -37,12 +37,12 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-require_once ('modules/ModuleBuilder/MB/ModuleBuilder.php') ;
-require_once ('modules/ModuleBuilder/Module/StudioModuleFactory.php') ;
-require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
-require_once ('modules/ModuleBuilder/parsers/constants.php') ;
-require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php' ;
+require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+require_once ('modules/ModuleBuilder/MB/ModuleBuilder.php');
+require_once ('modules/ModuleBuilder/Module/StudioModuleFactory.php');
+require_once ('modules/ModuleBuilder/Module/StudioBrowser.php');
+require_once ('modules/ModuleBuilder/parsers/constants.php');
+require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php';
 
 class ViewRelationship extends SugarView
 {
@@ -54,7 +54,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -63,214 +63,214 @@ 
         $definition
         )
     {
-        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
-        foreach ( AbstractRelationship::$definitionKeys as $key )
+        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
+        foreach (AbstractRelationship::$definitionKeys as $key)
         {
-        	if(!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label')) ){
+        	if (!empty($_REQUEST ['ajaxLoad']) && in_array($key, array('label', 'rhs_label', 'lhs_label'))) {
         		continue;
         	}
-            if (! empty ( $_REQUEST [ $key ] ))
+            if (!empty ($_REQUEST [$key]))
             {
-                $definition [ $key ] = $_REQUEST [ $key ] ;
+                $definition [$key] = $_REQUEST [$key];
             }
         }
-        return $definition ;
+        return $definition;
     }
 
     function display()
     {
-        $selected_lang = (!empty($_REQUEST['relationship_lang'])?$_REQUEST['relationship_lang']:$_SESSION['authenticated_user_language']);
-        $this->smarty = new Sugar_Smarty ( ) ;
-        $ac = new AjaxCompose ( ) ;
-        $this->fromModuleBuilder = isset ( $_REQUEST [ 'MB' ] ) || (!empty ( $_REQUEST [ 'view_package' ] ) && $_REQUEST [ 'view_package' ] != 'studio') ;
-        $this->smarty->assign ( 'fromModuleBuilder', $this->fromModuleBuilder ) ;
+        $selected_lang = (!empty($_REQUEST['relationship_lang']) ? $_REQUEST['relationship_lang'] : $_SESSION['authenticated_user_language']);
+        $this->smarty = new Sugar_Smarty( );
+        $ac = new AjaxCompose( );
+        $this->fromModuleBuilder = isset ($_REQUEST ['MB']) || (!empty ($_REQUEST ['view_package']) && $_REQUEST ['view_package'] != 'studio');
+        $this->smarty->assign('fromModuleBuilder', $this->fromModuleBuilder);
         
         if (!$this->fromModuleBuilder)
         {
-            $module = StudioModuleFactory::getStudioModule( $_REQUEST [ 'view_module' ] ) ;
-            $moduleName = $_REQUEST [ 'view_module' ] ;
-            $fields = $module->fields ;
-            require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
-            $relatableModules = DeployedRelationships::findRelatableModules () ;
-        	$appStrings = return_app_list_strings_language( $selected_lang ) ;
-        	$modStrings = return_module_language( $selected_lang, $_REQUEST [ 'view_module' ], true ) ;
+            $module = StudioModuleFactory::getStudioModule($_REQUEST ['view_module']);
+            $moduleName = $_REQUEST ['view_module'];
+            $fields = $module->fields;
+            require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php';
+            $relatableModules = DeployedRelationships::findRelatableModules();
+        	$appStrings = return_app_list_strings_language($selected_lang);
+        	$modStrings = return_module_language($selected_lang, $_REQUEST ['view_module'], true);
         	$appStrings = $appStrings['moduleList'];
         } else
         {
-            $mb = new ModuleBuilder ( ) ;
+            $mb = new ModuleBuilder( );
 			$mb->getPackages();
 			//display the latest module name rather than what is in or not in the loaded app_list_strings.
 			$mb->getPackage($_REQUEST ['view_package'])->loadModuleTitles();
-            $module = $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
+            $module = $mb->getPackageModule($_REQUEST ['view_package'], $_REQUEST ['view_module']);
             $moduleName = empty($module->key_name) ? $module->getModuleName() : $module->key_name;
-            $this->smarty->assign ( 'view_package', $_REQUEST [ 'view_package' ] ) ;
-            $mbvardefs = $module->getVardefs () ;
-            $fields = $mbvardefs [ 'fields' ] ;
-            require_once 'modules/ModuleBuilder/parsers/relationships/UndeployedRelationships.php' ;
-            $relatableModules = UndeployedRelationships::findRelatableModules () ;
-            $appStrings = $module->getModStrings( $selected_lang ) ;
+            $this->smarty->assign('view_package', $_REQUEST ['view_package']);
+            $mbvardefs = $module->getVardefs();
+            $fields = $mbvardefs ['fields'];
+            require_once 'modules/ModuleBuilder/parsers/relationships/UndeployedRelationships.php';
+            $relatableModules = UndeployedRelationships::findRelatableModules();
+            $appStrings = $module->getModStrings($selected_lang);
         }
         
-        ksort( $relatableModules ) ;
-        $lhs_subpanels = $module->getProvidedSubpanels () ;
+        ksort($relatableModules);
+        $lhs_subpanels = $module->getProvidedSubpanels();
         // Fix to re-add sorting of the subpanel names so that the 'default' subpanel always appears first in the list. 
         // This assumes that subpanels are usually named ForXYZ which is the case currently, and hence 'default' will be sorted first. 
         //I f this assumption is incorrect, then a better solution would be to remove 'default' from the subpanel list, then sort, and finally array_unshift it back on.
         natcasesort($lhs_subpanels);
                 
-        $cardinality = array ( MB_ONETOONE => translate ( 'LBL_ONETOONE' ) , MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ) , MB_MANYTOONE=> translate ( 'LBL_MANYTOONE' ), MB_MANYTOMANY => translate ( 'LBL_MANYTOMANY' ), ) ;
+        $cardinality = array(MB_ONETOONE => translate('LBL_ONETOONE'), MB_ONETOMANY => translate('LBL_ONETOMANY'), MB_MANYTOONE=> translate('LBL_MANYTOONE'), MB_MANYTOMANY => translate('LBL_MANYTOMANY'),);
         
         if (!$this->fromModuleBuilder)
             unset($cardinality[MB_MANYTOONE]);
             
-        $relationships = $module->getRelationships () ;
+        $relationships = $module->getRelationships();
         
         // if a description for this relationship already exists, then load it so it can be modified
-        if (! empty ( $_REQUEST [ 'relationship_name' ] ))
+        if (!empty ($_REQUEST ['relationship_name']))
         {
-            $relationship = $relationships->get ( $_REQUEST [ 'relationship_name' ] ) ;
-            $relationship->setName($_REQUEST [ 'relationship_name' ] );
+            $relationship = $relationships->get($_REQUEST ['relationship_name']);
+            $relationship->setName($_REQUEST ['relationship_name']);
             $definition = $relationship->getDefinition();
-            if (!$this->fromModuleBuilder){
-        		$modStrings = return_module_language( $selected_lang, $relationship->rhs_module, true ) ;
-	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
-	            $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
-	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
-			}else{
+            if (!$this->fromModuleBuilder) {
+        		$modStrings = return_module_language($selected_lang, $relationship->rhs_module, true);
+	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()]) ? $modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
+	            $modStrings = return_module_language($selected_lang, $relationship->lhs_module, true);
+	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)]) ? $modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module;
+			} else {
 				#30624
-				if(!empty($_REQUEST['rhs_module'])){
+				if (!empty($_REQUEST['rhs_module'])) {
 					$definition['rhs_label'] = $_REQUEST['rhs_module'];
 				}
 			}
         } else
         {
-            $definition = array ( ) ;
-            $firstModuleDefinition = each ( $relatableModules ) ;
-            $definition [ 'rhs_module' ] = $firstModuleDefinition [ 'key' ] ;
-            $definition [ 'lhs_module' ] = $moduleName ;
-            $definition [ 'lhs_label' ] = translate($moduleName);
-            $definition [ 'relationship_type' ] = MB_MANYTOMANY ;
+            $definition = array( );
+            $firstModuleDefinition = each($relatableModules);
+            $definition ['rhs_module'] = $firstModuleDefinition ['key'];
+            $definition ['lhs_module'] = $moduleName;
+            $definition ['lhs_label'] = translate($moduleName);
+            $definition ['relationship_type'] = MB_MANYTOMANY;
         }
         // load the relationship from post - required as we can call view.relationship.php from Ajax when changing the rhs_module for example           
-        $definition = $this->overrideDefinitionFromPOST ( $definition ) ;
+        $definition = $this->overrideDefinitionFromPOST($definition);
         
         if (empty($definition ['rhs_label']))
         {
-        	$definition ['rhs_label'] = translate($definition [ 'rhs_module' ]);
+        	$definition ['rhs_label'] = translate($definition ['rhs_module']);
         }
         if (empty($definition ['lhs_label']))
         {
-            $definition ['lhs_label'] = translate($definition [ 'lhs_module' ]);
+            $definition ['lhs_label'] = translate($definition ['lhs_module']);
         }
-        $relationship = RelationshipFactory::newRelationship ( $definition ) ;
+        $relationship = RelationshipFactory::newRelationship($definition);
         
-        $rhs_subpanels = $relatableModules [ $relationship->rhs_module ] ;
+        $rhs_subpanels = $relatableModules [$relationship->rhs_module];
         // Fix to re-add sorting of the subpanel names so that the 'default' subpanel always appears first in the list. This assumes that subpanels are usually named ForXYZ which is the case currently, and hence 'default' will be sorted first. If this assumption is incorrect, then a better solution would be to remove 'default' from the subpanel list, then sort, and finally array_unshift it back on.
         natcasesort($rhs_subpanels);
         
-        if (empty ( $_REQUEST [ 'relationship_name' ] ))
+        if (empty ($_REQUEST ['relationship_name']))
         {
             // tidy up the options for the view based on the modules participating in the relationship and the cardinality
             // some modules (e.g., Knowledge Base/KBDocuments) lack subpanels. That means they can't be the lhs of a 1-many or many-many, or the rhs of a many-many for example          
 
             // fix up the available cardinality options
-            $relationship_type = $relationship->getType () ;
-            if (count ( $lhs_subpanels ) == 0 || count ( $rhs_subpanels ) == 0)
+            $relationship_type = $relationship->getType();
+            if (count($lhs_subpanels) == 0 || count($rhs_subpanels) == 0)
             {
-                unset ( $cardinality [ MB_MANYTOMANY ] ) ;
+                unset ($cardinality [MB_MANYTOMANY]);
             }
-            if (count ( $rhs_subpanels ) == 0)
+            if (count($rhs_subpanels) == 0)
             {
-                unset ( $cardinality [ MB_ONETOMANY ] ) ;
+                unset ($cardinality [MB_ONETOMANY]);
             }
 
             if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Activities') {
-            	$cardinality = array( MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ));
+            	$cardinality = array(MB_ONETOMANY => translate('LBL_ONETOMANY'));
             }
             //Bug 23139, Campaigns module current cannot display custom subpanels, so we need to ban it from any
             //relationships that would require a new subpanel to be shown in Campaigns.
         	if (isset ($definition['lhs_module']) && $definition['lhs_module'] == 'Campaigns') {
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
-            	unset ( $cardinality [ MB_ONETOMANY ] ) ;
+            	unset ($cardinality [MB_MANYTOMANY]);
+            	unset ($cardinality [MB_ONETOMANY]);
             }
-        	if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [ MB_MANYTOMANY ])) {
-            	unset ( $cardinality [ MB_MANYTOMANY ] ) ;
-            	unset ( $cardinality [ MB_MANYTOONE ] );
+        	if (isset ($definition['rhs_module']) && $definition['rhs_module'] == 'Campaigns' && isset($cardinality [MB_MANYTOMANY])) {
+            	unset ($cardinality [MB_MANYTOMANY]);
+            	unset ($cardinality [MB_MANYTOONE]);
             }
-            if (! isset($cardinality[$relationship->getType()]))
+            if (!isset($cardinality[$relationship->getType()]))
             {
-                end ($cardinality) ;
-                $definition [ 'relationship_type' ] = key ( $cardinality ) ;
-                $relationship = RelationshipFactory::newRelationship ( $definition ) ;
+                end($cardinality);
+                $definition ['relationship_type'] = key($cardinality);
+                $relationship = RelationshipFactory::newRelationship($definition);
             }
             
-            $this->smarty->assign ( 'is_new', true ) ;
+            $this->smarty->assign('is_new', true);
         } else {
-        	$this->smarty->assign ( 'is_new', false ) ;
+        	$this->smarty->assign('is_new', false);
         }
         
         //Remove Activities if one-to-many is not availible
-    	if (!isset($cardinality [ MB_ONETOMANY ]) && isset ($relatableModules['Activities'])) {
+    	if (!isset($cardinality [MB_ONETOMANY]) && isset ($relatableModules['Activities'])) {
         	unset ($relatableModules['Activities']);
         }
         
         
         // now enforce the relationship_only requirement - that is, only construct the underlying relationship and link fields, and not the UI, if the subpanel code will have troubles displaying the UI                
-        $relationships->enforceRelationshipOnly ( $relationship ) ;
-        $this->smarty->assign ( 'view_module', $_REQUEST['view_module'] ) ;
-        $this->smarty->assign ( 'rel', $relationship->getDefinition () ) ;
-        $this->smarty->assign ( 'mod_strings', $GLOBALS [ 'mod_strings' ] ) ;
-        $this->smarty->assign ( 'module_key', $relationship->lhs_module ) ;
-        $this->smarty->assign ( 'cardinality', array_keys ( $cardinality ) ) ;
-        $this->smarty->assign ( 'translated_cardinality', $cardinality ) ;
-        $this->smarty->assign ( 'selected_cardinality', translate ( $relationship->getType () ) ) ;
+        $relationships->enforceRelationshipOnly($relationship);
+        $this->smarty->assign('view_module', $_REQUEST['view_module']);
+        $this->smarty->assign('rel', $relationship->getDefinition());
+        $this->smarty->assign('mod_strings', $GLOBALS ['mod_strings']);
+        $this->smarty->assign('module_key', $relationship->lhs_module);
+        $this->smarty->assign('cardinality', array_keys($cardinality));
+        $this->smarty->assign('translated_cardinality', $cardinality);
+        $this->smarty->assign('selected_cardinality', translate($relationship->getType()));
         
-        $relatable = array ( ) ;
-        foreach ( $relatableModules as $name => $dummy )
+        $relatable = array( );
+        foreach ($relatableModules as $name => $dummy)
         {
-            $relatable [ $name ] = translate ( $name ) ;
+            $relatable [$name] = translate($name);
         }
-        unset($relatable [ 'KBDocuments' ] ) ;
-        natcasesort ( $relatable ) ;
-        $this->smarty->assign ( 'relatable', array_keys ( $relatable ) ) ;
-        $this->smarty->assign ( 'translated_relatable', $relatable ) ;
-        $this->smarty->assign ( 'rhspanels', $rhs_subpanels ) ;
-        $this->smarty->assign ( 'lhspanels', $lhs_subpanels ) ;
+        unset($relatable ['KBDocuments']);
+        natcasesort($relatable);
+        $this->smarty->assign('relatable', array_keys($relatable));
+        $this->smarty->assign('translated_relatable', $relatable);
+        $this->smarty->assign('rhspanels', $rhs_subpanels);
+        $this->smarty->assign('lhspanels', $lhs_subpanels);
         $this->smarty->assign('selected_lang', $selected_lang);
-		$this->smarty->assign('available_languages',get_languages());
+		$this->smarty->assign('available_languages', get_languages());
         
-        switch ( $relationship->relationship_type)
+        switch ($relationship->relationship_type)
         {
             case MB_ONETOONE :
-                break ;
+                break;
             
             case MB_ONETOMANY :
-                if (empty ( $relationship->relationship_column_name ))
+                if (empty ($relationship->relationship_column_name))
                 {
-                    $validRoleColumnFields = array ( ) ;
-                    foreach ( $fields as $field )
+                    $validRoleColumnFields = array( );
+                    foreach ($fields as $field)
                     {
-                        $validRoleColumnFields [] = $field ;
+                        $validRoleColumnFields [] = $field;
                     }
-                    $this->smarty->assign ( 'relationship_role_column_enum', $validRoleColumnFields ) ;
+                    $this->smarty->assign('relationship_role_column_enum', $validRoleColumnFields);
                 }
-                if (! empty ( $relationship->relationship_role_column_value ))
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
-                break ;
+                if (!empty ($relationship->relationship_role_column_value))
+                    $this->smarty->assign('relationship_role_column_value', $relationship->relationship_role_column_value);
+                break;
             case MB_MANYTOMANY :
-                if (! empty ( $relationship->relationship_role_column_value ))
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
-                break ;
+                if (!empty ($relationship->relationship_role_column_value))
+                    $this->smarty->assign('relationship_role_column_value', $relationship->relationship_role_column_value);
+                break;
         }
         
         //see if we use the new system
-        if (isset ( $_REQUEST [ 'json' ] ) && $_REQUEST [ 'json' ] == 'false')
+        if (isset ($_REQUEST ['json']) && $_REQUEST ['json'] == 'false')
         {
-            echo $this->smarty->fetch ( 'modules/ModuleBuilder/tpls/studioRelationship.tpl' ) ;
+            echo $this->smarty->fetch('modules/ModuleBuilder/tpls/studioRelationship.tpl');
         } else
         {
-            $ac->addSection ( 'east', $module->name . ' ' . $GLOBALS [ 'mod_strings' ] [ 'LBL_RELATIONSHIPS' ], $this->smarty->fetch ( 'modules/ModuleBuilder/tpls/studioRelationship.tpl' ) ) ;
-            echo $ac->getJavascript () ;
+            $ac->addSection('east', $module->name.' '.$GLOBALS ['mod_strings'] ['LBL_RELATIONSHIPS'], $this->smarty->fetch('modules/ModuleBuilder/tpls/studioRelationship.tpl'));
+            echo $ac->getJavascript();
         }
     }
 }
\ No newline at end of file

Braces +10 added lines, -7 removed lines

@@ -120,8 +120,9 @@ 
                 
         $cardinality = array ( MB_ONETOONE => translate ( 'LBL_ONETOONE' ) , MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ) , MB_MANYTOONE=> translate ( 'LBL_MANYTOONE' ), MB_MANYTOMANY => translate ( 'LBL_MANYTOMANY' ), ) ;
         
-        if (!$this->fromModuleBuilder)
-            unset($cardinality[MB_MANYTOONE]);
+        if (!$this->fromModuleBuilder) {
+                    unset($cardinality[MB_MANYTOONE]);
+        }
             
         $relationships = $module->getRelationships () ;
         
@@ -136,7 +137,7 @@ 
 	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
 	            $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
 	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
-			}else{
+			} else{
 				#30624
 				if(!empty($_REQUEST['rhs_module'])){
 					$definition['rhs_label'] = $_REQUEST['rhs_module'];
@@ -254,12 +255,14 @@ 
                     }
                     $this->smarty->assign ( 'relationship_role_column_enum', $validRoleColumnFields ) ;
                 }
-                if (! empty ( $relationship->relationship_role_column_value ))
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                if (! empty ( $relationship->relationship_role_column_value )) {
+                                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                }
                 break ;
             case MB_MANYTOMANY :
-                if (! empty ( $relationship->relationship_role_column_value ))
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                if (! empty ( $relationship->relationship_role_column_value )) {
+                                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                }
                 break ;
         }
         

modules/ModuleBuilder/views/view.dropdowns.php

Indentation +27 added lines, -27 removed lines

@@ -41,31 +41,31 @@ 
 
 class ViewDropdowns 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()
- 	{
-		$ajax = new AjaxCompose();
-		$smarty = new Sugar_Smarty();
+    function display()
+        {
+        $ajax = new AjaxCompose();
+        $smarty = new Sugar_Smarty();
 		
- 		if (isset($_REQUEST['refreshTree']))
-		{
-			require_once ('modules/ModuleBuilder/Module/DropDownTree.php');
-			$mbt = new DropDownTree();
-			$ajax->addSection('west', $mbt->getName(), $mbt->fetchNodes());
-			$smarty->assign('refreshTree',true);
-		}
+            if (isset($_REQUEST['refreshTree']))
+        {
+            require_once ('modules/ModuleBuilder/Module/DropDownTree.php');
+            $mbt = new DropDownTree();
+            $ajax->addSection('west', $mbt->getName(), $mbt->fetchNodes());
+            $smarty->assign('refreshTree',true);
+        }
                 
         global $mod_strings;
         $ajax->addCrumb($mod_strings['LBL_DROPDOWNEDITOR'], 'ModuleBuilder.main("dropdowns")');
@@ -75,12 +75,12 @@ 
         
         $smarty->assign('LBL_BTN_ADDDROPDOWN',translate('LBL_BTN_ADDDROPDOWN'));
         $smarty->assign('dropdowns', $dd->getNodes());
-		$smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
-		$smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', '',null,null,'.gif',$mod_strings['LBL_EDIT']));
-		$smarty->assign('action', 'savedropdown');
+        $smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
+        $smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', '',null,null,'.gif',$mod_strings['LBL_EDIT']));
+        $smarty->assign('action', 'savedropdown');
 		
 
-		$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl') );
- 		echo $ajax->getJavascript();
- 	}
+        $ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl') );
+            echo $ajax->getJavascript();
+        }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -64,7 +64,7 @@ 
 			require_once ('modules/ModuleBuilder/Module/DropDownTree.php');
 			$mbt = new DropDownTree();
 			$ajax->addSection('west', $mbt->getName(), $mbt->fetchNodes());
-			$smarty->assign('refreshTree',true);
+			$smarty->assign('refreshTree', true);
 		}
                 
         global $mod_strings;
@@ -73,14 +73,14 @@ 
         require_once('modules/ModuleBuilder/Module/DropDownBrowser.php');
         $dd = new DropDownBrowser();
         
-        $smarty->assign('LBL_BTN_ADDDROPDOWN',translate('LBL_BTN_ADDDROPDOWN'));
+        $smarty->assign('LBL_BTN_ADDDROPDOWN', translate('LBL_BTN_ADDDROPDOWN'));
         $smarty->assign('dropdowns', $dd->getNodes());
-		$smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
-		$smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', '',null,null,'.gif',$mod_strings['LBL_EDIT']));
+		$smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage('delete_inline', '', null, null, '.gif', $mod_strings['LBL_MB_DELETE']));
+		$smarty->assign('editImage', SugarThemeRegistry::current()->getImage('edit_inline', '', null, null, '.gif', $mod_strings['LBL_EDIT']));
 		$smarty->assign('action', 'savedropdown');
 		
 
-		$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl') );
+		$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdowns.tpl'));
  		echo $ajax->getJavascript();
  	}
 }
\ No newline at end of file