adamjakab / SuiteCRM

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

Spacing +24 added lines, -24 removed lines

@@ -51,9 +51,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ViewProperty(){
+    function ViewProperty() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -71,45 +71,45 @@ 
 	    global $mod_strings;
 
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
 
 
-    function init () // pseduo-constuctor - given a well-known name to allow subclasses to call this classes constructor
+    function init() // pseduo-constuctor - given a well-known name to allow subclasses to call this classes constructor
     {
-        $this->editModule = (! empty($_REQUEST['view_module'])) ? $_REQUEST['view_module'] : null;
-        $this->editPackage = (! empty($_REQUEST['view_package'])) ? $_REQUEST['view_package'] : null;
-        $this->id = (! empty($_REQUEST['id'])) ? $_REQUEST['id'] : null;
-        $this->subpanel = (! empty($_REQUEST['subpanel'])) ? $_REQUEST['subpanel'] : "";
+        $this->editModule = (!empty($_REQUEST['view_module'])) ? $_REQUEST['view_module'] : null;
+        $this->editPackage = (!empty($_REQUEST['view_package'])) ? $_REQUEST['view_package'] : null;
+        $this->id = (!empty($_REQUEST['id'])) ? $_REQUEST['id'] : null;
+        $this->subpanel = (!empty($_REQUEST['subpanel'])) ? $_REQUEST['subpanel'] : "";
         $this->properties = array();
-        foreach($_REQUEST as $key=>$value)
+        foreach ($_REQUEST as $key=>$value)
         {
-            if (substr($key,0,4) == 'name')
+            if (substr($key, 0, 4) == 'name')
             {
-                $this->properties[substr($key,5)]['name'] = $value;
+                $this->properties[substr($key, 5)]['name'] = $value;
             }
-            if (substr($key,0,2) == 'id')
+            if (substr($key, 0, 2) == 'id')
             {
-                $this->properties[substr($key,3)]['id'] = $value;
+                $this->properties[substr($key, 3)]['id'] = $value;
             }
-            if (substr($key,0,5) == 'value')
+            if (substr($key, 0, 5) == 'value')
             {
-                $this->properties[substr($key,6)]['value'] = $value;
+                $this->properties[substr($key, 6)]['value'] = $value;
                 // tyoung - now a nasty hack to disable editing of labels which contain Smarty functions - this is envisaged to be a temporary fix to prevent admins modifying these functions then being unable to restore the original complicated value if they regret it
-                if (substr($key,6) == 'label')
+                if (substr($key, 6) == 'label')
                 {
                     //#29796  , we disable the edit function for sub panel label
-                    if (preg_match('/\{.*\}/',$value) || !empty($this->subpanel))
+                    if (preg_match('/\{.*\}/', $value) || !empty($this->subpanel))
                     {
-                        $this->properties[substr($key,6)]['hidden'] = 1;
+                        $this->properties[substr($key, 6)]['hidden'] = 1;
                     }
                 }
             }
-            if (substr($key,0,5) == 'title')
+            if (substr($key, 0, 5) == 'title')
             {
-                $this->properties[substr($key,6)]['title'] = $value;
+                $this->properties[substr($key, 6)]['title'] = $value;
             }
         }
      }
@@ -125,8 +125,8 @@ 
             $smarty->assign("view_package", $_REQUEST['view_package']);
         }
 
-        $selected_lang = (!empty($_REQUEST['selected_lang'])?$_REQUEST['selected_lang']:$_SESSION['authenticated_user_language']);
-		if(empty($selected_lang)){
+        $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());
@@ -134,10 +134,10 @@ 
 
         ksort($this->properties);
 
-        $smarty->assign("properties",$this->properties);
+        $smarty->assign("properties", $this->properties);
 //        $smarty->assign("id",$this->id);
 
-        $smarty->assign("mod_strings",$mod_strings);
+        $smarty->assign("mod_strings", $mod_strings);
         $smarty->assign('APP', $GLOBALS['app_strings']);
         $smarty->assign("view_module", $this->editModule);
         $smarty->assign("subpanel", $this->subpanel);

Braces +4 added lines, -4 removed lines

@@ -55,8 +55,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -141,8 +140,9 @@ 
         $smarty->assign('APP', $GLOBALS['app_strings']);
         $smarty->assign("view_module", $this->editModule);
         $smarty->assign("subpanel", $this->subpanel);
-        if (isset($this->editPackage))
-            $smarty->assign("view_package", $this->editPackage);
+        if (isset($this->editPackage)) {
+                    $smarty->assign("view_package", $this->editPackage);
+        }
 
         $ajax->addSection('east', translate('LBL_SECTION_PROPERTIES', 'ModuleBuilder'), $smarty->fetch('modules/ModuleBuilder/tpls/editProperty.tpl'));
         echo $ajax->getJavascript();

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;

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)
         {
             $file = DeployedMetaDataImplementation::getFileName($view['type'], $this->module);
             if (file_exists($file)) {
@@ -183,8 +183,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;
     }
@@ -196,21 +196,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;
     }
@@ -222,11 +222,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/>";
             }
         }
@@ -240,9 +240,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/>";
         }

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

modules/ModuleBuilder/views/view.package.php

Indentation +99 added lines, -99 removed lines

@@ -41,127 +41,127 @@
 require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
 class Viewpackage 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 $mod_strings;
