adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.relationships.php

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

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.listview.php

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

modules/ModuleBuilder/views/view.dashlet.php

Spacing +80 added lines, -80 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
-    die ( 'Not A Valid Entry Point' ) ;
+if (!defined('sugarEntry') || !sugarEntry)
+    die ('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,27 +43,27 @@ 
 
 
 
-require_once ('modules/ModuleBuilder/views/view.listview.php') ;
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once ('modules/ModuleBuilder/views/view.listview.php');
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 class ViewDashlet extends ViewListView
 {
     function __construct()
     {
-        $this->editModule = $_REQUEST [ 'view_module' ] ;
-        $this->editLayout = $_REQUEST [ 'view' ] ;
-        if(isset ( $_REQUEST [ 'view_package' ] ) && ! empty ( $_REQUEST [ 'view_package' ] ))
-            $this->editPackage = $_REQUEST [ 'view_package' ];
+        $this->editModule = $_REQUEST ['view_module'];
+        $this->editLayout = $_REQUEST ['view'];
+        if (isset ($_REQUEST ['view_package']) && !empty ($_REQUEST ['view_package']))
+            $this->editPackage = $_REQUEST ['view_package'];
         else
             $this->editPackage = null;
 
-        $this->fromModuleBuilder = isset ( $_REQUEST [ 'MB' ] ) || (isset($_REQUEST['view_package']) && $_REQUEST['view_package'] && $_REQUEST['view_package'] != 'studio') ;
+        $this->fromModuleBuilder = isset ($_REQUEST ['MB']) || (isset($_REQUEST['view_package']) && $_REQUEST['view_package'] && $_REQUEST['view_package'] != 'studio');
 
         if (!$this->fromModuleBuilder)
         {
-            global $app_list_strings ;
-            $moduleNames = array_change_key_case ( $app_list_strings [ 'moduleList' ] ) ;
-            $this->translatedEditModule = $moduleNames [ strtolower ( $this->editModule ) ] ;
+            global $app_list_strings;
+            $moduleNames = array_change_key_case($app_list_strings ['moduleList']);
+            $this->translatedEditModule = $moduleNames [strtolower($this->editModule)];
         }
     }
 
@@ -75,7 +75,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -91,141 +91,141 @@ 
     {
 
 
-        require_once 'modules/ModuleBuilder/parsers/ParserFactory.php' ;
-        $parser = ParserFactory::getParser ( $this->editLayout, $this->editModule, $this->editPackage) ;
+        require_once 'modules/ModuleBuilder/parsers/ParserFactory.php';
+        $parser = ParserFactory::getParser($this->editLayout, $this->editModule, $this->editPackage);
 
-        $smarty = $this->constructSmarty ( $parser ) ;
+        $smarty = $this->constructSmarty($parser);
         if ($preview)
         {
-        	echo $smarty->fetch ( "modules/ModuleBuilder/tpls/Preview/listView.tpl" ) ;
+        	echo $smarty->fetch("modules/ModuleBuilder/tpls/Preview/listView.tpl");
         } else
         {
-        	$ajax = $this->constructAjax () ;
-        	$ajax->addSection ( 'center', translate('LBL_DASHLET'), $smarty->fetch ( "modules/ModuleBuilder/tpls/listView.tpl" ) ) ;
-        	echo $ajax->getJavascript () ;
+        	$ajax = $this->constructAjax();
+        	$ajax->addSection('center', translate('LBL_DASHLET'), $smarty->fetch("modules/ModuleBuilder/tpls/listView.tpl"));
+        	echo $ajax->getJavascript();
         }
     }
 
     function constructAjax()
     {
-        require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-        $ajax = new AjaxCompose ( ) ;
+        require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+        $ajax = new AjaxCompose( );
 
         if ($this->fromModuleBuilder)
         {
-            $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
-            $ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $this->editPackage . '")' ) ;
-            $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $this->editPackage . '&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&MB=1&view_package='.$this->editPackage.'&view_module=' . $this->editModule . '")');
-            $ajax->addCrumb ( translate('LBL_DASHLET', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=dashlet&MB=1&view_package='.$this->editPackage.'&view_module=' . $this->editModule . '")' );
+            $ajax->addCrumb(translate('LBL_MODULEBUILDER', 'ModuleBuilder'), 'ModuleBuilder.main("mb")');
+            $ajax->addCrumb($_REQUEST ['view_package'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$this->editPackage.'")');
+            $ajax->addCrumb($this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$this->editPackage.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&MB=1&view_package='.$this->editPackage.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_DASHLET', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=dashlet&MB=1&view_package='.$this->editPackage.'&view_module='.$this->editModule.'")');
 
             $ViewLabel = ($this->editLayout == MB_DASHLET) ? 'LBL_DASHLETLISTVIEW' : 'LBL_DASHLETSEARCHVIEW';
-            $ajax->addCrumb ( translate ($ViewLabel, 'ModuleBuilder' ), '' ) ;
-        }else{
-            $ajax->addCrumb ( translate($this->editModule), 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&view_module=' . $this->editModule . '")');
-            $ajax->addCrumb ( translate('LBL_DASHLET', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=dashlet&view_module=' . $this->editModule . '")' );
+            $ajax->addCrumb(translate($ViewLabel, 'ModuleBuilder'), '');
+        } else {
+            $ajax->addCrumb(translate($this->editModule), 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate('LBL_DASHLET', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=dashlet&view_module='.$this->editModule.'")');
             $ViewLabel = ($this->editLayout == MB_DASHLET) ? 'LBL_DASHLETLISTVIEW' : 'LBL_DASHLETSEARCHVIEW';
-            $ajax->addCrumb ( translate ($ViewLabel, 'ModuleBuilder' ), '' ) ;
+            $ajax->addCrumb(translate($ViewLabel, 'ModuleBuilder'), '');
         }
-        return $ajax ;
+        return $ajax;
     }
 
     function constructSmarty($parser)
     {
-        $smarty = new Sugar_Smarty ( ) ;
-        $smarty->assign ( 'translate', true ) ;
-        $smarty->assign ( 'language', $parser->getLanguage () ) ;
+        $smarty = new Sugar_Smarty( );
+        $smarty->assign('translate', true);
+        $smarty->assign('language', $parser->getLanguage());
 		
-        $smarty->assign ( 'view', $this->editLayout ) ;
-        $smarty->assign ( 'action', 'dashletSave' ) ;
-        $smarty->assign( 'module', 'ModuleBuilder');
-        $smarty->assign ( 'view_module', $this->editModule ) ;
-        $smarty->assign ( 'field_defs', $parser->getFieldDefs () ) ;
-        $helpName = (isset( $_REQUEST['view']) && $_REQUEST['view']=='dashletsearch') ? 'searchViewEditor' : 'listViewEditor';
-        $smarty->assign ( 'helpName', $helpName ) ;
-        $smarty->assign ( 'helpDefault', 'modify' ) ;
+        $smarty->assign('view', $this->editLayout);
+        $smarty->assign('action', 'dashletSave');
+        $smarty->assign('module', 'ModuleBuilder');
+        $smarty->assign('view_module', $this->editModule);
+        $smarty->assign('field_defs', $parser->getFieldDefs());
+        $helpName = (isset($_REQUEST['view']) && $_REQUEST['view'] == 'dashletsearch') ? 'searchViewEditor' : 'listViewEditor';
+        $smarty->assign('helpName', $helpName);
+        $smarty->assign('helpDefault', 'modify');
     	if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
-            $module = & $mb->getPackageModule ( $this->editPackage, $this->editModule ) ;
+			$mb = new ModuleBuilder( );
+            $module = & $mb->getPackageModule($this->editPackage, $this->editModule);
 		    $smarty->assign('current_mod_strings', $module->getModStrings());
 		}
-        $smarty->assign ( 'title', $this->_constructTitle () ) ;
-        $groups = array ( ) ;
-        foreach ( $parser->columns as $column => $function )
+        $smarty->assign('title', $this->_constructTitle());
+        $groups = array( );
+        foreach ($parser->columns as $column => $function)
         {
             // 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);
 
         global $image_path, $mod_strings;
-        $imageSave = SugarThemeRegistry::current()->getImage('studio_save','',null,null,'.gif',$mod_strings['LBL_BTN_SAVE']) ;
+        $imageSave = SugarThemeRegistry::current()->getImage('studio_save', '', null, null, '.gif', $mod_strings['LBL_BTN_SAVE']);
 
 //        $imageHelp = SugarThemeRegistry::current()->getImage('help','',null,null,'.gif',$mod_strings['LBL_SECTION_HELP']) ;
 
 
-        $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
+        $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")";
         if (isset($this->searchlayout))
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
+            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")";
 
-        $buttons = array ( ) ;
-        if (! $this->fromModuleBuilder)
+        $buttons = array( );
+        if (!$this->fromModuleBuilder)
         {
-            $buttons [] = array ( 'name' => 'savebtn' , 'image' => $imageSave , 'text' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVEPUBLISH' ] , 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'" ) ;
+            $buttons [] = array('name' => 'savebtn', 'image' => $imageSave, 'text' => $GLOBALS ['mod_strings'] ['LBL_BTN_SAVEPUBLISH'], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'");
         } else
         {
-            $buttons [] = array ( 'name' => 'mbsavebtn' , 'image' => $imageSave , 'text' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVE' ] , 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'" ) ;
+            $buttons [] = array('name' => 'mbsavebtn', 'image' => $imageSave, 'text' => $GLOBALS ['mod_strings'] ['LBL_BTN_SAVE'], 'actionScript' => "onclick='studiotabs.generateGroupForm(\"edittabs\");ModuleBuilder.state.isDirty=false;ModuleBuilder.submitForm(\"edittabs\" )'");
         }
-        $buttons [] = array ( 'name' => 'historyBtn' , 'text' => translate ( 'LBL_HISTORY' ) , 'actionScript' => "onclick='$histaction'" ) ;
-        $smarty->assign ( 'buttons', $this->_buildImageButtons ( $buttons ) ) ;
-        $editImage = SugarThemeRegistry::current()->getImage('edit_inline','',null,null,'.gif',$mod_strings['LBL_EDIT']) ;
+        $buttons [] = array('name' => 'historyBtn', 'text' => translate('LBL_HISTORY'), 'actionScript' => "onclick='$histaction'");
+        $smarty->assign('buttons', $this->_buildImageButtons($buttons));
+        $editImage = SugarThemeRegistry::current()->getImage('edit_inline', '', null, null, '.gif', $mod_strings['LBL_EDIT']);
 
-        $smarty->assign ( 'editImage', $editImage ) ;
-        $deleteImage = SugarThemeRegistry::current()->getImage('delete_inline','',null,null,'.gif',$mod_strings['LBL_MB_DELETE']) ;
+        $smarty->assign('editImage', $editImage);
+        $deleteImage = SugarThemeRegistry::current()->getImage('delete_inline', '', null, null, '.gif', $mod_strings['LBL_MB_DELETE']);
 
-        $smarty->assign ( 'deleteImage', $deleteImage ) ;
-        $smarty->assign ( 'MOD', $GLOBALS [ 'mod_strings' ] ) ;
+        $smarty->assign('deleteImage', $deleteImage);
+        $smarty->assign('MOD', $GLOBALS ['mod_strings']);
 
         if ($this->fromModuleBuilder)
         {
-            $smarty->assign ( 'MB', true ) ;
-            $smarty->assign ( 'view_package', $this->editPackage ) ;
-            $smarty->assign ( 'description', $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_DESCRIPTION' ] ) ;
+            $smarty->assign('MB', true);
+            $smarty->assign('view_package', $this->editPackage);
+            $smarty->assign('description', $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_DESCRIPTION']);
 
         } else
         {
-            $smarty->assign ( 'description', $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_DESCRIPTION' ] ) ;
+            $smarty->assign('description', $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_DESCRIPTION']);
         }
 
-        return $smarty ;
+        return $smarty;
     }
 
     function _constructTitle()
     {
-        global $app_list_strings ;
+        global $app_list_strings;
 
         if ($this->fromModuleBuilder)
-            $title = $this->editModule ;
+            $title = $this->editModule;
         else
-            $title =  $app_list_strings [ 'moduleList' ] [ $this->editModule ] ;
+            $title = $app_list_strings ['moduleList'] [$this->editModule];
         
-        return $GLOBALS [ 'mod_strings' ] [ 'LBL_LISTVIEW_EDIT' ] . ':&nbsp;' . $title ;
+        return $GLOBALS ['mod_strings'] ['LBL_LISTVIEW_EDIT'].':&nbsp;'.$title;
     }
 }

modules/ModuleBuilder/views/view.modulelabels.php

Spacing +9 added lines, -9 removed lines

@@ -56,7 +56,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -64,7 +64,7 @@ 
 	function display()
 	{
  		global $mod_strings;
-        $bak_mod_strings=$mod_strings;
+        $bak_mod_strings = $mod_strings;
  		$smarty = new Sugar_Smarty();
         $smarty->assign('mod_strings', $mod_strings);
  		$package_name = $_REQUEST['view_package'];
@@ -76,8 +76,8 @@ 
 		$package = $mb->packages[$_REQUEST['view_package']];
 		$package->getModule($module_name);
 		$mbModule = $package->modules[$module_name];
-		$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'];
 		}
 	        //need to change the following to interface with MBlanguage.
@@ -87,20 +87,20 @@ 
 		$smarty->assign('selected_lang', $selected_lang);
 		$smarty->assign('view_package', $package_name);
 		$smarty->assign('view_module', $module_name);
-		$smarty->assign('mb','1');
+		$smarty->assign('mb', '1');
 		$smarty->assign('available_languages', get_languages());
 		///////////////////////////////////////////////////////////////////
  		////ASSISTANT
- 		$smarty->assign('assistant',array('group'=>'module', 'key'=>'labels'));
+ 		$smarty->assign('assistant', array('group'=>'module', 'key'=>'labels'));
 		/////////////////////////////////////////////////////////////////
 	 	////ASSISTANT
 
 		$ajax = new AjaxCompose();
 		$ajax->addCrumb($bak_mod_strings['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
-		$ajax->addCrumb($package_name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name. '")');
-        $ajax->addCrumb($module_name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$package->name.'&view_module='. $module_name . '")');
+		$ajax->addCrumb($package_name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
+        $ajax->addCrumb($module_name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$package->name.'&view_module='.$module_name.'")');
         $ajax->addCrumb($bak_mod_strings['LBL_LABELS'], '');
-		$ajax->addSection('center', $bak_mod_strings['LBL_LABELS'],$smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl'));
+		$ajax->addSection('center', $bak_mod_strings['LBL_LABELS'], $smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl'));
 		echo $ajax->getJavascript();
 	}
 }

modules/ModuleBuilder/views/view.history.php

Spacing +74 added lines, -74 removed lines

@@ -38,13 +38,13 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-require_once ('modules/ModuleBuilder/parsers/views/History.php') ;
-require_once ('modules/ModuleBuilder/parsers/ParserFactory.php') ;
+require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+require_once ('modules/ModuleBuilder/parsers/views/History.php');
+require_once ('modules/ModuleBuilder/parsers/ParserFactory.php');
 
 class ViewHistory extends SugarView
 {
-    var $pageSize = 10 ;
+    var $pageSize = 10;
 
     /**
 	 * @see SugarView::_getModuleTitleParams()
@@ -54,125 +54,125 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
 
-	function display ()
+	function display()
     {
-        $this->layout = strtolower ( $_REQUEST [ 'view' ] ) ;
+        $this->layout = strtolower($_REQUEST ['view']);
         
-        $subpanelName = null ;
-        if ((strtolower ( $this->layout ) == 'listview') && (!empty ( $_REQUEST [ 'subpanel' ] )))
+        $subpanelName = null;
+        if ((strtolower($this->layout) == 'listview') && (!empty ($_REQUEST ['subpanel'])))
         {
-            $subpanelName = $_REQUEST [ 'subpanel' ] ;
+            $subpanelName = $_REQUEST ['subpanel'];
             
         }
         
-        $packageName = (isset ( $_REQUEST [ 'view_package' ] ) && (strtolower ( $_REQUEST [ 'view_package' ] ) != 'studio')) ? $_REQUEST [ 'view_package' ] : null ;
-        $this->module = $_REQUEST [ 'view_module' ] ;
+        $packageName = (isset ($_REQUEST ['view_package']) && (strtolower($_REQUEST ['view_package']) != 'studio')) ? $_REQUEST ['view_package'] : null;
+        $this->module = $_REQUEST ['view_module'];
         
-        $this->parser = ParserFactory::getParser ( $this->layout, $this->module, $packageName, $subpanelName ) ;
-        $this->history = $this->parser->getHistory () ;
-        $action = ! empty ( $_REQUEST [ 'histAction' ] ) ? $_REQUEST [ 'histAction' ] : 'browse' ;
-        $GLOBALS['log']->debug( get_class($this)."->display(): performing History action {$action}" ) ;
-        $this->$action () ;
+        $this->parser = ParserFactory::getParser($this->layout, $this->module, $packageName, $subpanelName);
+        $this->history = $this->parser->getHistory();
+        $action = !empty ($_REQUEST ['histAction']) ? $_REQUEST ['histAction'] : 'browse';
+        $GLOBALS['log']->debug(get_class($this)."->display(): performing History action {$action}");
+        $this->$action();
     }
 
-    function browse ()
+    function browse()
     {
-        $smarty = new Sugar_Smarty ( ) ;
-        global $mod_strings ;
-        $smarty->assign ( 'mod_strings', $mod_strings ) ;
-        $smarty->assign ( 'view_module', $this->module ) ;
-        $smarty->assign ( 'view', $this->layout ) ;
+        $smarty = new Sugar_Smarty( );
+        global $mod_strings;
+        $smarty->assign('mod_strings', $mod_strings);
+        $smarty->assign('view_module', $this->module);
+        $smarty->assign('view', $this->layout);
         
-        if (! empty ( $_REQUEST [ 'subpanel' ] ))
+        if (!empty ($_REQUEST ['subpanel']))
         {
-            $smarty->assign ( 'subpanel', $_REQUEST [ 'subpanel' ] ) ;
+            $smarty->assign('subpanel', $_REQUEST ['subpanel']);
         }
-        $stamps = array ( ) ;
-        global $timedate ;
-        $userFormat = $timedate->get_date_time_format () ;
-        $page = ! empty ( $_REQUEST [ 'page' ] ) ? $_REQUEST [ 'page' ] : 0 ;
+        $stamps = array( );
+        global $timedate;
+        $userFormat = $timedate->get_date_time_format();
+        $page = !empty ($_REQUEST ['page']) ? $_REQUEST ['page'] : 0;
         $count = $this->history->getCount();
-        $ts = $this->history->getNth ( $page * $this->pageSize ) ;
-        $snapshots = array ( ) ;
-        for ( $i = 0 ; $i <= $this->pageSize && $ts > 0 ; $i ++ )
+        $ts = $this->history->getNth($page * $this->pageSize);
+        $snapshots = array( );
+        for ($i = 0; $i <= $this->pageSize && $ts > 0; $i++)
         {
             $dbDate = $timedate->fromTimestamp($ts)->asDb();
-            $displayTS = $timedate->to_display_date_time ( $dbDate ) ;
+            $displayTS = $timedate->to_display_date_time($dbDate);
             if ($page * $this->pageSize + $i + 1 == $count)
                 $displayTS = translate("LBL_MB_DEFAULT_LAYOUT");
-            $snapshots [ $ts ] = $displayTS ;
-            $ts = $this->history->getNext () ;
+            $snapshots [$ts] = $displayTS;
+            $ts = $this->history->getNext();
         }
-        if (count ( $snapshots ) > $this->pageSize)
+        if (count($snapshots) > $this->pageSize)
         {
-            $smarty->assign ( 'nextPage', true ) ;
+            $smarty->assign('nextPage', true);
         }
-        $snapshots = array_slice ( $snapshots, 0, $this->pageSize, true ) ;
-        $smarty->assign ( 'currentPage', $page ) ;
-        $smarty->assign ( 'snapshots', $snapshots ) ;
+        $snapshots = array_slice($snapshots, 0, $this->pageSize, true);
+        $smarty->assign('currentPage', $page);
+        $smarty->assign('snapshots', $snapshots);
         
-        $html = $smarty->fetch ( 'modules/ModuleBuilder/tpls/history.tpl' ) ;
-        echo $html ;
+        $html = $smarty->fetch('modules/ModuleBuilder/tpls/history.tpl');
+        echo $html;
     }
 
-    function preview ()
+    function preview()
     {
-        global $mod_strings ;
-        if (! isset ( $_REQUEST [ 'sid' ] ))
+        global $mod_strings;
+        if (!isset ($_REQUEST ['sid']))
         {
-            die ( 'SID Required' ) ;
+            die ('SID Required');
         }
-        $sid = $_REQUEST [ 'sid' ] ;
+        $sid = $_REQUEST ['sid'];
         $subpanel = '';
-        if (! empty ( $_REQUEST [ 'subpanel' ] ))
+        if (!empty ($_REQUEST ['subpanel']))
         {
-            $subpanel = ',"' . $_REQUEST [ 'subpanel' ] . '"' ;
+            $subpanel = ',"'.$_REQUEST ['subpanel'].'"';
         }
-        echo "<input type='button' name='close$sid' value='". translate ( 'LBL_BTN_CLOSE' )."' " . 
-                "class='button' onclick='ModuleBuilder.tabPanel.removeTab(ModuleBuilder.tabPanel.get(\"activeTab\"));' style='margin:5px;'>" . 
-             "<input type='button' name='restore$sid' value='" . translate ( 'LBL_MB_RESTORE' ) . "' " .  
-                "class='button' onclick='ModuleBuilder.history.revert(\"$this->module\",\"{$this->layout}\",\"$sid\"$subpanel);' style='margin:5px;'>" ;
-        $this->history->restoreByTimestamp ( $sid ) ;
-        $view ;
+        echo "<input type='button' name='close$sid' value='".translate('LBL_BTN_CLOSE')."' ". 
+                "class='button' onclick='ModuleBuilder.tabPanel.removeTab(ModuleBuilder.tabPanel.get(\"activeTab\"));' style='margin:5px;'>". 
+             "<input type='button' name='restore$sid' value='".translate('LBL_MB_RESTORE')."' ".  
+                "class='button' onclick='ModuleBuilder.history.revert(\"$this->module\",\"{$this->layout}\",\"$sid\"$subpanel);' style='margin:5px;'>";
+        $this->history->restoreByTimestamp($sid);
+        $view;
         if ($this->layout == 'listview')
         {
-            require_once ("modules/ModuleBuilder/views/view.listview.php") ;
-            $view = new ViewListView ( ) ;
+            require_once ("modules/ModuleBuilder/views/view.listview.php");
+            $view = new ViewListView( );
         } else if ($this->layout == 'basic_search' || $this->layout == 'advanced_search')
         {
-            require_once ("modules/ModuleBuilder/views/view.searchview.php") ;
-            $view = new ViewSearchView ( ) ;
+            require_once ("modules/ModuleBuilder/views/view.searchview.php");
+            $view = new ViewSearchView( );
         } else if ($this->layout == 'dashlet' || $this->layout == 'dashletsearch')
         {
-        	require_once ("modules/ModuleBuilder/views/view.dashlet.php") ;
-        	$view = new ViewDashlet ( ) ;
-        }  else if ($this->layout == 'popuplist' || $this->layout == 'popupsearch')
+        	require_once ("modules/ModuleBuilder/views/view.dashlet.php");
+        	$view = new ViewDashlet( );
+        } else if ($this->layout == 'popuplist' || $this->layout == 'popupsearch')
         {
-        	require_once ("modules/ModuleBuilder/views/view.popupview.php") ;
-        	$view = new ViewPopupview ( ) ;
+        	require_once ("modules/ModuleBuilder/views/view.popupview.php");
+        	$view = new ViewPopupview( );
         } else
         {
-            require_once ("modules/ModuleBuilder/views/view.layoutview.php") ;
-            $view = new ViewLayoutView ( ) ;
+            require_once ("modules/ModuleBuilder/views/view.layoutview.php");
+            $view = new ViewLayoutView( );
         }
         
-        $view->display ( true ) ;
-        $this->history->undoRestore () ;
+        $view->display(true);
+        $this->history->undoRestore();
     }
 
-    function restore ()
+    function restore()
     {
-        if (! isset ( $_REQUEST [ 'sid' ] ))
+        if (!isset ($_REQUEST ['sid']))
         {
-            die ( 'SID Required' ) ;
+            die ('SID Required');
         }
-        $sid = $_REQUEST [ 'sid' ] ;
-        $this->history->restoreByTimestamp ( $sid ) ;
+        $sid = $_REQUEST ['sid'];
+        $this->history->restoreByTimestamp($sid);
     }
 
 	/**
@@ -181,6 +181,6 @@ 
  	 */
     function unrestore() 
     {
-    	$this->history->undoRestore () ;
+    	$this->history->undoRestore();
     }
 }

modules/ModuleBuilder/views/view.labels.php

Spacing +31 added lines, -31 removed lines

@@ -55,7 +55,7 @@ 
 	    global $mod_strings;
 
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -65,7 +65,7 @@ 
  	function display()
  	{
 		$editModule = $_REQUEST['view_module'];
-		$allLabels = (!empty($_REQUEST['labels']) && $_REQUEST['labels']== 'all');
+		$allLabels = (!empty($_REQUEST['labels']) && $_REQUEST['labels'] == 'all');
 
  		if (!isset($_REQUEST['MB']))
 		{
@@ -73,15 +73,15 @@ 
 		    $moduleNames = array_change_key_case($app_list_strings['moduleList']);
 		    $translatedEditModule = $moduleNames[strtolower($editModule)];
 		}
-		$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 = new Sugar_Smarty();
 		global $mod_strings;
         $smarty->assign('mod_strings', $mod_strings);
-		$smarty->assign('available_languages',get_languages());
+		$smarty->assign('available_languages', get_languages());
 
 
         $objectName = BeanFactory::getObjectName($editModule);
@@ -89,28 +89,28 @@ 
         global $dictionary;
         $vnames = array();
 		//jchi 24557 . We should list all the lables in viewdefs(list,detail,edit,quickcreate) that the user can edit them.
-		require_once 'modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php' ;
-        $parser = new ListLayoutMetaDataParser ( MB_LISTVIEW, $editModule ) ;
-        foreach ( $parser->getLayout() as $key => $def )
+		require_once 'modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php';
+        $parser = new ListLayoutMetaDataParser(MB_LISTVIEW, $editModule);
+        foreach ($parser->getLayout() as $key => $def)
         {
-        	if(isset($def['label']) ) {
+        	if (isset($def['label'])) {
                $vnames[$def['label']] = $def['label'];
         	}
         }
 
-       require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
+       require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php';
         $variableMap = $this->getVariableMap($editModule);
-        foreach($variableMap as $key => $value){
-        	$gridLayoutMetaDataParserTemp = new GridLayoutMetaDataParser ( $value, $editModule) ;
-        	foreach ( $gridLayoutMetaDataParserTemp->getLayout() as $panel)
+        foreach ($variableMap as $key => $value) {
+        	$gridLayoutMetaDataParserTemp = new GridLayoutMetaDataParser($value, $editModule);
+        	foreach ($gridLayoutMetaDataParserTemp->getLayout() as $panel)
 	        {
-	                foreach ( $panel as $row )
+	                foreach ($panel as $row)
 	                {
-	                    foreach ( $row as $fieldArray )
+	                    foreach ($row as $fieldArray)
 	                    { // fieldArray is an array('name'=>name,'label'=>label)
-	                        if (isset ( $fieldArray [ 'label' ] ))
+	                        if (isset ($fieldArray ['label']))
 	                        {
-	                            $vnames[$fieldArray [ 'label' ] ] = $fieldArray [ 'label' ] ;
+	                            $vnames[$fieldArray ['label']] = $fieldArray ['label'];
 	                        }
 	                    }
 	                }
@@ -119,14 +119,14 @@ 
         //end
 
         //Get Subpanel Labels:
-        require_once ('include/SubPanel/SubPanel.php') ;
-        $subList =  SubPanel::getModuleSubpanels ( $editModule );
-        foreach($subList as $subpanel => $titleLabel) {
+        require_once ('include/SubPanel/SubPanel.php');
+        $subList = SubPanel::getModuleSubpanels($editModule);
+        foreach ($subList as $subpanel => $titleLabel) {
         	$vnames[$titleLabel] = $titleLabel;
         }
 
-        foreach($dictionary[$objectName]['fields'] as $name=>$def) {
-        	if(isset($def['vname'])) {
+        foreach ($dictionary[$objectName]['fields'] as $name=>$def) {
+        	if (isset($def['vname'])) {
                $vnames[$def['vname']] = $def['vname'];
         	}
 		}
@@ -134,9 +134,9 @@ 
 
  	    //we shouldn't set the $refresh=true here, or will lost template language mod_strings.
  	    //return_module_language($selected_lang, $editModule,false) : the mod_strings will be included from cache files here.
-        foreach(return_module_language($selected_lang, $editModule,false) as $name=>$label) {
+        foreach (return_module_language($selected_lang, $editModule, false) as $name=>$label) {
         		//#25294
-        	 	if($allLabels || isset($vnames[$name]) || preg_match( '/lbl_city|lbl_country|lbl_billing_address|lbl_alt_address|lbl_shipping_address|lbl_postal_code|lbl_state$/si' , $name)) {
+        	 	if ($allLabels || isset($vnames[$name]) || preg_match('/lbl_city|lbl_country|lbl_billing_address|lbl_alt_address|lbl_shipping_address|lbl_postal_code|lbl_state$/si', $name)) {
                     $formatted_mod_strings[$name] = htmlentities($label, ENT_QUOTES, 'UTF-8');
         	 	}
         }
@@ -146,12 +146,12 @@ 
             "custom/modules/$editModule/language/$selected_lang.lang.php",
             "custom/modules/$editModule/Ext/Language/$selected_lang.lang.ext.php"
         );
-        foreach($files as $langfile){
+        foreach ($files as $langfile) {
         	$mod_strings = array();
         	if (is_file($langfile))
         	{
         	   include($langfile);
-        	   foreach($mod_strings as $key => $label)
+        	   foreach ($mod_strings as $key => $label)
         	   {
                     $formatted_mod_strings[$key] = htmlentities($label, ENT_QUOTES, 'UTF-8');
         	   }
@@ -166,7 +166,7 @@ 
 		$smarty->assign('defaultHelp', 'labelsBtn');
 		$smarty->assign('assistant', array('key'=>'labels', 'group'=>'module'));
 		$smarty->assign('labels_choice', $mod_strings['labelTypes']);
-		$smarty->assign('labels_current', $allLabels?"all":"");
+		$smarty->assign('labels_current', $allLabels ? "all" : "");
 
 		$ajax = new AjaxCompose();
 		$ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
@@ -191,17 +191,17 @@ 
                                            'Quotes',
                                            'ProductTemplates');
         
-        if(in_array($module, $hideQuickCreateForModules))
+        if (in_array($module, $hideQuickCreateForModules))
         {
-            if(isset($variableMap['quickcreate']))
+            if (isset($variableMap['quickcreate']))
             {
                 unset($variableMap['quickcreate']);
             }
         }
         
-        if($module == 'KBDocuments')
+        if ($module == 'KBDocuments')
         {
-            $variableMap  = array();
+            $variableMap = array();
         }
         
         return $variableMap;

modules/ModuleBuilder/views/view.deletepackage.php

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(),
     	   );
     }
@@ -61,7 +61,7 @@ 
         
         $ajax = new AjaxCompose();
         $ajax->addSection('center', $mod_strings['LBL_PACKAGE_DELETED'], 
-            str_replace('[[package]]',$_REQUEST['package'],$mod_strings['LBL_PACKAGE_WAS_DELETED']));
+            str_replace('[[package]]', $_REQUEST['package'], $mod_strings['LBL_PACKAGE_WAS_DELETED']));
         echo $ajax->getJavascript();
  	}
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.home.php

Spacing +12 added lines, -12 removed lines

@@ -48,7 +48,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -58,19 +58,19 @@ 
 		global $current_user;
 		global $mod_strings;
 		$smarty = new Sugar_Smarty();
-		$smarty->assign('title' , $mod_strings['LBL_DEVELOPER_TOOLS']);
+		$smarty->assign('title', $mod_strings['LBL_DEVELOPER_TOOLS']);
 		$smarty->assign('question', $mod_strings['LBL_QUESTION_EDITOR']);
 		$smarty->assign('defaultHelp', 'mainHelp');
 		$this->generateHomeButtons();
 		$smarty->assign('buttons', $this->buttons);
-		$assistant=array('group'=>'main', 'key'=>'welcome');
-		$smarty->assign('assistant',$assistant);
+		$assistant = array('group'=>'main', 'key'=>'welcome');
+		$smarty->assign('assistant', $assistant);
 		//initialize Assistant's display property.
 		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
-		$smarty->assign('userPref',$userPref);
+		if (!$userPref) $userPref = "na";
+		$smarty->assign('userPref', $userPref);
 		$ajax = new AjaxCompose();
-		$ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
+		$ajax->addSection('center', $mod_strings['LBL_HOME'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
 		echo $ajax->getJavascript();
 	}
 
@@ -78,13 +78,13 @@ 
 	function generateHomeButtons() 
 	{
 	    global $current_user;
-        if(displayStudioForCurrentUser() == true) {
+        if (displayStudioForCurrentUser() == true) {
 		//$this->buttons['Application'] = array ('action' => '', 'imageTitle' => 'Application', 'size' => '128', 'help'=>'appBtn');
-		$this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array ('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
+		$this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
         }
-        if(is_admin($current_user)) {
-		$this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array ('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
+        if (is_admin($current_user)) {
+		$this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
         }
-		$this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array ('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
+		$this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
 	}
 }
\ No newline at end of file