adamjakab / SuiteCRM

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

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

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

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)
         {

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

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

modules/ModuleBuilder/views/view.property.php

Indentation +16 added lines, -16 removed lines

@@ -49,16 +49,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(),
+            );
     }
 
 	
@@ -97,12 +97,12 @@ 
                 $this->properties[substr($key,6)]['title'] = $value;
             }
         }
-     }
+        }
 
     function display()
     {
         global $mod_strings;
-    	$ajax = new AjaxCompose();
+        $ajax = new AjaxCompose();
         $smarty = new Sugar_Smarty();
         if (isset($_REQUEST['MB']) && $_REQUEST['MB'] == "1")
         {
@@ -111,11 +111,11 @@ 
         }
 
         $selected_lang = (!empty($_REQUEST['selected_lang'])?$_REQUEST['selected_lang']:$_SESSION['authenticated_user_language']);
-		if(empty($selected_lang)){
-		    $selected_lang = $GLOBALS['sugar_config']['default_language'];
-		}
-		$smarty->assign('available_languages', get_languages());
-		$smarty->assign('selected_lang', $selected_lang);
+        if(empty($selected_lang)){
+            $selected_lang = $GLOBALS['sugar_config']['default_language'];
+        }
+        $smarty->assign('available_languages', get_languages());
+        $smarty->assign('selected_lang', $selected_lang);
 		
         ksort($this->properties);
 

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) {
 		
-	}
+    }
 
 }

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;