- 		$smarty = new Sugar_Smarty();
- 		$mb = new ModuleBuilder();
- 		//if (!empty($_REQUEST['package'])) {
- 		if (empty($_REQUEST['package']) && empty($_REQUEST['new'])) {
- 			$this->generatePackageButtons($mb->getPackageList());
+    function display()
+    {
+            global $mod_strings;
+            $smarty = new Sugar_Smarty();
+            $mb = new ModuleBuilder();
+            //if (!empty($_REQUEST['package'])) {
+            if (empty($_REQUEST['package']) && empty($_REQUEST['new'])) {
+                $this->generatePackageButtons($mb->getPackageList());
 
- 			$smarty->assign('buttons', $this->buttons);
- 			$smarty->assign('title', $GLOBALS['mod_strings']['LBL_MODULEBUILDER']);
- 			$smarty->assign("question", $GLOBALS['mod_strings']['LBL_QUESTION_PACKAGE']);
- 			$smarty->assign("defaultHelp", "mbHelp");
+                $smarty->assign('buttons', $this->buttons);
+                $smarty->assign('title', $GLOBALS['mod_strings']['LBL_MODULEBUILDER']);
+                $smarty->assign("question", $GLOBALS['mod_strings']['LBL_QUESTION_PACKAGE']);
+                $smarty->assign("defaultHelp", "mbHelp");
 
- 			$ajax = new AjaxCompose();
- 			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'],'');
- 			$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
-			echo $ajax->getJavascript();
- 		}
- 		else {
+                $ajax = new AjaxCompose();
+                $ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
+            $ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'],'');
+                $ajax->addSection('center', $GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
+            echo $ajax->getJavascript();
+            }
+            else {
  			
- 			$name = (!empty($_REQUEST['package']))?$_REQUEST['package']:'';
-			$mb->getPackage($name);
+                $name = (!empty($_REQUEST['package']))?$_REQUEST['package']:'';
+            $mb->getPackage($name);
 			
             require_once ('modules/ModuleBuilder/MB/MBPackageTree.php') ;
             $mbt = new MBPackageTree();
             $nodes = $mbt->fetchNodes();
             
-			$package_labels = array();
-			if(!empty($nodes['tree_data']['nodes']))
-			{
-				foreach($nodes['tree_data']['nodes'] as $entry) 
-				{
-					if(!empty($entry['data']['label']) && $name != $entry['data']['label'])
-					{
-						$package_labels[] = strtoupper($entry['data']['label']);
-					}
-				}
-			}
+            $package_labels = array();
+            if(!empty($nodes['tree_data']['nodes']))
+            {
+                foreach($nodes['tree_data']['nodes'] as $entry) 
+                {
+                    if(!empty($entry['data']['label']) && $name != $entry['data']['label'])
+                    {
+                        $package_labels[] = strtoupper($entry['data']['label']);
+                    }
+                }
+            }
 			
-			$json = getJSONobj();
-			$smarty->assign('package_labels', $json->encode($package_labels));            	
+            $json = getJSONobj();
+            $smarty->assign('package_labels', $json->encode($package_labels));            	
 			
-	 		$this->package =& $mb->packages[$name];
-	 		$this->loadModuleTypes();
-	 		$this->loadPackageHelp($name);
-	 		$this->package->date_modified = $GLOBALS['timedate']->to_display_date_time($this->package->date_modified);
-	 		$smarty->assign('package', $this->package);
-			$smarty->assign('mod_strings',$mod_strings);
-	 		$smarty->assign('package_already_deployed', 'false');
+                $this->package =& $mb->packages[$name];
+                $this->loadModuleTypes();
+                $this->loadPackageHelp($name);
+                $this->package->date_modified = $GLOBALS['timedate']->to_display_date_time($this->package->date_modified);
+                $smarty->assign('package', $this->package);
+            $smarty->assign('mod_strings',$mod_strings);
+                $smarty->assign('package_already_deployed', 'false');
             foreach($this->package->modules as $a_module){
                 if(in_array($a_module->key_name, $GLOBALS['moduleList'])){
-	 		        $smarty->assign('package_already_deployed', 'true');
+                        $smarty->assign('package_already_deployed', 'true');
                     break;
                 }
             }
 
-	 		$ajax = new AjaxCompose();
-	 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			if(empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
-	 		$ajax->addCrumb($name,'');
-	 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
-	 		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage')
-	 			$html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
-	 		$ajax->addSection('center', translate('LBL_SECTION_PACKAGE', 'ModuleBuilder'), $html);
-			echo $ajax->getJavascript();
- 		}
- 	}
+                $ajax = new AjaxCompose();
+                $ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
+            if(empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
+                $ajax->addCrumb($name,'');
+                $html=$smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
+                if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage')
+                    $html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+                $ajax->addSection('center', translate('LBL_SECTION_PACKAGE', 'ModuleBuilder'), $html);
+            echo $ajax->getJavascript();
+            }
+        }
 
- 	function loadModuleTypes()
- 	{
- 		$this->package->moduleTypes = array();
- 		$this->package->loadModules();
- 		foreach(array_keys($this->package->modules) as $name){
- 			foreach($this->package->modules[$name]->config['templates'] as $template=>$var){
+        function loadModuleTypes()
+        {
+            $this->package->moduleTypes = array();
+            $this->package->loadModules();
+            foreach(array_keys($this->package->modules) as $name){
+                foreach($this->package->modules[$name]->config['templates'] as $template=>$var){
 
- 					$this->package->moduleTypes[$name] = $template;
+                        $this->package->moduleTypes[$name] = $template;
 
- 			}
- 		}
- 	}
- 	function loadPackageHelp(
- 	    $name
- 	    )
- 	{
- 			$this->package->help['default'] = (empty($name))?'create':'modify';
- 			$this->package->help['group'] = 'package';
- 	}
+                }
+            }
+        }
+        function loadPackageHelp(
+            $name
+            )
+        {
+                $this->package->help['default'] = (empty($name))?'create':'modify';
+                $this->package->help['group'] = 'package';
+        }
 
- 	function generatePackageButtons(
- 	    $packages
- 	    )
- 	{
- 		global $mod_strings;
- 		$this->buttons[$mod_strings['LBL_NEW_PACKAGE']] = array(
- 										'action' => "module=ModuleBuilder&action=package&new=1",
- 										'imageTitle' => 'package_create',
- 										'size' => '64',
-										'help' => 'newPackage',
+        function generatePackageButtons(
+            $packages
+            )
+        {
+            global $mod_strings;
+            $this->buttons[$mod_strings['LBL_NEW_PACKAGE']] = array(
+                                            'action' => "module=ModuleBuilder&action=package&new=1",
+                                            'imageTitle' => 'package_create',
+                                            'size' => '64',
+                                        'help' => 'newPackage',
                                         'linkId' => 'newPackageLink'
- 										);
- 		foreach($packages as $package) {
- 			$this->buttons[$package] = array(
- 										'action' =>"module=ModuleBuilder&action=package&package={$package}",
-										'imageTitle' => 'package',
-										'size' => '64',
- 										);
- 		}
- 	}
+                                            );
+            foreach($packages as $package) {
+                $this->buttons[$package] = array(
+                                            'action' =>"module=ModuleBuilder&action=package&package={$package}",
+                                        'imageTitle' => 'package',
+                                        'size' => '64',
+                                            );
+            }
+        }
 }
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -49,7 +49,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -70,25 +70,25 @@ 
 
  			$ajax = new AjaxCompose();
  			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'],'');
+			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], '');
  			$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
 			echo $ajax->getJavascript();
  		}
  		else {
  			
- 			$name = (!empty($_REQUEST['package']))?$_REQUEST['package']:'';
+ 			$name = (!empty($_REQUEST['package'])) ? $_REQUEST['package'] : '';
 			$mb->getPackage($name);
 			
-            require_once ('modules/ModuleBuilder/MB/MBPackageTree.php') ;
+            require_once ('modules/ModuleBuilder/MB/MBPackageTree.php');
             $mbt = new MBPackageTree();
             $nodes = $mbt->fetchNodes();
             
 			$package_labels = array();
-			if(!empty($nodes['tree_data']['nodes']))
+			if (!empty($nodes['tree_data']['nodes']))
 			{
-				foreach($nodes['tree_data']['nodes'] as $entry) 
+				foreach ($nodes['tree_data']['nodes'] as $entry) 
 				{
-					if(!empty($entry['data']['label']) && $name != $entry['data']['label'])
+					if (!empty($entry['data']['label']) && $name != $entry['data']['label'])
 					{
 						$package_labels[] = strtoupper($entry['data']['label']);
 					}
@@ -98,15 +98,15 @@ 
 			$json = getJSONobj();
 			$smarty->assign('package_labels', $json->encode($package_labels));            	
 			
-	 		$this->package =& $mb->packages[$name];
+	 		$this->package = & $mb->packages[$name];
 	 		$this->loadModuleTypes();
 	 		$this->loadPackageHelp($name);
 	 		$this->package->date_modified = $GLOBALS['timedate']->to_display_date_time($this->package->date_modified);
 	 		$smarty->assign('package', $this->package);
-			$smarty->assign('mod_strings',$mod_strings);
+			$smarty->assign('mod_strings', $mod_strings);
 	 		$smarty->assign('package_already_deployed', 'false');
-            foreach($this->package->modules as $a_module){
-                if(in_array($a_module->key_name, $GLOBALS['moduleList'])){
+            foreach ($this->package->modules as $a_module) {
+                if (in_array($a_module->key_name, $GLOBALS['moduleList'])) {
 	 		        $smarty->assign('package_already_deployed', 'true');
                     break;
                 }
@@ -114,11 +114,11 @@ 
 
 	 		$ajax = new AjaxCompose();
 	 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			if(empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
-	 		$ajax->addCrumb($name,'');
-	 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
-	 		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage')
-	 			$html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+			if (empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
+	 		$ajax->addCrumb($name, '');
+	 		$html = $smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
+	 		if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'SavePackage')
+	 			$html .= "<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
 	 		$ajax->addSection('center', translate('LBL_SECTION_PACKAGE', 'ModuleBuilder'), $html);
 			echo $ajax->getJavascript();
  		}
@@ -128,8 +128,8 @@ 
  	{
  		$this->package->moduleTypes = array();
  		$this->package->loadModules();
- 		foreach(array_keys($this->package->modules) as $name){
- 			foreach($this->package->modules[$name]->config['templates'] as $template=>$var){
+ 		foreach (array_keys($this->package->modules) as $name) {
+ 			foreach ($this->package->modules[$name]->config['templates'] as $template=>$var) {
 
  					$this->package->moduleTypes[$name] = $template;
 
@@ -140,7 +140,7 @@ 
  	    $name
  	    )
  	{
- 			$this->package->help['default'] = (empty($name))?'create':'modify';
+ 			$this->package->help['default'] = (empty($name)) ? 'create' : 'modify';
  			$this->package->help['group'] = 'package';
  	}
 
@@ -156,7 +156,7 @@ 
 										'help' => 'newPackage',
                                         'linkId' => 'newPackageLink'
  										);
- 		foreach($packages as $package) {
+ 		foreach ($packages as $package) {
  			$this->buttons[$package] = array(
  										'action' =>"module=ModuleBuilder&action=package&package={$package}",
 										'imageTitle' => 'package',

Braces +7 added lines, -5 removed lines

@@ -73,8 +73,7 @@ 
 			$ajax->addCrumb($GLOBALS['mod_strings']['LBL_PACKAGE_LIST'],'');
  			$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_PACKAGE_LIST'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
 			echo $ajax->getJavascript();
- 		}
- 		else {
+ 		} else {
  			
  			$name = (!empty($_REQUEST['package']))?$_REQUEST['package']:'';
 			$mb->getPackage($name);
@@ -114,11 +113,14 @@ 
 
 	 		$ajax = new AjaxCompose();
 	 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package")');
-			if(empty($name))$name = $mod_strings['LBL_NEW_PACKAGE'];
+			if(empty($name)) {
+			    $name = $mod_strings['LBL_NEW_PACKAGE'];
+			}
 	 		$ajax->addCrumb($name,'');
 	 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBPackage/package.tpl');
-	 		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage')
-	 			$html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+	 		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SavePackage') {
+	 			 			$html.="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+	 		}
 	 		$ajax->addSection('center', translate('LBL_SECTION_PACKAGE', 'ModuleBuilder'), $html);
 			echo $ajax->getJavascript();
  		}

modules/ModuleBuilder/views/view.wizard.php

Indentation +285 added lines, -285 removed lines

@@ -43,301 +43,301 @@
 
 class ModuleBuilderViewWizard extends SugarView
 {
-	private $view = null ; // the wizard view to display
-	private $actions ;
-	private $buttons ;
-	private $question ;
-	private $title ;
-	private $help ;
-
-	private $editModule ;
-
-	function __construct()
-	{
-		if ( isset ( $_REQUEST [ 'view' ] ) )
-			$this->view = $_REQUEST [ 'view' ] ;
-
-		$this->editModule = (! empty ( $_REQUEST [ 'view_module' ] ) ) ? $_REQUEST [ 'view_module' ] : null ;
-		$this->buttons = array(); // initialize so that modules without subpanels for example don't result in this being unset and causing problems in the smarty->assign
-	}
+    private $view = null ; // the wizard view to display
+    private $actions ;
+    private $buttons ;
+    private $question ;
+    private $title ;
+    private $help ;
+
+    private $editModule ;
+
+    function __construct()
+    {
+        if ( isset ( $_REQUEST [ 'view' ] ) )
+            $this->view = $_REQUEST [ 'view' ] ;
+
+        $this->editModule = (! empty ( $_REQUEST [ 'view_module' ] ) ) ? $_REQUEST [ 'view_module' ] : null ;
+        $this->buttons = array(); // initialize so that modules without subpanels for example don't result in this being unset and causing problems in the smarty->assign
+    }
 	
-	/**
-	 * @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()
+    {
+        $this->ajax = new AjaxCompose ( ) ;
+        $smarty = new Sugar_Smarty ( ) ;
+
+        if (isset ( $_REQUEST [ 'MB' ] ))
+        {
+            $this->processMB ( $this->ajax ) ;
+        } else
+        {
+
+                $this->processStudio ( $this->ajax ) ;
+
+        }
+
+        $smarty->assign ( 'buttons', $this->buttons ) ;
+        $smarty->assign ( 'image_path', $GLOBALS [ 'image_path' ] ) ;
+        $smarty->assign ( "title", $this->title ) ;
+        $smarty->assign ( "question", $this->question ) ;
+        $smarty->assign ( "defaultHelp", $this->help ) ;
+        $smarty->assign ( "actions", $this->actions ) ;
+
+        $this->ajax->addSection ( 'center', $this->title, $smarty->fetch ( 'modules/ModuleBuilder/tpls/wizard.tpl' ) ) ;
+        echo $this->ajax->getJavascript () ;
     }
 
-	function display()
-	{
-		$this->ajax = new AjaxCompose ( ) ;
-		$smarty = new Sugar_Smarty ( ) ;
-
-		if (isset ( $_REQUEST [ 'MB' ] ))
-		{
-			$this->processMB ( $this->ajax ) ;
-		} else
-		{
-
-				$this->processStudio ( $this->ajax ) ;
-
-		}
-
-		$smarty->assign ( 'buttons', $this->buttons ) ;
-		$smarty->assign ( 'image_path', $GLOBALS [ 'image_path' ] ) ;
-		$smarty->assign ( "title", $this->title ) ;
-		$smarty->assign ( "question", $this->question ) ;
-		$smarty->assign ( "defaultHelp", $this->help ) ;
-		$smarty->assign ( "actions", $this->actions ) ;
-
-		$this->ajax->addSection ( 'center', $this->title, $smarty->fetch ( 'modules/ModuleBuilder/tpls/wizard.tpl' ) ) ;
-		echo $this->ajax->getJavascript () ;
-	}
-
-	function processStudio( 
-	    $ajax
-	    )
-	{
-
-		$this->ajax->addCrumb ( translate( 'LBL_STUDIO' ), 'ModuleBuilder.main("studio")' ) ;
-
-		if (! isset ( $this->editModule ))
-		{
-			//Studio Select Module Page
-			$this->generateStudioModuleButtons () ;
-			$this->question = translate('LBL_QUESTION_EDIT') ;
-			$this->title = translate( 'LBL_STUDIO' );
-			global $current_user;
-			if (is_admin($current_user))
-				$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
-
-			$this->help = 'studioHelp' ;
-		} else
-		{
-			$module = StudioModuleFactory::getStudioModule( $this->editModule ) ;
-			$this->ajax->addCrumb ( $module->name, !empty($this->view) ? 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' : '' ) ;
-			switch ( $this->view )
-			{
-				case 'layouts':
-					//Studio Select Layout page
-					$this->buttons = $module->getLayouts() ;
-					$this->title = $module->name . " " . translate('LBL_LAYOUTS') ;
-					$this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
-					$this->help = 'layoutsHelp' ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
-					break;
-
-
-				case 'subpanels':
-					//Studio Select Subpanel page.
-					$this->buttons = $module->getSubpanels() ;
-					$this->title = $module->name . " " . translate( 'LBL_SUBPANELS' ) ;
-					$this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
-					$this->help = 'subpanelHelp' ;
-					break;
-
-				case 'search':
-					//Studio Select Search Layout page.
-					$this->buttons = $module->getSearch() ;
-					$this->title = $module->name . " " . translate('LBL_SEARCH');
-					$this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_SEARCH' ), '' ) ;
-					$this->help = 'searchHelp' ;
-					break;
-
-				case 'dashlet':
-					$this->generateStudioDashletButtons();
-					$this->title = $this->editModule ." " .translate('LBL_DASHLET');
-					$this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
-					$this->help = 'dashletHelp' ;
-					break;
+    function processStudio( 
+        $ajax
+        )
+    {
+
+        $this->ajax->addCrumb ( translate( 'LBL_STUDIO' ), 'ModuleBuilder.main("studio")' ) ;
+
+        if (! isset ( $this->editModule ))
+        {
+            //Studio Select Module Page
+            $this->generateStudioModuleButtons () ;
+            $this->question = translate('LBL_QUESTION_EDIT') ;
+            $this->title = translate( 'LBL_STUDIO' );
+            global $current_user;
+            if (is_admin($current_user))
+                $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
+
+            $this->help = 'studioHelp' ;
+        } else
+        {
+            $module = StudioModuleFactory::getStudioModule( $this->editModule ) ;
+            $this->ajax->addCrumb ( $module->name, !empty($this->view) ? 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' : '' ) ;
+            switch ( $this->view )
+            {
+                case 'layouts':
+                    //Studio Select Layout page
+                    $this->buttons = $module->getLayouts() ;
+                    $this->title = $module->name . " " . translate('LBL_LAYOUTS') ;
+                    $this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
+                    $this->help = 'layoutsHelp' ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
+                    break;
+
+
+                case 'subpanels':
+                    //Studio Select Subpanel page.
+                    $this->buttons = $module->getSubpanels() ;
+                    $this->title = $module->name . " " . translate( 'LBL_SUBPANELS' ) ;
+                    $this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
+                    $this->help = 'subpanelHelp' ;
+                    break;
+
+                case 'search':
+                    //Studio Select Search Layout page.
+                    $this->buttons = $module->getSearch() ;
+                    $this->title = $module->name . " " . translate('LBL_SEARCH');
+                    $this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_SEARCH' ), '' ) ;
+                    $this->help = 'searchHelp' ;
+                    break;
+
+                case 'dashlet':
+                    $this->generateStudioDashletButtons();
+                    $this->title = $this->editModule ." " .translate('LBL_DASHLET');
+                    $this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
+                    $this->help = 'dashletHelp' ;
+                    break;
 				
-				case 'popup':
-					$this->generateStudioPopupButtons();
-					$this->title = $this->editModule ." " .translate('LBL_POPUP');
-					$this->question = translate( 'LBL_QUESTION_POPUP' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
-					$this->help = 'popupHelp' ;
-					break;
-				default:
-					//Studio Edit Module Page
-					$this->buttons = $module->getModule () ;
-					$this->question = translate( 'LBL_QUESTION_MODULE' ) ;
-					$this->title = translate( 'LBL_EDIT' ) . " " . $module->name ;
-					$this->help = 'moduleHelp' ;
-					global $current_user;
-					if (is_admin($current_user))
+                case 'popup':
+                    $this->generateStudioPopupButtons();
+                    $this->title = $this->editModule ." " .translate('LBL_POPUP');
+                    $this->question = translate( 'LBL_QUESTION_POPUP' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
+                    $this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
+                    $this->help = 'popupHelp' ;
+                    break;
+                default:
+                    //Studio Edit Module Page
+                    $this->buttons = $module->getModule () ;
+                    $this->question = translate( 'LBL_QUESTION_MODULE' ) ;
+                    $this->title = translate( 'LBL_EDIT' ) . " " . $module->name ;
+                    $this->help = 'moduleHelp' ;
+                    global $current_user;
+                    if (is_admin($current_user))
                         $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" " 
                         . "onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=resetmodule&view_module=$this->editModule');\" value=\"" 
                         . translate( 'LBL_RESET_MODULE' ) . '">' ;
-			}
-		}
-	}
-
-	function processMB ( 
-	    $ajax 
-	    )
-	{
-		if (! isset ( $_REQUEST [ 'view_package' ] ))
-		{
-			sugar_die ( "no ModuleBuilder package set" ) ;
-		}
-
-		$this->editModule = $_REQUEST [ 'view_module' ] ;
-		$this->package = $_REQUEST [ 'view_package' ] ;
-
-		$ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
-		$ajax->addCrumb ( $this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&view_package=' . $this->package . '")' ) ;
-		$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")') ;
-
-		switch ( $this->view )
-		{
-			case 'search':
-				//MB Select Search Layout page.
-				$this->generateMBSearchButtons () ;
-				$this->title = $this->editModule . " " . translate( 'LBL_SEARCH' ) ;
-				$this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
-				$ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-				$ajax->addCrumb ( translate( 'LBL_SEARCH_FORMS' ), '' ) ;
-				$this->help = "searchHelp" ;
-				break;
-
-			case 'subpanel':
-				//ModuleBuilder Select Subpanel
-				$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-				$ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
-				$this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
-				$this->help = 'subpanelHelp' ;
-				break;
-
-			case 'dashlet':
-				$this->generateMBDashletButtons ();
-				$this->title = $this->editModule ." " .translate('LBL_DASHLET');
-				$this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
-				$this->help = 'dashletHelp' ;
-				break;
-
-
-			case 'popup':
-				$this->generateMBPopupButtons();
-				$this->title = $this->editModule ." " .translate('LBL_POPUP');
-				$this->question = translate( 'LBL_QUESTION_POPUP' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
-				$this->help = 'popupHelp' ;
-				break;
-			default:
-				$ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
-				$this->generateMBViewButtons () ;
-				$this->title = $this->editModule . " " . translate( 'LBL_LAYOUTS' ) ;
-				$this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
-				$this->help = "layoutsHelp" ;
-		}
-	}
-
-
-	function generateStudioModuleButtons()
-	{
-		require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
-		$sb = new StudioBrowser ( ) ;
-		$sb->loadModules () ;
-		$nodes = $sb->getNodes () ;
-		$this->buttons = array ( ) ;
-		//$GLOBALS['log']->debug(print_r($nodes,true));
-		foreach ( $nodes as $module )
-		{
-			$this->buttons [ $module [ 'name' ] ] = array ( 'action' => $module [ 'action' ] , 'imageTitle' => ucfirst ( $module [ 'module' ] . "_32" ) , 'size' => '32', 'linkId' => 'studiolink_'.$module [ 'module' ] ) ;
-		}
-	}
-
-
-
-	function generateMBViewButtons()
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_EDITVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_EDITVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'EditView', 
-		      'help'=>'viewBtnEditView'
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DETAILVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_DETAILVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'DetailView', 
-		      'help'=>'viewBtnListView'  
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_LISTVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'ListView', 
-		      'help'=>'viewBtnListView' 
-		  ) ;
-		  $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_QUICKCREATE' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_QUICKCREATE."&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'QuickCreate', 
-		      'help'=>'viewBtnQuickCreate' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_SEARCH' ] ] = 
-		  array (
-		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=search&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'SearchForm' , 
-		      'help'=> 'searchBtn' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DASHLET' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=dashlet&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'Dashlet', 
-		      'help'=>'viewBtnDashlet' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] ['LBL_POPUP'] ] = 
-		array ( 
-			'imageTitle' => 'Popup',  
-			'action' => "module=ModuleBuilder&MB=true&action=wizard&view=popup&view_module={$this->editModule}&view_package={$this->package}", 
-			'help'=>'PopupListViewBtn'
-		);  
-	}
-
-	function generateMBDashletButtons() 
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashlet&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashletsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
-	}
+            }
+        }
+    }
+
+    function processMB ( 
+        $ajax 
+        )
+    {
+        if (! isset ( $_REQUEST [ 'view_package' ] ))
+        {
+            sugar_die ( "no ModuleBuilder package set" ) ;
+        }
+
+        $this->editModule = $_REQUEST [ 'view_module' ] ;
+        $this->package = $_REQUEST [ 'view_package' ] ;
+
+        $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
+        $ajax->addCrumb ( $this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&view_package=' . $this->package . '")' ) ;
+        $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")') ;
+
+        switch ( $this->view )
+        {
+            case 'search':
+                //MB Select Search Layout page.
+                $this->generateMBSearchButtons () ;
+                $this->title = $this->editModule . " " . translate( 'LBL_SEARCH' ) ;
+                $this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
+                $ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
+                $ajax->addCrumb ( translate( 'LBL_SEARCH_FORMS' ), '' ) ;
+                $this->help = "searchHelp" ;
+                break;
+
+            case 'subpanel':
+                //ModuleBuilder Select Subpanel
+                $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
+                $ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
+                $this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
+                $this->help = 'subpanelHelp' ;
+                break;
+
+            case 'dashlet':
+                $this->generateMBDashletButtons ();
+                $this->title = $this->editModule ." " .translate('LBL_DASHLET');
+                $this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
+                $this->help = 'dashletHelp' ;
+                break;
+
+
+            case 'popup':
+                $this->generateMBPopupButtons();
+                $this->title = $this->editModule ." " .translate('LBL_POPUP');
+                $this->question = translate( 'LBL_QUESTION_POPUP' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
+                $this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
+                $this->help = 'popupHelp' ;
+                break;
+            default:
+                $ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
+                $this->generateMBViewButtons () ;
+                $this->title = $this->editModule . " " . translate( 'LBL_LAYOUTS' ) ;
+                $this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
+                $this->help = "layoutsHelp" ;
+        }
+    }
+
+
+    function generateStudioModuleButtons()
+    {
+        require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
+        $sb = new StudioBrowser ( ) ;
+        $sb->loadModules () ;
+        $nodes = $sb->getNodes () ;
+        $this->buttons = array ( ) ;
+        //$GLOBALS['log']->debug(print_r($nodes,true));
+        foreach ( $nodes as $module )
+        {
+            $this->buttons [ $module [ 'name' ] ] = array ( 'action' => $module [ 'action' ] , 'imageTitle' => ucfirst ( $module [ 'module' ] . "_32" ) , 'size' => '32', 'linkId' => 'studiolink_'.$module [ 'module' ] ) ;
+        }
+    }
+
+
+
+    function generateMBViewButtons()
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_EDITVIEW' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_EDITVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'EditView', 
+                'help'=>'viewBtnEditView'
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DETAILVIEW' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_DETAILVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'DetailView', 
+                'help'=>'viewBtnListView'  
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_LISTVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'ListView', 
+                'help'=>'viewBtnListView' 
+            ) ;
+            $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_QUICKCREATE' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_QUICKCREATE."&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'QuickCreate', 
+                'help'=>'viewBtnQuickCreate' 
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_SEARCH' ] ] = 
+            array (
+                'action' => "module=ModuleBuilder&MB=true&action=wizard&view=search&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'SearchForm' , 
+                'help'=> 'searchBtn' 
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DASHLET' ] ] = 
+            array ( 
+                'action' => "module=ModuleBuilder&MB=true&action=wizard&view=dashlet&view_module={$this->editModule}&view_package={$this->package}" , 
+                'imageTitle' => 'Dashlet', 
+                'help'=>'viewBtnDashlet' 
+            ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] ['LBL_POPUP'] ] = 
+        array ( 
+            'imageTitle' => 'Popup',  
+            'action' => "module=ModuleBuilder&MB=true&action=wizard&view=popup&view_module={$this->editModule}&view_package={$this->package}", 
+            'help'=>'PopupListViewBtn'
+        );  
+    }
+
+    function generateMBDashletButtons() 
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashlet&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashletsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
+    }
 	
-	function generateMBPopupButtons() 
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
-	}
+    function generateMBPopupButtons() 
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
+    }
 	
-	function generateStudioDashletButtons() 
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashlet&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashletsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
-	}
+    function generateStudioDashletButtons() 
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashlet&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashletsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
+    }
 	
-	function generateStudioPopupButtons()
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
-	}
+    function generateStudioPopupButtons()
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
+        $this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
+    }
 	
-	function generateMBSearchButtons()
-	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=basic_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC_SEARCH' ] , 'imageName' => 'BasicSearch','help' => "BasicSearchBtn" ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=advanced_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED_SEARCH' ] , 'imageName' => 'AdvancedSearch','help' => "AdvancedSearchBtn" ) ;
-	}
+    function generateMBSearchButtons()
+    {
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=basic_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC_SEARCH' ] , 'imageName' => 'BasicSearch','help' => "BasicSearchBtn" ) ;
+        $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=advanced_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED_SEARCH' ] , 'imageName' => 'AdvancedSearch','help' => "AdvancedSearchBtn" ) ;
+    }
 }

Spacing +147 added lines, -147 removed lines

@@ -37,27 +37,27 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-require_once ('modules/ModuleBuilder/Module/StudioModuleFactory.php') ;
-require_once ('include/MVC/View/SugarView.php') ;
+require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+require_once ('modules/ModuleBuilder/Module/StudioModuleFactory.php');
+require_once ('include/MVC/View/SugarView.php');
 
 class ModuleBuilderViewWizard extends SugarView
 {
-	private $view = null ; // the wizard view to display
-	private $actions ;
-	private $buttons ;
-	private $question ;
-	private $title ;
-	private $help ;
+	private $view = null; // the wizard view to display
+	private $actions;
+	private $buttons;
+	private $question;
+	private $title;
+	private $help;
 
-	private $editModule ;
+	private $editModule;
 
 	function __construct()
 	{
-		if ( isset ( $_REQUEST [ 'view' ] ) )
-			$this->view = $_REQUEST [ 'view' ] ;
+		if (isset ($_REQUEST ['view']))
+			$this->view = $_REQUEST ['view'];
 
-		$this->editModule = (! empty ( $_REQUEST [ 'view_module' ] ) ) ? $_REQUEST [ 'view_module' ] : null ;
+		$this->editModule = (!empty ($_REQUEST ['view_module'])) ? $_REQUEST ['view_module'] : null;
 		$this->buttons = array(); // initialize so that modules without subpanels for example don't result in this being unset and causing problems in the smarty->assign
 	}
 	
@@ -69,35 +69,35 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
 
 	function display()
 	{
-		$this->ajax = new AjaxCompose ( ) ;
-		$smarty = new Sugar_Smarty ( ) ;
+		$this->ajax = new AjaxCompose( );
+		$smarty = new Sugar_Smarty( );
 
-		if (isset ( $_REQUEST [ 'MB' ] ))
+		if (isset ($_REQUEST ['MB']))
 		{
-			$this->processMB ( $this->ajax ) ;
+			$this->processMB($this->ajax);
 		} else
 		{
 
-				$this->processStudio ( $this->ajax ) ;
+				$this->processStudio($this->ajax);
 
 		}
 
-		$smarty->assign ( 'buttons', $this->buttons ) ;
-		$smarty->assign ( 'image_path', $GLOBALS [ 'image_path' ] ) ;
-		$smarty->assign ( "title", $this->title ) ;
-		$smarty->assign ( "question", $this->question ) ;
-		$smarty->assign ( "defaultHelp", $this->help ) ;
-		$smarty->assign ( "actions", $this->actions ) ;
+		$smarty->assign('buttons', $this->buttons);
+		$smarty->assign('image_path', $GLOBALS ['image_path']);
+		$smarty->assign("title", $this->title);
+		$smarty->assign("question", $this->question);
+		$smarty->assign("defaultHelp", $this->help);
+		$smarty->assign("actions", $this->actions);
 
-		$this->ajax->addSection ( 'center', $this->title, $smarty->fetch ( 'modules/ModuleBuilder/tpls/wizard.tpl' ) ) ;
-		echo $this->ajax->getJavascript () ;
+		$this->ajax->addSection('center', $this->title, $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
+		echo $this->ajax->getJavascript();
 	}
 
 	function processStudio( 
@@ -105,161 +105,161 @@ 
 	    )
 	{
 
-		$this->ajax->addCrumb ( translate( 'LBL_STUDIO' ), 'ModuleBuilder.main("studio")' ) ;
+		$this->ajax->addCrumb(translate('LBL_STUDIO'), 'ModuleBuilder.main("studio")');
 
-		if (! isset ( $this->editModule ))
+		if (!isset ($this->editModule))
 		{
 			//Studio Select Module Page
-			$this->generateStudioModuleButtons () ;
-			$this->question = translate('LBL_QUESTION_EDIT') ;
-			$this->title = translate( 'LBL_STUDIO' );
+			$this->generateStudioModuleButtons();
+			$this->question = translate('LBL_QUESTION_EDIT');
+			$this->title = translate('LBL_STUDIO');
 			global $current_user;
 			if (is_admin($current_user))
-				$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
+				$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"".translate('LBL_BTN_EXPORT').'">';
 
-			$this->help = 'studioHelp' ;
+			$this->help = 'studioHelp';
 		} else
 		{
-			$module = StudioModuleFactory::getStudioModule( $this->editModule ) ;
-			$this->ajax->addCrumb ( $module->name, !empty($this->view) ? 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' : '' ) ;
-			switch ( $this->view )
+			$module = StudioModuleFactory::getStudioModule($this->editModule);
+			$this->ajax->addCrumb($module->name, !empty($this->view) ? 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$this->editModule.'")' : '');
+			switch ($this->view)
 			{
 				case 'layouts':
 					//Studio Select Layout page
-					$this->buttons = $module->getLayouts() ;
-					$this->title = $module->name . " " . translate('LBL_LAYOUTS') ;
-					$this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
-					$this->help = 'layoutsHelp' ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
+					$this->buttons = $module->getLayouts();
+					$this->title = $module->name." ".translate('LBL_LAYOUTS');
+					$this->question = translate('LBL_QUESTION_LAYOUT');
+					$this->help = 'layoutsHelp';
+					$this->ajax->addCrumb(translate('LBL_LAYOUTS'), '');
 					break;
 
 
 				case 'subpanels':
 					//Studio Select Subpanel page.
-					$this->buttons = $module->getSubpanels() ;
-					$this->title = $module->name . " " . translate( 'LBL_SUBPANELS' ) ;
-					$this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
-					$this->help = 'subpanelHelp' ;
+					$this->buttons = $module->getSubpanels();
+					$this->title = $module->name." ".translate('LBL_SUBPANELS');
+					$this->question = translate('LBL_QUESTION_SUBPANEL');
+					$this->ajax->addCrumb(translate('LBL_SUBPANELS'), '');
+					$this->help = 'subpanelHelp';
 					break;
 
 				case 'search':
 					//Studio Select Search Layout page.
-					$this->buttons = $module->getSearch() ;
-					$this->title = $module->name . " " . translate('LBL_SEARCH');
-					$this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_SEARCH' ), '' ) ;
-					$this->help = 'searchHelp' ;
+					$this->buttons = $module->getSearch();
+					$this->title = $module->name." ".translate('LBL_SEARCH');
+					$this->question = translate('LBL_QUESTION_SEARCH');
+					$this->ajax->addCrumb(translate('LBL_LAYOUTS'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module='.$this->editModule.'")');
+					$this->ajax->addCrumb(translate('LBL_SEARCH'), '');
+					$this->help = 'searchHelp';
 					break;
 
 				case 'dashlet':
 					$this->generateStudioDashletButtons();
-					$this->title = $this->editModule ." " .translate('LBL_DASHLET');
-					$this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
-					$this->help = 'dashletHelp' ;
+					$this->title = $this->editModule." ".translate('LBL_DASHLET');
+					$this->question = translate('LBL_QUESTION_DASHLET');
+					$this->ajax->addCrumb(translate('LBL_LAYOUTS'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module='.$this->editModule.'")');
+					$this->ajax->addCrumb(translate('LBL_DASHLET'), '');
+					$this->help = 'dashletHelp';
 					break;
 				
 				case 'popup':
 					$this->generateStudioPopupButtons();
-					$this->title = $this->editModule ." " .translate('LBL_POPUP');
-					$this->question = translate( 'LBL_QUESTION_POPUP' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module=' . $this->editModule . '")' ) ;
-					$this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
-					$this->help = 'popupHelp' ;
+					$this->title = $this->editModule." ".translate('LBL_POPUP');
+					$this->question = translate('LBL_QUESTION_POPUP');
+					$this->ajax->addCrumb(translate('LBL_LAYOUTS'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&view_module='.$this->editModule.'")');
+					$this->ajax->addCrumb(translate('LBL_POPUP'), '');
+					$this->help = 'popupHelp';
 					break;
 				default:
 					//Studio Edit Module Page
-					$this->buttons = $module->getModule () ;
-					$this->question = translate( 'LBL_QUESTION_MODULE' ) ;
-					$this->title = translate( 'LBL_EDIT' ) . " " . $module->name ;
-					$this->help = 'moduleHelp' ;
+					$this->buttons = $module->getModule();
+					$this->question = translate('LBL_QUESTION_MODULE');
+					$this->title = translate('LBL_EDIT')." ".$module->name;
+					$this->help = 'moduleHelp';
 					global $current_user;
 					if (is_admin($current_user))
                         $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" " 
                         . "onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=resetmodule&view_module=$this->editModule');\" value=\"" 
-                        . translate( 'LBL_RESET_MODULE' ) . '">' ;
+                        . translate('LBL_RESET_MODULE').'">';
 			}
 		}
 	}
 
-	function processMB ( 
+	function processMB( 
 	    $ajax 
 	    )
 	{
-		if (! isset ( $_REQUEST [ 'view_package' ] ))
+		if (!isset ($_REQUEST ['view_package']))
 		{
-			sugar_die ( "no ModuleBuilder package set" ) ;
+			sugar_die("no ModuleBuilder package set");
 		}
 
-		$this->editModule = $_REQUEST [ 'view_module' ] ;
-		$this->package = $_REQUEST [ 'view_package' ] ;
+		$this->editModule = $_REQUEST ['view_module'];
+		$this->package = $_REQUEST ['view_package'];
 
-		$ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
-		$ajax->addCrumb ( $this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&view_package=' . $this->package . '")' ) ;
-		$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")') ;
+		$ajax->addCrumb(translate('LBL_MODULEBUILDER', 'ModuleBuilder'), 'ModuleBuilder.main("mb")');
+		$ajax->addCrumb($this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&view_package='.$this->package.'")');
+		$ajax->addCrumb($this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module='.$this->editModule.'&view_package='.$this->package.'")');
 
-		switch ( $this->view )
+		switch ($this->view)
 		{
 			case 'search':
 				//MB Select Search Layout page.
-				$this->generateMBSearchButtons () ;
-				$this->title = $this->editModule . " " . translate( 'LBL_SEARCH' ) ;
-				$this->question = translate( 'LBL_QUESTION_SEARCH' ) ;
-				$ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-				$ajax->addCrumb ( translate( 'LBL_SEARCH_FORMS' ), '' ) ;
-				$this->help = "searchHelp" ;
+				$this->generateMBSearchButtons();
+				$this->title = $this->editModule." ".translate('LBL_SEARCH');
+				$this->question = translate('LBL_QUESTION_SEARCH');
+				$ajax->addCrumb(translate('LBL_LAYOUTS'), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module='.$this->editModule.'&view_package='.$this->package.'")');
+				$ajax->addCrumb(translate('LBL_SEARCH_FORMS'), '');
+				$this->help = "searchHelp";
 				break;
 
 			case 'subpanel':
 				//ModuleBuilder Select Subpanel
-				$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-				$ajax->addCrumb ( translate( 'LBL_SUBPANELS' ), '' ) ;
-				$this->question = translate( 'LBL_QUESTION_SUBPANEL' ) ;
-				$this->help = 'subpanelHelp' ;
+				$ajax->addCrumb($this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module='.$this->editModule.'&view_package='.$this->package.'")');
+				$ajax->addCrumb(translate('LBL_SUBPANELS'), '');
+				$this->question = translate('LBL_QUESTION_SUBPANEL');
+				$this->help = 'subpanelHelp';
 				break;
 
 			case 'dashlet':
-				$this->generateMBDashletButtons ();
-				$this->title = $this->editModule ." " .translate('LBL_DASHLET');
-				$this->question = translate( 'LBL_QUESTION_DASHLET' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_DASHLET' ), '' ) ;
-				$this->help = 'dashletHelp' ;
+				$this->generateMBDashletButtons();
+				$this->title = $this->editModule." ".translate('LBL_DASHLET');
+				$this->question = translate('LBL_QUESTION_DASHLET');
+				$this->ajax->addCrumb(translate('LBL_LAYOUTS'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module='.$this->editModule.'")');
+				$this->ajax->addCrumb(translate('LBL_DASHLET'), '');
+				$this->help = 'dashletHelp';
 				break;
 
 
 			case 'popup':
 				$this->generateMBPopupButtons();
-				$this->title = $this->editModule ." " .translate('LBL_POPUP');
-				$this->question = translate( 'LBL_QUESTION_POPUP' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module=' . $this->editModule . '")' ) ;
-				$this->ajax->addCrumb ( translate( 'LBL_POPUP' ), '' ) ;
-				$this->help = 'popupHelp' ;
+				$this->title = $this->editModule." ".translate('LBL_POPUP');
+				$this->question = translate('LBL_QUESTION_POPUP');
+				$this->ajax->addCrumb(translate('LBL_LAYOUTS'), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=layouts&MB=1&view_package='.$this->package.'&view_module='.$this->editModule.'")');
+				$this->ajax->addCrumb(translate('LBL_POPUP'), '');
+				$this->help = 'popupHelp';
 				break;
 			default:
-				$ajax->addCrumb ( translate( 'LBL_LAYOUTS' ), '' ) ;
-				$this->generateMBViewButtons () ;
-				$this->title = $this->editModule . " " . translate( 'LBL_LAYOUTS' ) ;
-				$this->question = translate( 'LBL_QUESTION_LAYOUT' ) ;
-				$this->help = "layoutsHelp" ;
+				$ajax->addCrumb(translate('LBL_LAYOUTS'), '');
+				$this->generateMBViewButtons();
+				$this->title = $this->editModule." ".translate('LBL_LAYOUTS');
+				$this->question = translate('LBL_QUESTION_LAYOUT');
+				$this->help = "layoutsHelp";
 		}
 	}
 
 
 	function generateStudioModuleButtons()
 	{
-		require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
-		$sb = new StudioBrowser ( ) ;
-		$sb->loadModules () ;
-		$nodes = $sb->getNodes () ;
-		$this->buttons = array ( ) ;
+		require_once ('modules/ModuleBuilder/Module/StudioBrowser.php');
+		$sb = new StudioBrowser( );
+		$sb->loadModules();
+		$nodes = $sb->getNodes();
+		$this->buttons = array( );
 		//$GLOBALS['log']->debug(print_r($nodes,true));
-		foreach ( $nodes as $module )
+		foreach ($nodes as $module)
 		{
-			$this->buttons [ $module [ 'name' ] ] = array ( 'action' => $module [ 'action' ] , 'imageTitle' => ucfirst ( $module [ 'module' ] . "_32" ) , 'size' => '32', 'linkId' => 'studiolink_'.$module [ 'module' ] ) ;
+			$this->buttons [$module ['name']] = array('action' => $module ['action'], 'imageTitle' => ucfirst($module ['module']."_32"), 'size' => '32', 'linkId' => 'studiolink_'.$module ['module']);
 		}
 	}
 
@@ -267,44 +267,44 @@ 
 
 	function generateMBViewButtons()
 	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_EDITVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_EDITVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_EDITVIEW']] = 
+		  array( 
+		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_EDITVIEW."&view_module={$this->editModule}&view_package={$this->package}", 
 		      'imageTitle' => 'EditView', 
 		      'help'=>'viewBtnEditView'
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DETAILVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_DETAILVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+		  );
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_DETAILVIEW']] = 
+		  array( 
+		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_DETAILVIEW."&view_module={$this->editModule}&view_package={$this->package}", 
 		      'imageTitle' => 'DetailView', 
 		      'help'=>'viewBtnListView'  
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_LISTVIEW."&view_module={$this->editModule}&view_package={$this->package}" , 
+		  );
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_LISTVIEW']] = 
+		  array( 
+		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_LISTVIEW."&view_module={$this->editModule}&view_package={$this->package}", 
 		      'imageTitle' => 'ListView', 
 		      'help'=>'viewBtnListView' 
-		  ) ;
-		  $this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_QUICKCREATE' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_QUICKCREATE."&view_module={$this->editModule}&view_package={$this->package}" , 
+		  );
+		  $this->buttons [$GLOBALS ['mod_strings'] ['LBL_QUICKCREATE']] = 
+		  array( 
+		      'action' => "module=ModuleBuilder&MB=true&action=editLayout&view=".MB_QUICKCREATE."&view_module={$this->editModule}&view_package={$this->package}", 
 		      'imageTitle' => 'QuickCreate', 
 		      'help'=>'viewBtnQuickCreate' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_SEARCH' ] ] = 
-		  array (
-		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=search&view_module={$this->editModule}&view_package={$this->package}" , 
-		      'imageTitle' => 'SearchForm' , 
+		  );
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_SEARCH']] = 
+		  array(
+		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=search&view_module={$this->editModule}&view_package={$this->package}", 
+		      'imageTitle' => 'SearchForm', 
 		      'help'=> 'searchBtn' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_DASHLET' ] ] = 
-		  array ( 
-		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=dashlet&view_module={$this->editModule}&view_package={$this->package}" , 
+		  );
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_DASHLET']] = 
+		  array( 
+		      'action' => "module=ModuleBuilder&MB=true&action=wizard&view=dashlet&view_module={$this->editModule}&view_package={$this->package}", 
 		      'imageTitle' => 'Dashlet', 
 		      'help'=>'viewBtnDashlet' 
-		  ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] ['LBL_POPUP'] ] = 
-		array ( 
+		  );
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_POPUP']] = 
+		array( 
 			'imageTitle' => 'Popup',  
 			'action' => "module=ModuleBuilder&MB=true&action=wizard&view=popup&view_module={$this->editModule}&view_package={$this->package}", 
 			'help'=>'PopupListViewBtn'
@@ -313,31 +313,31 @@ 
 
 	function generateMBDashletButtons() 
 	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashlet&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashletsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW']] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashlet&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW']] = array('action'=> "module=ModuleBuilder&MB=true&action=editLayout&view=dashletsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch', 'help'=> 'DashletSearchViewBtn');
 	}
 	
 	function generateMBPopupButtons() 
 	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW']] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_POPUPSEARCH']] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}&view_package={$this->package}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch', 'help'=> 'PopupSearchViewBtn');
 	}
 	
 	function generateStudioDashletButtons() 
 	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashlet&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_DASHLETSEARCHVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashletsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch','help'=> 'DashletSearchViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW']] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashlet&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETLISTVIEW'], 'imageName'=>'ListView', 'help'=>'DashletListViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW']] = array('action'=> "module=ModuleBuilder&action=editLayout&view=dashletsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_DASHLETSEARCHVIEW'], 'imageName'=>'BasicSearch', 'help'=> 'DashletSearchViewBtn');
 	}
 	
 	function generateStudioPopupButtons()
 	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPLISTVIEW' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
-		$this->buttons [ $GLOBALS [ 'mod_strings' ][ 'LBL_POPUPSEARCH' ] ] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch','help'=> 'PopupSearchViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW']] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popuplist&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPLISTVIEW'], 'imageName'=>'ListView', 'help'=>'PopupListViewBtn');
+		$this->buttons [$GLOBALS ['mod_strings']['LBL_POPUPSEARCH']] = array('action'=> "module=ModuleBuilder&action=editLayout&view=popupsearch&view_module={$this->editModule}", 'imageTitle'=> $GLOBALS ['mod_strings']['LBL_POPUPSEARCH'], 'imageName'=>'BasicSearch', 'help'=> 'PopupSearchViewBtn');
 	}
 	
 	function generateMBSearchButtons()
 	{
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=basic_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BASIC_SEARCH' ] , 'imageName' => 'BasicSearch','help' => "BasicSearchBtn" ) ;
-		$this->buttons [ $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED' ] ] = array ( 'action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=advanced_search" , 'imageTitle' => $GLOBALS [ 'mod_strings' ] [ 'LBL_ADVANCED_SEARCH' ] , 'imageName' => 'AdvancedSearch','help' => "AdvancedSearchBtn" ) ;
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_BASIC']] = array('action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=basic_search", 'imageTitle' => $GLOBALS ['mod_strings'] ['LBL_BASIC_SEARCH'], 'imageName' => 'BasicSearch', 'help' => "BasicSearchBtn");
+		$this->buttons [$GLOBALS ['mod_strings'] ['LBL_ADVANCED']] = array('action' => "module=ModuleBuilder&MB=true&action=editLayout&view_module={$this->editModule}&view_package={$this->package}&view=SearchView&searchlayout=advanced_search", 'imageTitle' => $GLOBALS ['mod_strings'] ['LBL_ADVANCED_SEARCH'], 'imageName' => 'AdvancedSearch', 'help' => "AdvancedSearchBtn");
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -54,8 +54,9 @@ 
 
 	function __construct()
 	{
-		if ( isset ( $_REQUEST [ 'view' ] ) )
-			$this->view = $_REQUEST [ 'view' ] ;
+		if ( isset ( $_REQUEST [ 'view' ] ) ) {
+					$this->view = $_REQUEST [ 'view' ] ;
+		}
 
 		$this->editModule = (! empty ( $_REQUEST [ 'view_module' ] ) ) ? $_REQUEST [ 'view_module' ] : null ;
 		$this->buttons = array(); // initialize so that modules without subpanels for example don't result in this being unset and causing problems in the smarty->assign
@@ -114,8 +115,9 @@ 
 			$this->question = translate('LBL_QUESTION_EDIT') ;
 			$this->title = translate( 'LBL_STUDIO' );
 			global $current_user;
-			if (is_admin($current_user))
-				$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
+			if (is_admin($current_user)) {
+							$this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=exportcustomizations');\" value=\"" . translate ( 'LBL_BTN_EXPORT' ) . '">' ;
+			}
 
 			$this->help = 'studioHelp' ;
 		} else
@@ -177,10 +179,11 @@ 
 					$this->title = translate( 'LBL_EDIT' ) . " " . $module->name ;
 					$this->help = 'moduleHelp' ;
 					global $current_user;
-					if (is_admin($current_user))
-                        $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" " 
+					if (is_admin($current_user)) {
+					                        $this->actions = "<input class=\"button\" type=\"button\" id=\"exportBtn\" name=\"exportBtn\" " 
                         . "onclick=\"ModuleBuilder.getContent('module=ModuleBuilder&action=resetmodule&view_module=$this->editModule');\" value=\"" 
                         . translate( 'LBL_RESET_MODULE' ) . '">' ;
+					}
 			}
 		}
 	}

modules/ModuleBuilder/views/view.relationships.php

Indentation +25 added lines, -25 removed lines

@@ -46,16 +46,16 @@ 
 class ViewRelationships 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()
@@ -69,7 +69,7 @@ 
 
         $ajax = new AjaxCompose ( ) ;
         $json = getJSONobj () ;
-		$this->fromModuleBuilder = !empty ( $_REQUEST [ 'MB' ] ) || (!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio') ;
+        $this->fromModuleBuilder = !empty ( $_REQUEST [ 'MB' ] ) || (!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio') ;
         $smarty->assign('fromModuleBuilder', $this->fromModuleBuilder);
         if (!$this->fromModuleBuilder)
         {
@@ -97,7 +97,7 @@ 
             $mb = new ModuleBuilder ( ) ;
             $module = & $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
             $package = $mb->packages [ $_REQUEST [ 'view_package' ] ] ;
-			$package->loadModuleTitles();
+            $package->loadModuleTitles();
             $relationships = new UndeployedRelationships ( $module->getModuleDir () ) ;
             $ajaxRelationships = $this->getAjaxRelationships( $relationships ) ;
             $smarty->assign ( 'relationships', $json->encode ( $ajaxRelationships ) ) ;
@@ -129,23 +129,23 @@ 
             
             //#28668  , translate the relationship type before render it .
             switch($rel['relationship_type']){
-            	case 'one-to-one':
-            	$rel['relationship_type']  = translate ( 'LBL_ONETOONE' );
-            	break;
-            	case 'one-to-many':
-            	$rel['relationship_type']  = translate ( 'LBL_ONETOMANY' );
-            	break;
-            	case 'many-to-one':
-            	$rel['relationship_type']  = translate ( 'LBL_MANYTOONE' );
-            	break;
-            	case 'many-to-many':
-            	$rel['relationship_type']  = translate ( 'LBL_MANYTOMANY' );
-            	break;
-            	default: $rel['relationship_type']  = '';
+                case 'one-to-one':
+                $rel['relationship_type']  = translate ( 'LBL_ONETOONE' );
+                break;
+                case 'one-to-many':
+                $rel['relationship_type']  = translate ( 'LBL_ONETOMANY' );
+                break;
+                case 'many-to-one':
+                $rel['relationship_type']  = translate ( 'LBL_MANYTOONE' );
+                break;
+                case 'many-to-many':
+                $rel['relationship_type']  = translate ( 'LBL_MANYTOMANY' );
+                break;
+                default: $rel['relationship_type']  = '';
             }
             $rel [ 'name' ] = $relationshipName ;
             if ($rel [ 'is_custom' ] && isset($rel [ 'from_studio' ]) && $rel [ 'from_studio' ]) {
-            	$rel [ 'name' ] = $relationshipName . "*";
+                $rel [ 'name' ] = $relationshipName . "*";
             }
             $ajaxrels [] = $rel ;
         }

Spacing +59 added lines, -59 removed lines

@@ -37,11 +37,11 @@ 
  * 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/views/view.relationship.php') ;
-require_once ('modules/ModuleBuilder/Module/StudioModule.php') ;
-require_once ('modules/ModuleBuilder/Module/StudioBrowser.php') ;
+require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+require_once ('modules/ModuleBuilder/MB/ModuleBuilder.php');
+require_once ('modules/ModuleBuilder/views/view.relationship.php');
+require_once ('modules/ModuleBuilder/Module/StudioModule.php');
+require_once ('modules/ModuleBuilder/Module/StudioBrowser.php');
 
 class ViewRelationships extends SugarView
 {
@@ -53,103 +53,103 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
 
     function display()
     {
-        $moduleName = ! empty ( $_REQUEST [ 'view_module' ] ) ? $_REQUEST [ 'view_module' ] : $_REQUEST [ 'edit_module' ] ;
-        $smarty = new Sugar_Smarty ( ) ;
+        $moduleName = !empty ($_REQUEST ['view_module']) ? $_REQUEST ['view_module'] : $_REQUEST ['edit_module'];
+        $smarty = new Sugar_Smarty( );
         // set the mod_strings as we can be called after doing a Repair and the mod_strings are set to Administration
         $GLOBALS['mod_strings'] = return_module_language($GLOBALS['current_language'], 'ModuleBuilder');
-        $smarty->assign ( 'mod_strings', $GLOBALS [ 'mod_strings' ] ) ;
-        $smarty->assign ( 'view_module', $moduleName ) ;
+        $smarty->assign('mod_strings', $GLOBALS ['mod_strings']);
+        $smarty->assign('view_module', $moduleName);
 
-        $ajax = new AjaxCompose ( ) ;
-        $json = getJSONobj () ;
-		$this->fromModuleBuilder = !empty ( $_REQUEST [ 'MB' ] ) || (!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio') ;
+        $ajax = new AjaxCompose( );
+        $json = getJSONobj();
+		$this->fromModuleBuilder = !empty ($_REQUEST ['MB']) || (!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio');
         $smarty->assign('fromModuleBuilder', $this->fromModuleBuilder);
         if (!$this->fromModuleBuilder)
         {
-            $smarty->assign ( 'view_package', '' ) ;
+            $smarty->assign('view_package', '');
 
-            $relationships = new DeployedRelationships ( $moduleName ) ;
-            $ajaxRelationships = $this->getAjaxRelationships( $relationships ) ;
-            $smarty->assign ( 'relationships', $json->encode ( $ajaxRelationships ) ) ;
-            $smarty->assign ( 'empty', (sizeof ( $ajaxRelationships ) == 0) ) ;
-            $smarty->assign ( 'studio', true ) ;
+            $relationships = new DeployedRelationships($moduleName);
+            $ajaxRelationships = $this->getAjaxRelationships($relationships);
+            $smarty->assign('relationships', $json->encode($ajaxRelationships));
+            $smarty->assign('empty', (sizeof($ajaxRelationships) == 0));
+            $smarty->assign('studio', true);
 
             //crumb
-            global $app_list_strings ;
-            $moduleNames = array_change_key_case ( $app_list_strings [ 'moduleList' ] ) ;
-            $translatedModule = $moduleNames [ strtolower ( $moduleName ) ] ;
-            $ajax->addCrumb ( translate('LBL_STUDIO'), 'ModuleBuilder.main("studio")' ) ;
-            $ajax->addCrumb ( $translatedModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $moduleName . '")' ) ;
-            $ajax->addCrumb ( translate('LBL_RELATIONSHIPS'), '' ) ;
-            $ajax->addSection ( 'center', $moduleName . ' ' . translate('LBL_RELATIONSHIPS'), $this->fetchTemplate($smarty, 'modules/ModuleBuilder/tpls/studioRelationships.tpl'));
+            global $app_list_strings;
+            $moduleNames = array_change_key_case($app_list_strings ['moduleList']);
+            $translatedModule = $moduleNames [strtolower($moduleName)];
+            $ajax->addCrumb(translate('LBL_STUDIO'), 'ModuleBuilder.main("studio")');
+            $ajax->addCrumb($translatedModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$moduleName.'")');
+            $ajax->addCrumb(translate('LBL_RELATIONSHIPS'), '');
+            $ajax->addSection('center', $moduleName.' '.translate('LBL_RELATIONSHIPS'), $this->fetchTemplate($smarty, 'modules/ModuleBuilder/tpls/studioRelationships.tpl'));
 
         } else
         {
-            $smarty->assign ( 'view_package', $_REQUEST [ 'view_package' ] ) ;
+            $smarty->assign('view_package', $_REQUEST ['view_package']);
 
-            $mb = new ModuleBuilder ( ) ;
-            $module = & $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
-            $package = $mb->packages [ $_REQUEST [ 'view_package' ] ] ;
+            $mb = new ModuleBuilder( );
+            $module = & $mb->getPackageModule($_REQUEST ['view_package'], $_REQUEST ['view_module']);
+            $package = $mb->packages [$_REQUEST ['view_package']];
 			$package->loadModuleTitles();
-            $relationships = new UndeployedRelationships ( $module->getModuleDir () ) ;
-            $ajaxRelationships = $this->getAjaxRelationships( $relationships ) ;
-            $smarty->assign ( 'relationships', $json->encode ( $ajaxRelationships ) ) ;
-            $smarty->assign ( 'empty', (sizeof ( $ajaxRelationships ) == 0) ) ;
+            $relationships = new UndeployedRelationships($module->getModuleDir());
+            $ajaxRelationships = $this->getAjaxRelationships($relationships);
+            $smarty->assign('relationships', $json->encode($ajaxRelationships));
+            $smarty->assign('empty', (sizeof($ajaxRelationships) == 0));
 
-            $module->help [ 'default' ] = (empty ( $_REQUEST [ 'view_module' ] )) ? 'create' : 'modify' ;
-            $module->help [ 'group' ] = 'module' ;
+            $module->help ['default'] = (empty ($_REQUEST ['view_module'])) ? 'create' : 'modify';
+            $module->help ['group'] = 'module';
 
-            $ajax->addCrumb ( translate('LBL_MODULEBUILDER'), 'ModuleBuilder.main("mb")' ) ;
-            $ajax->addCrumb ( $package->name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $package->name . '")' ) ;
-            $ajax->addCrumb ( $moduleName, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $package->name . '&view_module=' . $moduleName . '")' ) ;
-            $ajax->addCrumb ( translate('LBL_RELATIONSHIPS'), '' ) ;
-            $ajax->addSection ( 'center', $moduleName . ' ' . translate('LBL_RELATIONSHIPS'), $this->fetchTemplate($smarty, 'modules/ModuleBuilder/tpls/studioRelationships.tpl'));
+            $ajax->addCrumb(translate('LBL_MODULEBUILDER'), 'ModuleBuilder.main("mb")');
+            $ajax->addCrumb($package->name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
+            $ajax->addCrumb($moduleName, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$package->name.'&view_module='.$moduleName.'")');
+            $ajax->addCrumb(translate('LBL_RELATIONSHIPS'), '');
+            $ajax->addSection('center', $moduleName.' '.translate('LBL_RELATIONSHIPS'), $this->fetchTemplate($smarty, 'modules/ModuleBuilder/tpls/studioRelationships.tpl'));
         }
-        echo $ajax->getJavascript () ;
+        echo $ajax->getJavascript();
     }
 
     /*
      * Encode the relationships for this module for display in the Ext grid layout
      */
-    function getAjaxRelationships ( $relationships )
+    function getAjaxRelationships($relationships)
     {
-        $ajaxrels = array ( ) ;
-        foreach ( $relationships->getRelationshipList () as $relationshipName )
+        $ajaxrels = array( );
+        foreach ($relationships->getRelationshipList() as $relationshipName)
         {
-            $rel = $relationships->get ( $relationshipName )->getDefinition () ;
-            $rel [ 'lhs_module' ] = translate( $rel [ 'lhs_module' ] ) ;
-            $rel [ 'rhs_module' ] = translate( $rel [ 'rhs_module' ] ) ;
+            $rel = $relationships->get($relationshipName)->getDefinition();
+            $rel ['lhs_module'] = translate($rel ['lhs_module']);
+            $rel ['rhs_module'] = translate($rel ['rhs_module']);
             
             //#28668  , translate the relationship type before render it .
-            switch($rel['relationship_type']){
+            switch ($rel['relationship_type']) {
             	case 'one-to-one':
-            	$rel['relationship_type']  = translate ( 'LBL_ONETOONE' );
+            	$rel['relationship_type']  = translate('LBL_ONETOONE');
             	break;
             	case 'one-to-many':
-            	$rel['relationship_type']  = translate ( 'LBL_ONETOMANY' );
+            	$rel['relationship_type']  = translate('LBL_ONETOMANY');
             	break;
             	case 'many-to-one':
-            	$rel['relationship_type']  = translate ( 'LBL_MANYTOONE' );
+            	$rel['relationship_type']  = translate('LBL_MANYTOONE');
             	break;
             	case 'many-to-many':
-            	$rel['relationship_type']  = translate ( 'LBL_MANYTOMANY' );
+            	$rel['relationship_type']  = translate('LBL_MANYTOMANY');
             	break;
-            	default: $rel['relationship_type']  = '';
+            	default: $rel['relationship_type'] = '';
             }
-            $rel [ 'name' ] = $relationshipName ;
-            if ($rel [ 'is_custom' ] && isset($rel [ 'from_studio' ]) && $rel [ 'from_studio' ]) {
-            	$rel [ 'name' ] = $relationshipName . "*";
+            $rel ['name'] = $relationshipName;
+            if ($rel ['is_custom'] && isset($rel ['from_studio']) && $rel ['from_studio']) {
+            	$rel ['name'] = $relationshipName."*";
             }
-            $ajaxrels [] = $rel ;
+            $ajaxrels [] = $rel;
         }
-        return $ajaxrels ;
+        return $ajaxrels;
     }
 
     /**

modules/ModuleBuilder/views/view.deletemodule.php

Indentation +15 added lines, -15 removed lines

@@ -43,22 +43,22 @@
 class Viewdeletemodule 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();
-		$ajax->addSection('center', 'Module Deleted', $_REQUEST['module'] . ' was deleted from ' . $_REQUEST['package']);
-		echo $ajax->getJavascript(); 
- 	}
+    function display()
+    {
+            $ajax = new AjaxCompose();
+        $ajax->addSection('center', 'Module Deleted', $_REQUEST['module'] . ' was deleted from ' . $_REQUEST['package']);
+        echo $ajax->getJavascript(); 
+        }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -58,7 +58,7 @@ 
 	function display()
 	{
  		$ajax = new AjaxCompose();
-		$ajax->addSection('center', 'Module Deleted', $_REQUEST['module'] . ' was deleted from ' . $_REQUEST['package']);
+		$ajax->addSection('center', 'Module Deleted', $_REQUEST['module'].' was deleted from '.$_REQUEST['package']);
 		echo $ajax->getJavascript(); 
  	}
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.dropdown.php

Indentation +96 added lines, -96 removed lines

@@ -41,130 +41,130 @@
 
 class ViewDropdown 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 = $this->generateSmarty();
+        function display()
+        {
+        $ajax = new AjaxCompose();
+        $smarty = $this->generateSmarty();
 		
-		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;
 
- 		$smarty->assign('deleteImage', SugarThemeRegistry::current()->getImage( 'delete_inline', '',null,null,'.gif',$mod_strings['LBL_MB_DELETE']));
-		$smarty->assign('editImage', SugarThemeRegistry::current()->getImage( 'edit_inline', ''
+            $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');
-		$body = $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdown.tpl');
-		$ajax->addSection('east2', $mod_strings['LBL_SECTION_DROPDOWNED'], $body );
- 		echo $ajax->getJavascript();
- 	}
+        $smarty->assign('action', 'savedropdown');
+        $body = $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdown.tpl');
+        $ajax->addSection('east2', $mod_strings['LBL_SECTION_DROPDOWNED'], $body );
+            echo $ajax->getJavascript();
+        }
  	
- 	function generateSmarty()
- 	{
-		//get the selected language
-		$selected_lang = (!empty($_REQUEST['dropdown_lang'])?$_REQUEST['dropdown_lang']:$_SESSION['authenticated_user_language']);
-		$vardef = array();
-		$package_name = 'studio';
-		$package_strings = array();
-		$new =false;
-		$my_list_strings = return_app_list_strings_language( $selected_lang ) ;
+        function generateSmarty()
+        {
+        //get the selected language
+        $selected_lang = (!empty($_REQUEST['dropdown_lang'])?$_REQUEST['dropdown_lang']:$_SESSION['authenticated_user_language']);
+        $vardef = array();
+        $package_name = 'studio';
+        $package_strings = array();
+        $new =false;
+        $my_list_strings = return_app_list_strings_language( $selected_lang ) ;
 //		$my_list_strings = $GLOBALS['app_list_strings'];
 
         $smarty = new Sugar_Smarty();
 		      
-		//if we are using ModuleBuilder then process the following
-		if(!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio'){
-			require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
-			$mb = new ModuleBuilder();
-			$module = $mb->getPackageModule($_REQUEST['view_package'], $_REQUEST['view_module']);
-			$package = $mb->packages[$_REQUEST['view_package']];
-			$package_name = $package->name;
-			$module->getVardefs();
-			if(empty($_REQUEST['dropdown_name']) && !empty($_REQUEST['field'])){
-				$new = true;
-				$_REQUEST['dropdown_name'] = $_REQUEST['field']. '_list';
-			}
+        //if we are using ModuleBuilder then process the following
+        if(!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio'){
+            require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
+            $mb = new ModuleBuilder();
+            $module = $mb->getPackageModule($_REQUEST['view_package'], $_REQUEST['view_module']);
+            $package = $mb->packages[$_REQUEST['view_package']];
+            $package_name = $package->name;
+            $module->getVardefs();
+            if(empty($_REQUEST['dropdown_name']) && !empty($_REQUEST['field'])){
+                $new = true;
+                $_REQUEST['dropdown_name'] = $_REQUEST['field']. '_list';
+            }
 			
-			$vardef = (!empty($module->mbvardefs->fields[$_REQUEST['dropdown_name']]))? $module->mbvardefs->fields[$_REQUEST['dropdown_name']]: array();
-			$module->mblanguage->generateAppStrings(false) ;
+            $vardef = (!empty($module->mbvardefs->fields[$_REQUEST['dropdown_name']]))? $module->mbvardefs->fields[$_REQUEST['dropdown_name']]: array();
+            $module->mblanguage->generateAppStrings(false) ;
             $my_list_strings = array_merge( $my_list_strings, $module->mblanguage->appListStrings[$selected_lang.'.lang.php'] );
             $smarty->assign('module_name', $module->name);
-		}
+        }
 
         $module_name = !empty($module->name) ?  $module->name : '';
         $module_name = (empty($module_name) && !empty($_REQUEST['view_module'])) ?  $_REQUEST['view_module'] : $module_name;
 
-		foreach($my_list_strings as $key=>$value){
-			if(!is_array($value)){
-				unset($my_list_strings[$key]);
-			}
-		}
+        foreach($my_list_strings as $key=>$value){
+            if(!is_array($value)){
+                unset($my_list_strings[$key]);
+            }
+        }
 		
-		$dropdowns = array_keys($my_list_strings);
-		asort($dropdowns);
-		$keys = array_keys($dropdowns);
-		$first_string = $my_list_strings[$dropdowns[$keys[0]]];
+        $dropdowns = array_keys($my_list_strings);
+        asort($dropdowns);
+        $keys = array_keys($dropdowns);
+        $first_string = $my_list_strings[$dropdowns[$keys[0]]];
 
-		$name = '';
-		$selected_dropdown = array();
+        $name = '';
+        $selected_dropdown = array();
 
-		$json = getJSONobj();
+        $json = getJSONobj();
 
-		if(!empty($_REQUEST['dropdown_name']) && !$new){
-			$name = $_REQUEST['dropdown_name'];
+        if(!empty($_REQUEST['dropdown_name']) && !$new){
+            $name = $_REQUEST['dropdown_name'];
 			
-			// handle the case where we've saved a dropdown in one language, and now attempt to edit it for another language. The $name exists, but $my_list_strings[$name] doesn't
+            // handle the case where we've saved a dropdown in one language, and now attempt to edit it for another language. The $name exists, but $my_list_strings[$name] doesn't
             // for now, we just treat it as if it was new. A better approach might be to use the first language version as a template for future languages
             if (!isset($my_list_strings[$name]))
                 $my_list_strings[$name] = array () ;
  
-			$selected_dropdown = (!empty($vardef['options']) && !empty($my_list_strings[$vardef['options']])) ? $my_list_strings[$vardef['options']] : $my_list_strings[$name];
-			$smarty->assign('ul_list', 'list = '.$json->encode(array_keys($selected_dropdown)));
-			$smarty->assign('dropdown_name', (!empty($vardef['options']) ? $vardef['options'] : $_REQUEST['dropdown_name']));
-			$smarty->assign('name', $_REQUEST['dropdown_name']);
-			$smarty->assign('options', $selected_dropdown);
-		}else{
-			$smarty->assign('ul_list', 'list = {}');
-			//we should try to find a name for this dropdown based on the field name.
-			$pre_pop_name = '';
-			if(!empty($_REQUEST['field']))
-				$pre_pop_name = $_REQUEST['field'];
-			//ensure this dropdown name does not already exist
-			$use_name = $pre_pop_name.'_list';
-			for($i = 0; $i < 100; $i++){
-				if(empty($my_list_strings[$use_name]))
-					break;
-				else
-					$use_name = $pre_pop_name.'_'.$i;
-			}
-			$smarty->assign('prepopulated_name', $use_name);
-		}
+            $selected_dropdown = (!empty($vardef['options']) && !empty($my_list_strings[$vardef['options']])) ? $my_list_strings[$vardef['options']] : $my_list_strings[$name];
+            $smarty->assign('ul_list', 'list = '.$json->encode(array_keys($selected_dropdown)));
+            $smarty->assign('dropdown_name', (!empty($vardef['options']) ? $vardef['options'] : $_REQUEST['dropdown_name']));
+            $smarty->assign('name', $_REQUEST['dropdown_name']);
+            $smarty->assign('options', $selected_dropdown);
+        }else{
+            $smarty->assign('ul_list', 'list = {}');
+            //we should try to find a name for this dropdown based on the field name.
+            $pre_pop_name = '';
+            if(!empty($_REQUEST['field']))
+                $pre_pop_name = $_REQUEST['field'];
+            //ensure this dropdown name does not already exist
+            $use_name = $pre_pop_name.'_list';
+            for($i = 0; $i < 100; $i++){
+                if(empty($my_list_strings[$use_name]))
+                    break;
+                else
+                    $use_name = $pre_pop_name.'_'.$i;
+            }
+            $smarty->assign('prepopulated_name', $use_name);
+        }
 
-		$smarty->assign('module_name', $module_name);
-		$smarty->assign('APP', $GLOBALS['app_strings']);
-		$smarty->assign('MOD', $GLOBALS['mod_strings']);
-		$smarty->assign('selected_lang', $selected_lang);
-		$smarty->assign('available_languages',get_languages());
-		$smarty->assign('package_name', $package_name);
- 		return $smarty;
- 	}
+        $smarty->assign('module_name', $module_name);
+        $smarty->assign('APP', $GLOBALS['app_strings']);
+        $smarty->assign('MOD', $GLOBALS['mod_strings']);
+        $smarty->assign('selected_lang', $selected_lang);
+        $smarty->assign('available_languages',get_languages());
+        $smarty->assign('package_name', $package_name);
+            return $smarty;
+        }
 }
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -49,7 +49,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -64,57 +64,57 @@ 
 			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;
 
- 		$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');
 		$body = $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/dropdown.tpl');
-		$ajax->addSection('east2', $mod_strings['LBL_SECTION_DROPDOWNED'], $body );
+		$ajax->addSection('east2', $mod_strings['LBL_SECTION_DROPDOWNED'], $body);
  		echo $ajax->getJavascript();
  	}
  	
  	function generateSmarty()
  	{
 		//get the selected language
-		$selected_lang = (!empty($_REQUEST['dropdown_lang'])?$_REQUEST['dropdown_lang']:$_SESSION['authenticated_user_language']);
+		$selected_lang = (!empty($_REQUEST['dropdown_lang']) ? $_REQUEST['dropdown_lang'] : $_SESSION['authenticated_user_language']);
 		$vardef = array();
 		$package_name = 'studio';
 		$package_strings = array();
-		$new =false;
-		$my_list_strings = return_app_list_strings_language( $selected_lang ) ;
+		$new = false;
+		$my_list_strings = return_app_list_strings_language($selected_lang);
 //		$my_list_strings = $GLOBALS['app_list_strings'];
 
         $smarty = new Sugar_Smarty();
 		      
 		//if we are using ModuleBuilder then process the following
-		if(!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio'){
+		if (!empty($_REQUEST['view_package']) && $_REQUEST['view_package'] != 'studio') {
 			require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
 			$mb = new ModuleBuilder();
 			$module = $mb->getPackageModule($_REQUEST['view_package'], $_REQUEST['view_module']);
 			$package = $mb->packages[$_REQUEST['view_package']];
 			$package_name = $package->name;
 			$module->getVardefs();
-			if(empty($_REQUEST['dropdown_name']) && !empty($_REQUEST['field'])){
+			if (empty($_REQUEST['dropdown_name']) && !empty($_REQUEST['field'])) {
 				$new = true;
-				$_REQUEST['dropdown_name'] = $_REQUEST['field']. '_list';
+				$_REQUEST['dropdown_name'] = $_REQUEST['field'].'_list';
 			}
 			
-			$vardef = (!empty($module->mbvardefs->fields[$_REQUEST['dropdown_name']]))? $module->mbvardefs->fields[$_REQUEST['dropdown_name']]: array();
-			$module->mblanguage->generateAppStrings(false) ;
-            $my_list_strings = array_merge( $my_list_strings, $module->mblanguage->appListStrings[$selected_lang.'.lang.php'] );
+			$vardef = (!empty($module->mbvardefs->fields[$_REQUEST['dropdown_name']])) ? $module->mbvardefs->fields[$_REQUEST['dropdown_name']] : array();
+			$module->mblanguage->generateAppStrings(false);
+            $my_list_strings = array_merge($my_list_strings, $module->mblanguage->appListStrings[$selected_lang.'.lang.php']);
             $smarty->assign('module_name', $module->name);
 		}
 
-        $module_name = !empty($module->name) ?  $module->name : '';
-        $module_name = (empty($module_name) && !empty($_REQUEST['view_module'])) ?  $_REQUEST['view_module'] : $module_name;
+        $module_name = !empty($module->name) ? $module->name : '';
+        $module_name = (empty($module_name) && !empty($_REQUEST['view_module'])) ? $_REQUEST['view_module'] : $module_name;
 
-		foreach($my_list_strings as $key=>$value){
-			if(!is_array($value)){
+		foreach ($my_list_strings as $key=>$value) {
+			if (!is_array($value)) {
 				unset($my_list_strings[$key]);
 			}
 		}
@@ -129,29 +129,29 @@ 
 
 		$json = getJSONobj();
 
-		if(!empty($_REQUEST['dropdown_name']) && !$new){
+		if (!empty($_REQUEST['dropdown_name']) && !$new) {
 			$name = $_REQUEST['dropdown_name'];
 			
 			// handle the case where we've saved a dropdown in one language, and now attempt to edit it for another language. The $name exists, but $my_list_strings[$name] doesn't
             // for now, we just treat it as if it was new. A better approach might be to use the first language version as a template for future languages
             if (!isset($my_list_strings[$name]))
-                $my_list_strings[$name] = array () ;
+                $my_list_strings[$name] = array();
  
 			$selected_dropdown = (!empty($vardef['options']) && !empty($my_list_strings[$vardef['options']])) ? $my_list_strings[$vardef['options']] : $my_list_strings[$name];
 			$smarty->assign('ul_list', 'list = '.$json->encode(array_keys($selected_dropdown)));
 			$smarty->assign('dropdown_name', (!empty($vardef['options']) ? $vardef['options'] : $_REQUEST['dropdown_name']));
 			$smarty->assign('name', $_REQUEST['dropdown_name']);
 			$smarty->assign('options', $selected_dropdown);
-		}else{
+		} else {
 			$smarty->assign('ul_list', 'list = {}');
 			//we should try to find a name for this dropdown based on the field name.
 			$pre_pop_name = '';
-			if(!empty($_REQUEST['field']))
+			if (!empty($_REQUEST['field']))
 				$pre_pop_name = $_REQUEST['field'];
 			//ensure this dropdown name does not already exist
 			$use_name = $pre_pop_name.'_list';
-			for($i = 0; $i < 100; $i++){
-				if(empty($my_list_strings[$use_name]))
+			for ($i = 0; $i < 100; $i++) {
+				if (empty($my_list_strings[$use_name]))
 					break;
 				else
 					$use_name = $pre_pop_name.'_'.$i;
@@ -163,7 +163,7 @@ 
 		$smarty->assign('APP', $GLOBALS['app_strings']);
 		$smarty->assign('MOD', $GLOBALS['mod_strings']);
 		$smarty->assign('selected_lang', $selected_lang);
-		$smarty->assign('available_languages',get_languages());
+		$smarty->assign('available_languages', get_languages());
 		$smarty->assign('package_name', $package_name);
  		return $smarty;
  	}

Braces +12 added lines, -9 removed lines

@@ -134,27 +134,30 @@
 			
 			// handle the case where we've saved a dropdown in one language, and now attempt to edit it for another language. The $name exists, but $my_list_strings[$name] doesn't
             // for now, we just treat it as if it was new. A better approach might be to use the first language version as a template for future languages
-            if (!isset($my_list_strings[$name]))
-                $my_list_strings[$name] = array () ;
+            if (!isset($my_list_strings[$name])) {
+                            $my_list_strings[$name] = array () ;
+            }
  
 			$selected_dropdown = (!empty($vardef['options']) && !empty($my_list_strings[$vardef['options']])) ? $my_list_strings[$vardef['options']] : $my_list_strings[$name];
 			$smarty->assign('ul_list', 'list = '.$json->encode(array_keys($selected_dropdown)));
 			$smarty->assign('dropdown_name', (!empty($vardef['options']) ? $vardef['options'] : $_REQUEST['dropdown_name']));
 			$smarty->assign('name', $_REQUEST['dropdown_name']);
 			$smarty->assign('options', $selected_dropdown);
-		}else{
+		} else{
 			$smarty->assign('ul_list', 'list = {}');
 			//we should try to find a name for this dropdown based on the field name.
 			$pre_pop_name = '';
-			if(!empty($_REQUEST['field']))
-				$pre_pop_name = $_REQUEST['field'];
+			if(!empty($_REQUEST['field'])) {
+							$pre_pop_name = $_REQUEST['field'];
+			}
 			//ensure this dropdown name does not already exist
 			$use_name = $pre_pop_name.'_list';
 			for($i = 0; $i < 100; $i++){
-				if(empty($my_list_strings[$use_name]))
-					break;
-				else
-					$use_name = $pre_pop_name.'_'.$i;
+				if(empty($my_list_strings[$use_name])) {
+									break;
+				} else {
+									$use_name = $pre_pop_name.'_'.$i;
+				}
 			}
 			$smarty->assign('prepopulated_name', $use_name);
 		}

modules/ModuleBuilder/views/view.listview.php

Indentation +18 added lines, -18 removed lines

@@ -46,16 +46,16 @@ 
 class ViewListView 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(),
+            );
     }
 
     /*
@@ -112,12 +112,12 @@ 
 
 
         $labels = array (
-        			MB_LISTVIEW => 'LBL_LISTVIEW' ,
-        			) ;
+                    MB_LISTVIEW => 'LBL_LISTVIEW' ,
+                    ) ;
         $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
-		$this->translatedViewType = $translatedViewType;
+        if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
+            $translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+        $this->translatedViewType = $translatedViewType;
 
         if ($this->fromModuleBuilder)
         {
@@ -198,8 +198,8 @@ 
                 $subRef = $subList[strtolower($this->subpanel)];
                 $subTitleKey = !empty($subRef) ? $subRef : "LBL_" . strtoupper($this->subpanel) . "_SUBPANEL_TITLE";
                 $subTitle    = !empty($subRef) ? translate($subTitleKey, $this->editModule) : UCfirst($this->subpanel);
-            	$smarty->assign ( 'subpanel_label', $subTitleKey ) ;
-            	$smarty->assign ( 'subpanel_title', $subTitle ) ;
+                $smarty->assign ( 'subpanel_label', $subTitleKey ) ;
+                $smarty->assign ( 'subpanel_title', $subTitle ) ;
             }
         }
         $helpName = $this->subpanel ? 'subPanelEditor' : 'listViewEditor';
@@ -321,11 +321,11 @@ 
 
     function _buildImageButtons ($buttons , $horizontal = true)
     {
-    	$text = '<table cellspacing=2><tr>' ;
+        $text = '<table cellspacing=2><tr>' ;
         foreach ( $buttons as $button )
         {
             if (empty($button['id'])) {
-            	$button['id'] = $button['name'];
+                $button['id'] = $button['name'];
             }
             if (! $horizontal)
             {

Spacing +125 added lines, -125 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.
@@ -40,8 +40,8 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
-require_once ('include/SubPanel/SubPanel.php') ;
+require_once 'modules/ModuleBuilder/parsers/constants.php';
+require_once ('include/SubPanel/SubPanel.php');
 
 class ViewListView extends SugarView
 {
@@ -53,7 +53,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -63,224 +63,224 @@ 
      */
     function __construct()
     {
-        $this->editModule = $_REQUEST [ 'view_module' ] ;
-        $this->editLayout = $_REQUEST [ 'view' ] ;
-        $this->subpanel = (! empty ( $_REQUEST [ 'subpanel' ] )) ? $_REQUEST [ 'subpanel' ] : false ;
-        $this->subpanelLabel = (! empty ( $_REQUEST [ 'subpanelLabel' ] )) ? $_REQUEST [ 'subpanelLabel' ] : false ;
+        $this->editModule = $_REQUEST ['view_module'];
+        $this->editLayout = $_REQUEST ['view'];
+        $this->subpanel = (!empty ($_REQUEST ['subpanel'])) ? $_REQUEST ['subpanel'] : false;
+        $this->subpanelLabel = (!empty ($_REQUEST ['subpanelLabel'])) ? $_REQUEST ['subpanelLabel'] : false;
 
-        $this->fromModuleBuilder = ! empty ( $_REQUEST [ 'view_package' ] ) ;
-        if (! $this->fromModuleBuilder)
+        $this->fromModuleBuilder = !empty ($_REQUEST ['view_package']);
+        if (!$this->fromModuleBuilder)
         {
-            $moduleNames = array_change_key_case ( $GLOBALS['app_list_strings'] [ 'moduleList' ] ) ;
-            $this->translatedEditModule = $moduleNames [ strtolower ( $this->editModule ) ] ;
+            $moduleNames = array_change_key_case($GLOBALS['app_list_strings'] ['moduleList']);
+            $this->translatedEditModule = $moduleNames [strtolower($this->editModule)];
         }
     }
 
     // DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
-    function preDisplay ()
+    function preDisplay()
     {
     }
 
-    function display ($preview = false)
+    function display($preview = false)
     {
 
-        $packageName = (! empty ( $_REQUEST [ 'view_package' ] )) ? $_REQUEST [ 'view_package' ] : null ;
-        $subpanelName = (! empty ( $_REQUEST [ 'subpanel' ] )) ? $_REQUEST [ 'subpanel' ] : null ;
-        require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
-        $parser = ParserFactory::getParser (  $this->editLayout , $this->editModule , $packageName, $subpanelName ) ;
-        $smarty = $this->constructSmarty ( $parser ) ;
+        $packageName = (!empty ($_REQUEST ['view_package'])) ? $_REQUEST ['view_package'] : null;
+        $subpanelName = (!empty ($_REQUEST ['subpanel'])) ? $_REQUEST ['subpanel'] : null;
+        require_once 'modules/ModuleBuilder/parsers/ParserFactory.php';
+        $parser = ParserFactory::getParser($this->editLayout, $this->editModule, $packageName, $subpanelName);
+        $smarty = $this->constructSmarty($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', $this->translatedViewType, $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
+            $ajax = $this->constructAjax();
+            $ajax->addSection('center', $this->translatedViewType, $smarty->fetch("modules/ModuleBuilder/tpls/listView.tpl"));
 
-            echo $ajax->getJavascript () ;
+            echo $ajax->getJavascript();
         }
     }
 
-    function constructAjax ()
+    function constructAjax()
     {
-        require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-        $ajax = new AjaxCompose ( ) ;
+        require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+        $ajax = new AjaxCompose( );
 
-        $layoutLabel = 'LBL_LAYOUTS' ;
-        $layoutView = 'layouts' ;
+        $layoutLabel = 'LBL_LAYOUTS';
+        $layoutView = 'layouts';
 
 
-        $labels = array (
-        			MB_LISTVIEW => 'LBL_LISTVIEW' ,
-        			) ;
-        $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+        $labels = array(
+        			MB_LISTVIEW => 'LBL_LISTVIEW',
+        			);
+        $translatedViewType = '';
+		if (isset ($labels [strtolower($this->editLayout)]))
+			$translatedViewType = translate($labels [strtolower($this->editLayout)], 'ModuleBuilder');
 		$this->translatedViewType = $translatedViewType;
 
         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=' . $_REQUEST [ 'view_module' ] . '")' ) ;
+            $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='.$_REQUEST ['view_module'].'")');
             if ($this->subpanel != "")
             {
-                $ajax->addCrumb ( translate ( 'LBL_AVAILABLE_SUBPANELS', 'ModuleBuilder' ), '' ) ;
+                $ajax->addCrumb(translate('LBL_AVAILABLE_SUBPANELS', 'ModuleBuilder'), '');
                 if ($this->subpanelLabel)
                 {
                     $subpanelLabel = $this->subpanelLabel;
                     // If the subpanel title has changed, use that for the label instead
-                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] )
+                    if (!empty($_REQUEST['subpanel_title']) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'])
                         $subpanelLabel = $_REQUEST['subpanel_title'];
 
-                    $ajax->addCrumb( $subpanelLabel, '' );
-                    $this->translatedViewType = $subpanelLabel . "&nbsp;" . translate("LBL_SUBPANEL", "ModuleBuilder");
+                    $ajax->addCrumb($subpanelLabel, '');
+                    $this->translatedViewType = $subpanelLabel."&nbsp;".translate("LBL_SUBPANEL", "ModuleBuilder");
                 } else
                 {
-                    $ajax->addCrumb ( $this->subpanel, '' ) ;
+                    $ajax->addCrumb($this->subpanel, '');
                     $this->translatedViewType = translate("LBL_SUBPANEL", "ModuleBuilder");
                 }
             } else
             {
-                $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $_REQUEST [ 'view_module' ] . '&view_package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
-                $ajax->addCrumb ( $translatedViewType, '' ) ;
+                $ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module='.$_REQUEST ['view_module'].'&view_package='.$_REQUEST ['view_package'].'")');
+                $ajax->addCrumb($translatedViewType, '');
             }
         } else
         {
-            $ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")' ) ;
-            $ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' ) ;
+            $ajax->addCrumb(translate('LBL_STUDIO', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
+            $ajax->addCrumb($this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$this->editModule.'")');
 
             if ($this->subpanel)
             {
-                $ajax->addCrumb ( translate ( 'LBL_SUBPANELS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=subpanels&view_module=' . $this->editModule . '")' ) ;
+                $ajax->addCrumb(translate('LBL_SUBPANELS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=subpanels&view_module='.$this->editModule.'")');
                 if ($this->subpanelLabel)
                 {
                     $subpanelLabel = $this->subpanelLabel;
                     // If the subpanel title has changed, use that for the label instead
-                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] )
+                    if (!empty($_REQUEST['subpanel_title']) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'])
                         $subpanelLabel = $_REQUEST['subpanel_title'];
 
-                    $ajax->addCrumb( $subpanelLabel, '' );
-                    $this->translatedViewType = $subpanelLabel . "&nbsp;" . translate("LBL_SUBPANEL", "ModuleBuilder");
+                    $ajax->addCrumb($subpanelLabel, '');
+                    $this->translatedViewType = $subpanelLabel."&nbsp;".translate("LBL_SUBPANEL", "ModuleBuilder");
                 } else
                 {
-                    $ajax->addCrumb ( $this->subpanel, '' ) ;
+                    $ajax->addCrumb($this->subpanel, '');
                     $this->translatedViewType = translate("LBL_SUBPANEL", "ModuleBuilder");
                 }
             } else
             {
-                $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")' ) ;
-                $ajax->addCrumb ( $translatedViewType, '' ) ;
+                $ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module='.$this->editModule.'")');
+                $ajax->addCrumb($translatedViewType, '');
             }
         }
-        return $ajax ;
+        return $ajax;
     }
 
-    function constructSmarty ($parser)
+    function constructSmarty($parser)
     {
         global $mod_strings;
-        $smarty = new Sugar_Smarty ( ) ;
-        $smarty->assign ( 'translate', true ) ;
-        $smarty->assign ( 'language', $parser->getLanguage () ) ;
-
-        $smarty->assign ( 'view', $this->editLayout ) ;
-        $smarty->assign ( 'module', "ModuleBuilder" ) ;
-        $smarty->assign ( 'field_defs', $parser->getFieldDefs () ) ;
-        $smarty->assign ( 'action', 'listViewSave' ) ;
-        $smarty->assign ( 'view_module', $this->editModule ) ;
-        if (!empty ( $this->subpanel ) )
+        $smarty = new Sugar_Smarty( );
+        $smarty->assign('translate', true);
+        $smarty->assign('language', $parser->getLanguage());
+
+        $smarty->assign('view', $this->editLayout);
+        $smarty->assign('module', "ModuleBuilder");
+        $smarty->assign('field_defs', $parser->getFieldDefs());
+        $smarty->assign('action', 'listViewSave');
+        $smarty->assign('view_module', $this->editModule);
+        if (!empty ($this->subpanel))
         {
-            $smarty->assign ( 'subpanel', $this->subpanel ) ;
-            $smarty->assign ( 'subpanelLabel', $this->subpanelLabel ) ;
+            $smarty->assign('subpanel', $this->subpanel);
+            $smarty->assign('subpanelLabel', $this->subpanelLabel);
             if (!$this->fromModuleBuilder) {
-                $subList =  SubPanel::getModuleSubpanels ( $this->editModule);
+                $subList = SubPanel::getModuleSubpanels($this->editModule);
                 $subRef = $subList[strtolower($this->subpanel)];
-                $subTitleKey = !empty($subRef) ? $subRef : "LBL_" . strtoupper($this->subpanel) . "_SUBPANEL_TITLE";
+                $subTitleKey = !empty($subRef) ? $subRef : "LBL_".strtoupper($this->subpanel)."_SUBPANEL_TITLE";
                 $subTitle    = !empty($subRef) ? translate($subTitleKey, $this->editModule) : UCfirst($this->subpanel);
-            	$smarty->assign ( 'subpanel_label', $subTitleKey ) ;
-            	$smarty->assign ( 'subpanel_title', $subTitle ) ;
+            	$smarty->assign('subpanel_label', $subTitleKey);
+            	$smarty->assign('subpanel_title', $subTitle);
             }
         }
         $helpName = $this->subpanel ? 'subPanelEditor' : 'listViewEditor';
-        $smarty->assign ( 'helpName', $helpName ) ;
-        $smarty->assign ( 'helpDefault', 'modify' ) ;
+        $smarty->assign('helpName', $helpName);
+        $smarty->assign('helpDefault', 'modify');
 
-        $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)
         {
             // update this so that each field has a properties set
             // properties are name, value, title (optional)
-            $groups [ $GLOBALS [ 'mod_strings' ] [ $column ] ] = $parser->$function () ; // call the parser functions to populate the list view columns, by default 'default', 'available' and 'hidden'
+            $groups [$GLOBALS ['mod_strings'] [$column]] = $parser->$function(); // call the parser functions to populate the list view columns, by default 'default', 'available' and 'hidden'
         }
-        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);
         $smarty->assign('from_mb', $this->fromModuleBuilder);
 
         global $image_path;
-        $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']);
 
 //        $imageHelp = SugarThemeRegistry::current()->getImage('help') ;
 
 
-        $history = $parser->getHistory () ;
+        $history = $parser->getHistory();
 
-        $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
+        $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")";
         if ($this->subpanel)
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->subpanel}\")" ;
+            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->subpanel}\")";
 
         $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'";
         if ($this->subpanel)
             $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"{$this->subpanel}\")'";
 
-        $buttons = array ( ) ;
-        $buttons [] = array ( 'id' =>'savebtn', 'name' => 'savebtn' , 'image' => $imageSave , 'text' => (! $this->fromModuleBuilder)?$GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVEPUBLISH' ]: $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVE' ], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");if (countListFields()==0) ModuleBuilder.layoutValidation.popup() ; else ModuleBuilder.handleSave(\"edittabs\" )'" ) ;
-        $buttons [] = array ( 'id' => 'spacer' , 'width' => '50px' ) ;
-        $buttons [] = array ( 'id' =>'historyBtn',       'name' => 'historyBtn' , 'text' => translate ( 'LBL_HISTORY' ) , 'actionScript' => "onclick='$histaction'" ) ;
-        $buttons [] = array ( 'id' => 'historyDefault' , 'name' => 'historyDefault',  'text' => translate ( 'LBL_RESTORE_DEFAULT' ) , 'actionScript' => $restoreAction ) ;
+        $buttons = array( );
+        $buttons [] = array('id' =>'savebtn', 'name' => 'savebtn', 'image' => $imageSave, 'text' => (!$this->fromModuleBuilder) ? $GLOBALS ['mod_strings'] ['LBL_BTN_SAVEPUBLISH'] : $GLOBALS ['mod_strings'] ['LBL_BTN_SAVE'], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");if (countListFields()==0) ModuleBuilder.layoutValidation.popup() ; else ModuleBuilder.handleSave(\"edittabs\" )'");
+        $buttons [] = array('id' => 'spacer', 'width' => '50px');
+        $buttons [] = array('id' =>'historyBtn', 'name' => 'historyBtn', 'text' => translate('LBL_HISTORY'), 'actionScript' => "onclick='$histaction'");
+        $buttons [] = array('id' => 'historyDefault', 'name' => 'historyDefault', 'text' => translate('LBL_RESTORE_DEFAULT'), 'actionScript' => $restoreAction);
 
-        $smarty->assign ( 'buttons', $this->_buildImageButtons ( $buttons ) ) ;
+        $smarty->assign('buttons', $this->_buildImageButtons($buttons));
 
-        $editImage = SugarThemeRegistry::current()->getImage('edit_inline','',null,null,'.gif',$mod_strings['LBL_EDIT']) ;
+        $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', $_REQUEST [ 'view_package' ] ) ;
-            $mb = new ModuleBuilder ( ) ;
-            $module = & $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $this->editModule ) ;
+            $smarty->assign('MB', true);
+            $smarty->assign('view_package', $_REQUEST ['view_package']);
+            $mb = new ModuleBuilder( );
+            $module = & $mb->getPackageModule($_REQUEST ['view_package'], $this->editModule);
             $smarty->assign('current_mod_strings', $module->getModStrings());
             if ($this->subpanel)
             {
-                if (isset ( $_REQUEST [ 'local' ] ))
+                if (isset ($_REQUEST ['local']))
                 {
-                    $smarty->assign ( 'local', '1' ) ;
+                    $smarty->assign('local', '1');
                 }
-                $smarty->assign ( "subpanel", $this->subpanel ) ;
+                $smarty->assign("subpanel", $this->subpanel);
             } else
             {
-                $smarty->assign ( 'description', $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_DESCRIPTION' ] ) ;
+                $smarty->assign('description', $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_DESCRIPTION']);
 
             }
 
@@ -288,55 +288,55 @@ 
         {
             if ($this->subpanel)
             {
-                $smarty->assign ( "subpanel", "$this->subpanel" ) ;
+                $smarty->assign("subpanel", "$this->subpanel");
             } 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 ()
+    function _constructTitle()
 
     {
 
-        global $app_list_strings ;
+        global $app_list_strings;
 
         if ($this->fromModuleBuilder)
         {
-            $title = $this->editModule ;
+            $title = $this->editModule;
             if ($this->subpanel != "")
             {
-                $title .= ":$this->subpanel" ;
+                $title .= ":$this->subpanel";
             }
         } else
         {
-            $title = ($this->subpanel) ? ':' . $this->subpanel : $app_list_strings [ 'moduleList' ] [ $this->editModule ] ;
+            $title = ($this->subpanel) ? ':'.$this->subpanel : $app_list_strings ['moduleList'] [$this->editModule];
         }
-        return $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_EDIT' ] . ':&nbsp;' . $title ;
+        return $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_EDIT'].':&nbsp;'.$title;
 
     }
 
-    function _buildImageButtons ($buttons , $horizontal = true)
+    function _buildImageButtons($buttons, $horizontal = true)
     {
-    	$text = '<table cellspacing=2><tr>' ;
-        foreach ( $buttons as $button )
+    	$text = '<table cellspacing=2><tr>';
+        foreach ($buttons as $button)
         {
             if (empty($button['id'])) {
             	$button['id'] = $button['name'];
             }
-            if (! $horizontal)
+            if (!$horizontal)
             {
-                $text .= '</tr><tr>' ;
+                $text .= '</tr><tr>';
             }
             if ($button['id'] == "spacer") {
                 $text .= "<td style='width:{$button['width']}'> </td>";
                 continue;
             }
 
-            if (! empty ( $button [ 'plain' ] ))
+            if (!empty ($button ['plain']))
             {
                 $text .= <<<EOQ
 	             <td><input name={$button['name']} id={$button['id']} class="button" type="button" valign='center' {$button['actionScript']}
@@ -348,9 +348,9 @@ 
 	          <td><input name={$button['name']} id={$button['id']} class="button" type="button" valign='center' style='cursor:default'  {$button['actionScript']}
 EOQ;
             }
-            $text .= "value=\"{$button['text']}\"/></td>" ;
+            $text .= "value=\"{$button['text']}\"/></td>";
         }
-        $text .= '</tr></table>' ;
-        return $text ;
+        $text .= '</tr></table>';
+        return $text;
     }
 }

Braces +17 added lines, -11 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.
@@ -115,8 +116,9 @@ 
         			MB_LISTVIEW => 'LBL_LISTVIEW' ,
         			) ;
         $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) ) {
+					$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+		}
 		$this->translatedViewType = $translatedViewType;
 
         if ($this->fromModuleBuilder)
@@ -131,8 +133,9 @@ 
                 {
                     $subpanelLabel = $this->subpanelLabel;
                     // If the subpanel title has changed, use that for the label instead
-                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] )
-                        $subpanelLabel = $_REQUEST['subpanel_title'];
+                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] ) {
+                                            $subpanelLabel = $_REQUEST['subpanel_title'];
+                    }
 
                     $ajax->addCrumb( $subpanelLabel, '' );
                     $this->translatedViewType = $subpanelLabel . "&nbsp;" . translate("LBL_SUBPANEL", "ModuleBuilder");
@@ -158,8 +161,9 @@ 
                 {
                     $subpanelLabel = $this->subpanelLabel;
                     // If the subpanel title has changed, use that for the label instead
-                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] )
-                        $subpanelLabel = $_REQUEST['subpanel_title'];
+                    if( !empty($_REQUEST['subpanel_title'] ) && $_REQUEST['subpanelLabel'] != $_REQUEST['subpanel_title'] ) {
+                                            $subpanelLabel = $_REQUEST['subpanel_title'];
+                    }
 
                     $ajax->addCrumb( $subpanelLabel, '' );
                     $this->translatedViewType = $subpanelLabel . "&nbsp;" . translate("LBL_SUBPANEL", "ModuleBuilder");
@@ -241,12 +245,14 @@ 
         $history = $parser->getHistory () ;
 
         $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
-        if ($this->subpanel)
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->subpanel}\")" ;
+        if ($this->subpanel) {
+                    $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->subpanel}\")" ;
+        }
 
         $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'";
-        if ($this->subpanel)
-            $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"{$this->subpanel}\")'";
+        if ($this->subpanel) {
+                    $restoreAction = "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"{$this->subpanel}\")'";
+        }
 
         $buttons = array ( ) ;
         $buttons [] = array ( 'id' =>'savebtn', 'name' => 'savebtn' , 'image' => $imageSave , 'text' => (! $this->fromModuleBuilder)?$GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVEPUBLISH' ]: $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVE' ], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");if (countListFields()==0) ModuleBuilder.layoutValidation.popup() ; else ModuleBuilder.handleSave(\"edittabs\" )'" ) ;