adamjakab / SuiteCRM

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

modules/ModuleBuilder/views/view.popupview.php

Indentation +18 added lines, -18 removed lines

@@ -62,16 +62,16 @@ 
     }
     
     /**
-	 * @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(),
+            );
     }
 
 //    /*
@@ -101,12 +101,12 @@ 
 
         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('LBL_POPUP'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
-        	echo $ajax->getJavascript () ;
+            $ajax = $this->constructAjax () ;
+            $ajax->addSection ( 'center', translate('LBL_POPUP'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
+            echo $ajax->getJavascript () ;
         }
     }
 
@@ -151,11 +151,11 @@ 
         $helpName = (isset( $_REQUEST['view']) && $_REQUEST['view']==MB_POPUPSEARCH) ? 'searchViewEditor' : 'popupListViewEditor';
         $smarty->assign ( 'helpName', $helpName ) ;
         $smarty->assign ( 'helpDefault', 'modify' ) ;
-   	 	if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
+            if ($this->fromModuleBuilder) {
+            $mb = new ModuleBuilder ( ) ;
             $module = & $mb->getPackageModule ( $this->editPackage, $this->editModule ) ;
-		    $smarty->assign('current_mod_strings', $module->getModStrings());
-		}
+            $smarty->assign('current_mod_strings', $module->getModStrings());
+        }
 
         $smarty->assign ( 'title', $this->_constructTitle () ) ;
         $groups = array ( ) ;
@@ -171,7 +171,7 @@ 
                 {
                     if (substr ( $field [ 'width' ], - 1, 1 ) == '%')
                     {
-						$groups [ $groupKey ] [ $fieldKey ] [ 'width' ] = substr ( $field [ 'width' ], 0, strlen ( $field [ 'width' ] ) - 1 ) ;
+                        $groups [ $groupKey ] [ $fieldKey ] [ 'width' ] = substr ( $field [ 'width' ], 0, strlen ( $field [ 'width' ] ) - 1 ) ;
                     }
                 }
             }

Spacing +81 added lines, -81 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.
@@ -41,23 +41,23 @@ 
 
 
 
-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 ViewPopupview extends ViewListView
 {
     function __construct()
     {
-        $this->editModule = $_REQUEST [ 'view_module' ] ;
-        $this->editLayout = $_REQUEST [ 'view' ] ;
-        $this->editPackage = (isset ( $_REQUEST [ 'view_package' ] ) && ! empty ( $_REQUEST [ 'view_package' ] )) ? $_REQUEST [ 'view_package' ] : null ;
+        $this->editModule = $_REQUEST ['view_module'];
+        $this->editLayout = $_REQUEST ['view'];
+        $this->editPackage = (isset ($_REQUEST ['view_package']) && !empty ($_REQUEST ['view_package'])) ? $_REQUEST ['view_package'] : null;
 
-        $this->fromModuleBuilder = isset ( $_REQUEST [ 'MB' ] ) || (isset($_REQUEST['view_package']) && $_REQUEST['view_package'] && $_REQUEST['view_package'] != 'studio') ;
+        $this->fromModuleBuilder = isset ($_REQUEST ['MB']) || (isset($_REQUEST['view_package']) && $_REQUEST['view_package'] && $_REQUEST['view_package'] != 'studio');
         if (!$this->fromModuleBuilder)
         {
-            global $app_list_strings ;
-            $moduleNames = array_change_key_case ( $app_list_strings [ 'moduleList' ] ) ;
-            $this->translatedEditModule = $moduleNames [ strtolower ( $this->editModule ) ] ;
+            global $app_list_strings;
+            $moduleNames = array_change_key_case($app_list_strings ['moduleList']);
+            $this->translatedEditModule = $moduleNames [strtolower($this->editModule)];
         }
     }
     
@@ -69,7 +69,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -90,148 +90,148 @@ 
         $preview = false
         )
     {
-        require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
-        $parser = ParserFactory::getParser ( $this->editLayout, $this->editModule, $this->editPackage) ;
+        require_once 'modules/ModuleBuilder/parsers/ParserFactory.php';
+        $parser = ParserFactory::getParser($this->editLayout, $this->editModule, $this->editPackage);
 
-        $smarty = $this->constructSmarty ( $parser ) ;
+        $smarty = $this->constructSmarty($parser);
 
-        if(isset($this->view_object_map['new_parser'])) {
+        if (isset($this->view_object_map['new_parser'])) {
             $smarty = $this->constructSmarty($this->view_object_map['new_parser']);
         }
 
         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('LBL_POPUP'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
-        	echo $ajax->getJavascript () ;
+        	$ajax = $this->constructAjax();
+        	$ajax->addSection('center', translate('LBL_POPUP'), $smarty->fetch("modules/ModuleBuilder/tpls/listView.tpl"));
+        	echo $ajax->getJavascript();
         }
     }
 
     function constructAjax()
     {
-        require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-        $ajax = new AjaxCompose ( ) ;
+        require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+        $ajax = new AjaxCompose( );
 
         if ($this->fromModuleBuilder)
         {
-            $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
-            $ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $this->editPackage . '")' ) ;
-            $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $this->editPackage . '&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&MB=1&view_package='.$this->editPackage.'&view_module=' . $this->editModule . '")');
-            $ajax->addCrumb ( translate('LBL_POPUP', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=popup&MB=1&view_package='.$this->editPackage.'&view_module=' . $this->editModule . '")' );
+            $ajax->addCrumb(translate('LBL_MODULEBUILDER', 'ModuleBuilder'), 'ModuleBuilder.main("mb")');
+            $ajax->addCrumb($_REQUEST ['view_package'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$this->editPackage.'")');
+            $ajax->addCrumb($this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$this->editPackage.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&MB=1&view_package='.$this->editPackage.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_POPUP', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=popup&MB=1&view_package='.$this->editPackage.'&view_module='.$this->editModule.'")');
 
             $ViewLabel = ($this->editLayout == MB_POPUPLIST) ? 'LBL_POPUPLISTVIEW' : 'LBL_POPUPSEARCH';
-            $ajax->addCrumb ( translate ($ViewLabel, 'ModuleBuilder' ), '' ) ;
-        }else{
-            $ajax->addCrumb ( translate($this->editModule), 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&view_module=' . $this->editModule . '")');
-            $ajax->addCrumb ( translate('LBL_POPUP', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=popup&view_module=' . $this->editModule . '")' );
+            $ajax->addCrumb(translate($ViewLabel, 'ModuleBuilder'), '');
+        } else {
+            $ajax->addCrumb(translate($this->editModule), 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_POPUP', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=popup&view_module='.$this->editModule.'")');
             $ViewLabel = ($this->editLayout == MB_POPUPLIST) ? 'LBL_POPUPLISTVIEW' : 'LBL_POPUPSEARCH';
-            $ajax->addCrumb ( translate ($ViewLabel, 'ModuleBuilder' ), '' ) ;
+            $ajax->addCrumb(translate($ViewLabel, 'ModuleBuilder'), '');
         }
-        return $ajax ;
+        return $ajax;
     }
 
     function constructSmarty(
         $parser
         )
     {
-        $smarty = new Sugar_Smarty ( ) ;
-        $smarty->assign ( 'translate', true ) ;
-        $smarty->assign ( 'language', $parser->getLanguage () ) ;
-
-        $smarty->assign ( 'view', $this->editLayout ) ;
-        $smarty->assign ( 'action', 'popupSave' ) ;
-        $smarty->assign( 'module', 'ModuleBuilder');
-        $smarty->assign ( 'view_module', $this->editModule ) ;
-        $smarty->assign ( 'field_defs', $parser->getFieldDefs () ) ;
-        $helpName = (isset( $_REQUEST['view']) && $_REQUEST['view']==MB_POPUPSEARCH) ? 'searchViewEditor' : 'popupListViewEditor';
-        $smarty->assign ( 'helpName', $helpName ) ;
-        $smarty->assign ( 'helpDefault', 'modify' ) ;
+        $smarty = new Sugar_Smarty( );
+        $smarty->assign('translate', true);
+        $smarty->assign('language', $parser->getLanguage());
+
+        $smarty->assign('view', $this->editLayout);
+        $smarty->assign('action', 'popupSave');
+        $smarty->assign('module', 'ModuleBuilder');
+        $smarty->assign('view_module', $this->editModule);
+        $smarty->assign('field_defs', $parser->getFieldDefs());
+        $helpName = (isset($_REQUEST['view']) && $_REQUEST['view'] == MB_POPUPSEARCH) ? 'searchViewEditor' : 'popupListViewEditor';
+        $smarty->assign('helpName', $helpName);
+        $smarty->assign('helpDefault', 'modify');
    	 	if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
-            $module = & $mb->getPackageModule ( $this->editPackage, $this->editModule ) ;
+			$mb = new ModuleBuilder( );
+            $module = & $mb->getPackageModule($this->editPackage, $this->editModule);
 		    $smarty->assign('current_mod_strings', $module->getModStrings());
 		}
 
-        $smarty->assign ( 'title', $this->_constructTitle () ) ;
-        $groups = array ( ) ;
-        foreach ( $parser->columns as $column => $function )
+        $smarty->assign('title', $this->_constructTitle());
+        $groups = array( );
+        foreach ($parser->columns as $column => $function)
         {
-            $groups [ $GLOBALS [ 'mod_strings' ] [ $column ] ] = $parser->$function () ; 
+            $groups [$GLOBALS ['mod_strings'] [$column]] = $parser->$function(); 
         }
-        foreach ( $groups as $groupKey => $group )
+        foreach ($groups as $groupKey => $group)
         {
-            foreach ( $group as $fieldKey => $field )
+            foreach ($group as $fieldKey => $field)
             {
-                if (isset ( $field [ 'width' ] ))
+                if (isset ($field ['width']))
                 {
-                    if (substr ( $field [ 'width' ], - 1, 1 ) == '%')
+                    if (substr($field ['width'], - 1, 1) == '%')
                     {
-						$groups [ $groupKey ] [ $fieldKey ] [ 'width' ] = substr ( $field [ 'width' ], 0, strlen ( $field [ 'width' ] ) - 1 ) ;
+						$groups [$groupKey] [$fieldKey] ['width'] = substr($field ['width'], 0, strlen($field ['width']) - 1);
                     }
                 }
             }
         }
 
-        $smarty->assign ( 'groups', $groups ) ;
+        $smarty->assign('groups', $groups);
 
         global $image_path, $mod_strings;
-        $imageSave = SugarThemeRegistry::current()->getImage('studio_save','',null,null,'.gif',$mod_strings['LBL_BTN_SAVE']) ;
+        $imageSave = SugarThemeRegistry::current()->getImage('studio_save', '', null, null, '.gif', $mod_strings['LBL_BTN_SAVE']);
 
 
-        $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
+        $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")";
         if (isset($this->searchlayout))
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
+            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")";
 
-        $buttons = array ( ) ;
-        if (! $this->fromModuleBuilder)
+        $buttons = array( );
+        if (!$this->fromModuleBuilder)
         {
-            $buttons [] = array ( 'name' => 'savebtn' , 'image' => $imageSave , 'text' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVEPUBLISH' ] , 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'" ) ;
+            $buttons [] = array('name' => 'savebtn', 'image' => $imageSave, 'text' => $GLOBALS ['mod_strings'] ['LBL_BTN_SAVEPUBLISH'], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'");
         } else
         {
-            $buttons [] = array ( 'name' => 'mbsavebtn' , 'image' => $imageSave , 'text' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVE' ] , 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'" ) ;
+            $buttons [] = array('name' => 'mbsavebtn', 'image' => $imageSave, 'text' => $GLOBALS ['mod_strings'] ['LBL_BTN_SAVE'], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'");
         }
-        $buttons [] = array ( 'name' => 'historyBtn' , 'text' => translate ( 'LBL_HISTORY' ) , 'actionScript' => "onclick='$histaction'" ) ;
-        $smarty->assign ( 'buttons', $this->_buildImageButtons ( $buttons ) ) ;
-        $editImage = SugarThemeRegistry::current()->getImage('edit_inline','',null,null,'.gif',$mod_strings['LBL_EDIT']) ;
+        $buttons [] = array('name' => 'historyBtn', 'text' => translate('LBL_HISTORY'), 'actionScript' => "onclick='$histaction'");
+        $smarty->assign('buttons', $this->_buildImageButtons($buttons));
+        $editImage = SugarThemeRegistry::current()->getImage('edit_inline', '', null, null, '.gif', $mod_strings['LBL_EDIT']);
 
-        $smarty->assign ( 'editImage', $editImage ) ;
-        $deleteImage = SugarThemeRegistry::current()->getImage('delete_inline','',null,null,'.gif',$mod_strings['LBL_MB_DELETE']) ;
+        $smarty->assign('editImage', $editImage);
+        $deleteImage = SugarThemeRegistry::current()->getImage('delete_inline', '', null, null, '.gif', $mod_strings['LBL_MB_DELETE']);
 
-        $smarty->assign ( 'deleteImage', $deleteImage ) ;
-        $smarty->assign ( 'MOD', $GLOBALS [ 'mod_strings' ] ) ;
+        $smarty->assign('deleteImage', $deleteImage);
+        $smarty->assign('MOD', $GLOBALS ['mod_strings']);
 
         if ($this->fromModuleBuilder)
         {
-            $smarty->assign ( 'MB', true ) ;
-            $smarty->assign ( 'view_package', $this->editPackage ) ;
-            $smarty->assign ( 'description', $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_DESCRIPTION' ] ) ;
+            $smarty->assign('MB', true);
+            $smarty->assign('view_package', $this->editPackage);
+            $smarty->assign('description', $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_DESCRIPTION']);
 
         } else
         {
-            $smarty->assign ( 'description', $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_DESCRIPTION' ] ) ;
+            $smarty->assign('description', $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_DESCRIPTION']);
         }
 
-        return $smarty ;
+        return $smarty;
     }
 
     function _constructTitle()
     {
 
-        global $app_list_strings ;
+        global $app_list_strings;
 
         if ($this->fromModuleBuilder)
         {
-            $title = $this->editModule ;
+            $title = $this->editModule;
         } else
         {
-            $title =  $app_list_strings [ 'moduleList' ] [ $this->editModule ] ;
+            $title = $app_list_strings ['moduleList'] [$this->editModule];
         }
-        return $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_EDIT' ] . ':&nbsp;' . $title ;
+        return $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_EDIT'].':&nbsp;'.$title;
 
     }
 }

Braces +6 added lines, -4 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+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.
@@ -125,7 +126,7 @@ 
 
             $ViewLabel = ($this->editLayout == MB_POPUPLIST) ? 'LBL_POPUPLISTVIEW' : 'LBL_POPUPSEARCH';
             $ajax->addCrumb ( translate ($ViewLabel, 'ModuleBuilder' ), '' ) ;
-        }else{
+        } else{
             $ajax->addCrumb ( translate($this->editModule), 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '")' ) ;
             $ajax->addCrumb ( translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&view_module=' . $this->editModule . '")');
             $ajax->addCrumb ( translate('LBL_POPUP', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=popup&view_module=' . $this->editModule . '")' );
@@ -184,8 +185,9 @@ 
 
 
         $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
-        if (isset($this->searchlayout))
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
+        if (isset($this->searchlayout)) {
+                    $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
+        }
 
         $buttons = array ( ) ;
         if (! $this->fromModuleBuilder)

modules/ModuleBuilder/views/view.tree.php

Indentation +30 added lines, -30 removed lines

@@ -45,40 +45,40 @@
 
 class ViewHistory 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(),
+            );
     }
 
-	//STUDIO LABELS ONLY//
- 	//TODO Bundle Studio and ModuleBuilder label handling to increase maintainability.
- 	function display()
- 	{
-		$root = new ExtNode('root', 'root', true);
-		$sb = new StudioBrowser();
-		$sb->loadModules();
-		foreach($sb->modules as $name => $studioMod) {
-			$root->add_node($this->buildStudioNode($studioMod));
-		}
-		$json = getJSONobj();
-		echo($json->encode($root));
- 	}
+    //STUDIO LABELS ONLY//
+        //TODO Bundle Studio and ModuleBuilder label handling to increase maintainability.
+        function display()
+        {
+        $root = new ExtNode('root', 'root', true);
+        $sb = new StudioBrowser();
+        $sb->loadModules();
+        foreach($sb->modules as $name => $studioMod) {
+            $root->add_node($this->buildStudioNode($studioMod));
+        }
+        $json = getJSONobj();
+        echo($json->encode($root));
+        }
 	
-	/**
-	 * 
-	 * @return ExtNode built from the passed StudioModule
-	 * @param $module StudioModule
-	 */
-	function buildStudioNode($module) {
+    /**
+     * 
+     * @return ExtNode built from the passed StudioModule
+     * @param $module StudioModule
+     */
+    function buildStudioNode($module) {
 		
-	}
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -40,8 +40,8 @@ 
 
 require_once('modules/ModuleBuilder/MB/AjaxCompose.php');
 require_once('modules/ModuleBuilder/Module/StudioModule.php');
-require_once('modules/ModuleBuilder/Module/StudioBrowser.php') ;
-require_once('include/ytree/ExtNode.php') ;
+require_once('modules/ModuleBuilder/Module/StudioBrowser.php');
+require_once('include/ytree/ExtNode.php');
 
 class ViewHistory extends SugarView 
 {
@@ -53,7 +53,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -65,7 +65,7 @@ 
 		$root = new ExtNode('root', 'root', true);
 		$sb = new StudioBrowser();
 		$sb->loadModules();
-		foreach($sb->modules as $name => $studioMod) {
+		foreach ($sb->modules as $name => $studioMod) {
 			$root->add_node($this->buildStudioNode($studioMod));
 		}
 		$json = getJSONobj();

modules/ModuleBuilder/views/view.resetmodule.php

Indentation +31 added lines, -31 removed lines

@@ -48,19 +48,19 @@ 
 class ViewResetmodule 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()
     {
         $moduleName = $this->module = $_REQUEST['view_module'];
         if (isset($_REQUEST['handle']) && $_REQUEST['handle'] == "execute") {
@@ -79,7 +79,7 @@ 
             array("name" => "fields", "label" => translate("LBL_REMOVE_FIELDS")),
             array("name" => "layouts", "label" => translate("LBL_RESET_LAYOUTS")),
             array("name" => "labels", "label" => translate("LBL_RESET_LABELS")),
-			array("name" => "extensions", "label" => translate("LBL_CLEAR_EXTENSIONS")),
+            array("name" => "extensions", "label" => translate("LBL_CLEAR_EXTENSIONS")),
         ));
         
         $ajax->addSection ( 
@@ -104,10 +104,10 @@ 
         if (!empty($_REQUEST['layouts']))
             $out .= $this->removeCustomLayouts();
 			
-		if (!empty($_REQUEST['labels']))
+        if (!empty($_REQUEST['labels']))
             $out .= $this->removeCustomLabels();
 			
-		if (!empty($_REQUEST['extensions']))
+        if (!empty($_REQUEST['extensions']))
             $out .= $this->removeCustomExtensions();	
 			
         
@@ -148,11 +148,11 @@ 
         $customFields = array();
         foreach($seed->field_defs as $def) {
             if(isset($def['source']) && $def['source'] == 'custom_fields') {
-               $field = $df->getFieldWidget($moduleName, $def['name']);
-               $field->delete ( $df ) ;
+                $field = $df->getFieldWidget($moduleName, $def['name']);
+                $field->delete ( $df ) ;
                
-               $module->removeFieldFromLayouts( $def['name'] );
-               $customFields[] = $def['name'];
+                $module->removeFieldFromLayouts( $def['name'] );
+                $customFields[] = $def['name'];
             }
         }
         $out = "";
@@ -196,7 +196,7 @@ 
      */
     function removeCustomRelationships() 
     {
-    	require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
+        require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
         $out = "";
         $madeChanges = false;
         $relationships = new DeployedRelationships ( $this->module ) ;
@@ -210,7 +210,7 @@ 
             }
         }
         if ($madeChanges)
-           $relationships->save () ;
+            $relationships->save () ;
         
         return $out;
     }
@@ -218,33 +218,33 @@ 
     function removeCustomLabels() 
     {
         $out = "";
-		$languageDir = "custom/modules/{$this->module}/language";
+        $languageDir = "custom/modules/{$this->module}/language";
         if (is_dir($languageDir)) {
             $files = scandir($languageDir);
             foreach ($files as $langFile) {
                 if (substr($langFile, 0 ,1) == '.') continue;
-				$language = substr($langFile, 0, strlen($langFile) - 9);
-				unlink($languageDir . "/" . $langFile);
+                $language = substr($langFile, 0, strlen($langFile) - 9);
+                unlink($languageDir . "/" . $langFile);
 				
-				LanguageManager::clearLanguageCache ( $this->module, $language ) ;
-				$out .= "Removed language file $langFile<br/>";
+                LanguageManager::clearLanguageCache ( $this->module, $language ) ;
+                $out .= "Removed language file $langFile<br/>";
             }
         }
 		
-		return $out;
+        return $out;
     }
 	
-	function removeCustomExtensions() 
-	{
+    function removeCustomExtensions() 
+    {
         $out = "";
         $extDir = "custom/Extension/modules/{$this->module}";
         if (is_dir($extDir)) {
-        	rmdir_recursive($extDir);
-        	require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
+            rmdir_recursive($extDir);
+            require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
             $rac = new RepairAndClear ( ) ;
             $rac->repairAndClearAll ( array ( 'clearAll' ), array ( $this->module ), true, false ) ;
-			$rac->rebuildExtensions();
-        	$out .= "Cleared extensions for {$this->module}<br/>";
+            $rac->rebuildExtensions();
+            $out .= "Cleared extensions for {$this->module}<br/>";
         }
 		
         return $out;

Braces +21 added lines, -13 removed lines

@@ -95,20 +95,25 @@ 
     {
         $out = "<script>ajaxStatus.flashStatus(SUGAR.language.get('app_strings', 'LBL_REQUEST_PROCESSED'), 2000);</script>";
         
-        if (!empty($_REQUEST['relationships']))
-            $out .= $this->removeCustomRelationships();
+        if (!empty($_REQUEST['relationships'])) {
+                    $out .= $this->removeCustomRelationships();
+        }
             
-        if (!empty($_REQUEST['fields']))
-            $out .= $this->removeCustomFields();
+        if (!empty($_REQUEST['fields'])) {
+                    $out .= $this->removeCustomFields();
+        }
             
-        if (!empty($_REQUEST['layouts']))
-            $out .= $this->removeCustomLayouts();
+        if (!empty($_REQUEST['layouts'])) {
+                    $out .= $this->removeCustomLayouts();
+        }
 			
-		if (!empty($_REQUEST['labels']))
-            $out .= $this->removeCustomLabels();
+		if (!empty($_REQUEST['labels'])) {
+		            $out .= $this->removeCustomLabels();
+		}
 			
-		if (!empty($_REQUEST['extensions']))
-            $out .= $this->removeCustomExtensions();	
+		if (!empty($_REQUEST['extensions'])) {
+		            $out .= $this->removeCustomExtensions();
+		}
 			
         
         $out .= "Complete!";
@@ -209,8 +214,9 @@ 
                 $out .= "Removed relationship $relationshipName<br/>";
             }
         }
-        if ($madeChanges)
-           $relationships->save () ;
+        if ($madeChanges) {
+                   $relationships->save () ;
+        }
         
         return $out;
     }
@@ -222,7 +228,9 @@ 
         if (is_dir($languageDir)) {
             $files = scandir($languageDir);
             foreach ($files as $langFile) {
-                if (substr($langFile, 0 ,1) == '.') continue;
+                if (substr($langFile, 0 ,1) == '.') {
+                    continue;
+                }
 				$language = substr($langFile, 0, strlen($langFile) - 9);
 				unlink($languageDir . "/" . $langFile);
 				

Spacing +51 added lines, -51 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/StudioModule.php') ;
-require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
-require_once ('modules/DynamicFields/DynamicField.php') ;
-require_once 'modules/ModuleBuilder/Module/StudioModuleFactory.php' ;
+require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+require_once ('modules/ModuleBuilder/MB/ModuleBuilder.php');
+require_once ('modules/ModuleBuilder/Module/StudioModule.php');
+require_once ('modules/ModuleBuilder/Module/StudioBrowser.php');
+require_once ('modules/DynamicFields/DynamicField.php');
+require_once 'modules/ModuleBuilder/Module/StudioModuleFactory.php';
 require_once 'modules/ModuleBuilder/parsers/views/DeployedMetaDataImplementation.php';
 
 class ViewResetmodule extends SugarView
@@ -55,7 +55,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -67,12 +67,12 @@ 
             return $this->handleSave();
         }
         
-        $ajax = new AjaxCompose ( ) ;
-        $ajax->addCrumb ( translate('LBL_STUDIO'), 'ModuleBuilder.main("studio")' ) ;
-        $ajax->addCrumb ( translate($moduleName), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $moduleName . '")' ) ;
-        $ajax->addCrumb ( translate('LBL_RESET') . " " . translate($moduleName) , '') ;
+        $ajax = new AjaxCompose( );
+        $ajax->addCrumb(translate('LBL_STUDIO'), 'ModuleBuilder.main("studio")');
+        $ajax->addCrumb(translate($moduleName), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$moduleName.'")');
+        $ajax->addCrumb(translate('LBL_RESET')." ".translate($moduleName), '');
         
-        $smarty = new Sugar_Smarty ( ) ;
+        $smarty = new Sugar_Smarty( );
         $smarty->assign("module", $moduleName);
         $smarty->assign("actions", array(
             array("name" => "relationships", "label" => translate("LBL_CLEAR_RELATIONSHIPS")),
@@ -82,13 +82,13 @@ 
 			array("name" => "extensions", "label" => translate("LBL_CLEAR_EXTENSIONS")),
         ));
         
-        $ajax->addSection ( 
+        $ajax->addSection( 
             'center', 
-            "Reset ". translate($moduleName) , 
+            "Reset ".translate($moduleName), 
             $smarty->fetch('modules/ModuleBuilder/tpls/resetModule.tpl') //"This works now" 
-        ) ;
+        );
         
-        echo $ajax->getJavascript () ;
+        echo $ajax->getJavascript();
     }
     
     function handleSave() 
@@ -113,20 +113,20 @@ 
         
         $out .= "Complete!";
         
-        $ajax = new AjaxCompose ( ) ;
+        $ajax = new AjaxCompose( );
         
-        $ajax->addCrumb ( translate('LBL_STUDIO'), 'ModuleBuilder.main("studio")' ) ;
-        $ajax->addCrumb ( translate($this->module), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->module . '")' ) ;
-        $ajax->addCrumb ( "Reset ". translate($this->module) , '') ;
+        $ajax->addCrumb(translate('LBL_STUDIO'), 'ModuleBuilder.main("studio")');
+        $ajax->addCrumb(translate($this->module), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$this->module.'")');
+        $ajax->addCrumb("Reset ".translate($this->module), '');
         
         
-        $ajax->addSection ( 
+        $ajax->addSection( 
             'center', 
-            "Reset ". translate($this->module) , 
+            "Reset ".translate($this->module), 
             $out
-        ) ;
+        );
         
-        echo $ajax->getJavascript () ;
+        echo $ajax->getJavascript();
     }
     
     /**
@@ -137,21 +137,21 @@ 
     function removeCustomFields() 
     {    
         $moduleName = $this->module;
-        $class_name = $GLOBALS [ 'beanList' ] [ $moduleName ] ;
-        require_once ($GLOBALS [ 'beanFiles' ] [ $class_name ]) ;
-        $seed = new $class_name ( ) ;
-        $df = new DynamicField ( $moduleName ) ;
-        $df->setup ( $seed ) ;
+        $class_name = $GLOBALS ['beanList'] [$moduleName];
+        require_once ($GLOBALS ['beanFiles'] [$class_name]);
+        $seed = new $class_name( );
+        $df = new DynamicField($moduleName);
+        $df->setup($seed);
         
         
-        $module = StudioModuleFactory::getStudioModule( $moduleName ) ;
+        $module = StudioModuleFactory::getStudioModule($moduleName);
         $customFields = array();
-        foreach($seed->field_defs as $def) {
-            if(isset($def['source']) && $def['source'] == 'custom_fields') {
+        foreach ($seed->field_defs as $def) {
+            if (isset($def['source']) && $def['source'] == 'custom_fields') {
                $field = $df->getFieldWidget($moduleName, $def['name']);
-               $field->delete ( $df ) ;
+               $field->delete($df);
                
-               $module->removeFieldFromLayouts( $def['name'] );
+               $module->removeFieldFromLayouts($def['name']);
                $customFields[] = $def['name'];
             }
         }
@@ -169,11 +169,11 @@ 
      */
     function removeCustomLayouts() 
     {
-        $module = StudioModuleFactory::getStudioModule( $this->module ) ;
+        $module = StudioModuleFactory::getStudioModule($this->module);
         $sources = $module->getViewMetadataSources();
 
         $out = "";
-        foreach($sources as $view)
+        foreach ($sources as $view)
         {
             $deployedMetaDataImplementation = new DeployedMetaDataImplementation($view, $this->module);
             $file = $deployedMetaDataImplementation->getFileName($view['type'], $this->module);
@@ -184,8 +184,8 @@ 
         }
         
         // now clear the cache
-        include_once ('include/TemplateHandler/TemplateHandler.php') ;
-        TemplateHandler::clearCache ( $this->module ) ;
+        include_once ('include/TemplateHandler/TemplateHandler.php');
+        TemplateHandler::clearCache($this->module);
         
         return $out;
     }
@@ -197,21 +197,21 @@ 
      */
     function removeCustomRelationships() 
     {
-    	require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
+    	require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php';
         $out = "";
         $madeChanges = false;
-        $relationships = new DeployedRelationships ( $this->module ) ;
+        $relationships = new DeployedRelationships($this->module);
         
-        foreach ( $relationships->getRelationshipList () as $relationshipName )
+        foreach ($relationships->getRelationshipList() as $relationshipName)
         {
-            $rel = $relationships->get ( $relationshipName )->getDefinition () ;
-            if ($rel [ 'is_custom' ] || (isset($rel [ 'from_studio' ]) && $rel [ 'from_studio' ])) {
-                $relationships->delete ($relationshipName);
+            $rel = $relationships->get($relationshipName)->getDefinition();
+            if ($rel ['is_custom'] || (isset($rel ['from_studio']) && $rel ['from_studio'])) {
+                $relationships->delete($relationshipName);
                 $out .= "Removed relationship $relationshipName<br/>";
             }
         }
         if ($madeChanges)
-           $relationships->save () ;
+           $relationships->save();
         
         return $out;
     }
@@ -223,11 +223,11 @@ 
         if (is_dir($languageDir)) {
             $files = scandir($languageDir);
             foreach ($files as $langFile) {
-                if (substr($langFile, 0 ,1) == '.') continue;
+                if (substr($langFile, 0, 1) == '.') continue;
 				$language = substr($langFile, 0, strlen($langFile) - 9);
-				unlink($languageDir . "/" . $langFile);
+				unlink($languageDir."/".$langFile);
 				
-				LanguageManager::clearLanguageCache ( $this->module, $language ) ;
+				LanguageManager::clearLanguageCache($this->module, $language);
 				$out .= "Removed language file $langFile<br/>";
             }
         }
@@ -241,9 +241,9 @@ 
         $extDir = "custom/Extension/modules/{$this->module}";
         if (is_dir($extDir)) {
         	rmdir_recursive($extDir);
-        	require_once ('modules/Administration/QuickRepairAndRebuild.php') ;
-            $rac = new RepairAndClear ( ) ;
-            $rac->repairAndClearAll ( array ( 'clearAll' ), array ( $this->module ), true, false ) ;
+        	require_once ('modules/Administration/QuickRepairAndRebuild.php');
+            $rac = new RepairAndClear( );
+            $rac->repairAndClearAll(array('clearAll'), array($this->module), true, false);
 			$rac->rebuildExtensions();
         	$out .= "Cleared extensions for {$this->module}<br/>";
         }