adamjakab / SuiteCRM

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

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

modules/ModuleBuilder/views/view.dashlet.php

Indentation +17 added lines, -17 removed lines

@@ -68,16 +68,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(),
+            );
     }
 
     // DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
@@ -97,12 +97,12 @@ 
         $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 () ;
         }
     }
 
@@ -145,11 +145,11 @@ 
         $helpName = (isset( $_REQUEST['view']) && $_REQUEST['view']=='dashletsearch') ? 'searchViewEditor' : 'listViewEditor';
         $smarty->assign ( 'helpName', $helpName ) ;
         $smarty->assign ( 'helpDefault', 'modify' ) ;
-    	if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
+        if ($this->fromModuleBuilder) {
+            $mb = new ModuleBuilder ( ) ;
             $module = & $mb->getPackageModule ( $this->editPackage, $this->editModule ) ;
-		    $smarty->assign('current_mod_strings', $module->getModStrings());
-		}
+            $smarty->assign('current_mod_strings', $module->getModStrings());
+        }
         $smarty->assign ( 'title', $this->_constructTitle () ) ;
         $groups = array ( ) ;
         foreach ( $parser->columns as $column => $function )

modules/ModuleBuilder/views/view.modulelabels.php

Indentation +44 added lines, -44 removed lines

@@ -48,60 +48,60 @@
 
 class ViewModulelabels 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;
+    function display()
+    {
+            global $mod_strings;
         $bak_mod_strings=$mod_strings;
- 		$smarty = new Sugar_Smarty();
+            $smarty = new Sugar_Smarty();
         $smarty->assign('mod_strings', $mod_strings);
- 		$package_name = $_REQUEST['view_package'];
- 		$module_name = $_REQUEST['view_module'];
+            $package_name = $_REQUEST['view_package'];
+            $module_name = $_REQUEST['view_module'];
 
-		require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
-		$mb = new ModuleBuilder();
-		$mb->getPackage($_REQUEST['view_package']);
-		$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 = $GLOBALS['sugar_config']['default_language'];
-		}
-	        //need to change the following to interface with MBlanguage.
+        require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
+        $mb = new ModuleBuilder();
+        $mb->getPackage($_REQUEST['view_package']);
+        $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 = $GLOBALS['sugar_config']['default_language'];
+        }
+            //need to change the following to interface with MBlanguage.
 
         $smarty->assign('MOD', $mbModule->getModStrings($selected_lang));
-		$smarty->assign('APP', $GLOBALS['app_strings']);
-		$smarty->assign('selected_lang', $selected_lang);
-		$smarty->assign('view_package', $package_name);
-		$smarty->assign('view_module', $module_name);
-		$smarty->assign('mb','1');
-		$smarty->assign('available_languages', get_languages());
-		///////////////////////////////////////////////////////////////////
- 		////ASSISTANT
- 		$smarty->assign('assistant',array('group'=>'module', 'key'=>'labels'));
-		/////////////////////////////////////////////////////////////////
-	 	////ASSISTANT
+        $smarty->assign('APP', $GLOBALS['app_strings']);
+        $smarty->assign('selected_lang', $selected_lang);
+        $smarty->assign('view_package', $package_name);
+        $smarty->assign('view_module', $module_name);
+        $smarty->assign('mb','1');
+        $smarty->assign('available_languages', get_languages());
+        ///////////////////////////////////////////////////////////////////
+            ////ASSISTANT
+            $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 = 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($bak_mod_strings['LBL_LABELS'], '');
-		$ajax->addSection('center', $bak_mod_strings['LBL_LABELS'],$smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl'));
-		echo $ajax->getJavascript();
-	}
+        $ajax->addSection('center', $bak_mod_strings['LBL_LABELS'],$smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl'));
+        echo $ajax->getJavascript();
+    }
 }
 

modules/ModuleBuilder/views/view.history.php

Indentation +20 added lines, -20 removed lines

@@ -47,19 +47,19 @@ 
     var $pageSize = 10 ;
 
     /**
-	 * @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 ()
     {
         $this->layout = strtolower ( $_REQUEST [ 'view' ] ) ;
         
@@ -135,7 +135,7 @@ 
         }
         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' ) . "' " .  
+                "<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 ;
@@ -149,12 +149,12 @@ 
             $view = new ViewSearchView ( ) ;
         } else if ($this->layout == 'dashlet' || $this->layout == 'dashletsearch')
         {
-        	require_once ("modules/ModuleBuilder/views/view.dashlet.php") ;
-        	$view = new ViewDashlet ( ) ;
+            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") ;
@@ -175,12 +175,12 @@ 
         $this->history->restoreByTimestamp ( $sid ) ;
     }
 
-	/**
- 	 * Restores a layout to its current customized state. 
- 	 * Called when leaving a restored layout without saving.
- 	 */
+    /**
+     * Restores a layout to its current customized state. 
+     * Called when leaving a restored layout without saving.
+     */
     function unrestore() 
     {
-    	$this->history->undoRestore () ;
+        $this->history->undoRestore () ;
     }
 }

modules/ModuleBuilder/views/view.labels.php

Indentation +89 added lines, -89 removed lines

@@ -48,73 +48,73 @@ 
 class ViewLabels extends ViewModulefields
 {
     /**
-	 * @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()
- 	{
-		$editModule = $_REQUEST['view_module'];
-		$allLabels = (!empty($_REQUEST['labels']) && $_REQUEST['labels']== 'all');
+        //STUDIO LABELS ONLY//
+        //TODO Bundle Studio and ModuleBuilder label handling to increase maintainability.
+        function display()
+        {
+        $editModule = $_REQUEST['view_module'];
+        $allLabels = (!empty($_REQUEST['labels']) && $_REQUEST['labels']== 'all');
 
- 		if (!isset($_REQUEST['MB']))
-		{
-		    global $app_list_strings;
-		    $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 = $GLOBALS['sugar_config']['default_language'];
-		}
+            if (!isset($_REQUEST['MB']))
+        {
+            global $app_list_strings;
+            $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 = $GLOBALS['sugar_config']['default_language'];
+        }
 
-		$smarty = new Sugar_Smarty();
-		global $mod_strings;
+        $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);
         VardefManager::loadVardef($editModule, $objectName);
         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' ;
+        //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 )
         {
-        	if(isset($def['label']) ) {
-               $vnames[$def['label']] = $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 ( $panel as $row )
-	                {
-	                    foreach ( $row as $fieldArray )
-	                    { // fieldArray is an array('name'=>name,'label'=>label)
-	                        if (isset ( $fieldArray [ 'label' ] ))
-	                        {
-	                            $vnames[$fieldArray [ 'label' ] ] = $fieldArray [ 'label' ] ;
-	                        }
-	                    }
-	                }
-	        }
+            $gridLayoutMetaDataParserTemp = new GridLayoutMetaDataParser ( $value, $editModule) ;
+            foreach ( $gridLayoutMetaDataParserTemp->getLayout() as $panel)
+            {
+                    foreach ( $panel as $row )
+                    {
+                        foreach ( $row as $fieldArray )
+                        { // fieldArray is an array('name'=>name,'label'=>label)
+                            if (isset ( $fieldArray [ 'label' ] ))
+                            {
+                                $vnames[$fieldArray [ 'label' ] ] = $fieldArray [ 'label' ] ;
+                            }
+                        }
+                    }
+            }
         }
         //end
 
@@ -122,23 +122,23 @@ 
         require_once ('include/SubPanel/SubPanel.php') ;
         $subList =  SubPanel::getModuleSubpanels ( $editModule );
         foreach($subList as $subpanel => $titleLabel) {
-        	$vnames[$titleLabel] = $titleLabel;
+            $vnames[$titleLabel] = $titleLabel;
         }
 
         foreach($dictionary[$objectName]['fields'] as $name=>$def) {
-        	if(isset($def['vname'])) {
-               $vnames[$def['vname']] = $def['vname'];
-        	}
-		}
- 	    $formatted_mod_strings = array();
+            if(isset($def['vname'])) {
+                $vnames[$def['vname']] = $def['vname'];
+            }
+        }
+            $formatted_mod_strings = array();
 
- 	    //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.
+            //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) {
-        		//#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)) {
+                //#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)) {
                     $formatted_mod_strings[$name] = htmlentities($label, ENT_QUOTES, 'UTF-8');
-        	 	}
+                    }
         }
         //Grab everything from the custom files
         $mod_bak = $mod_strings;
@@ -147,49 +147,49 @@ 
             "custom/modules/$editModule/Ext/Language/$selected_lang.lang.ext.php"
         );
         foreach($files as $langfile){
-        	$mod_strings = array();
-        	if (is_file($langfile))
-        	{
-        	   include($langfile);
-        	   foreach($mod_strings as $key => $label)
-        	   {
+            $mod_strings = array();
+            if (is_file($langfile))
+            {
+                include($langfile);
+                foreach($mod_strings as $key => $label)
+                {
                     $formatted_mod_strings[$key] = htmlentities($label, ENT_QUOTES, 'UTF-8');
-        	   }
-        	}
+                }
+            }
         }
         $mod_strings = $mod_bak;
         ksort($formatted_mod_strings);
-		$smarty->assign('MOD', $formatted_mod_strings);
-		$smarty->assign('view_module', $editModule);
-		$smarty->assign('APP', $GLOBALS['app_strings']);
-		$smarty->assign('selected_lang', $selected_lang);
-		$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('MOD', $formatted_mod_strings);
+        $smarty->assign('view_module', $editModule);
+        $smarty->assign('APP', $GLOBALS['app_strings']);
+        $smarty->assign('selected_lang', $selected_lang);
+        $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":"");
 
-		$ajax = new AjaxCompose();
-		$ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
-		$ajax->addCrumb($translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$editModule.'")');
-		$ajax->addCrumb($mod_strings['LBL_LABELS'], '');
+        $ajax = new AjaxCompose();
+        $ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
+        $ajax->addCrumb($translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$editModule.'")');
+        $ajax->addCrumb($mod_strings['LBL_LABELS'], '');
 
- 		$html = $smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl');
- 		$ajax->addSection('center', $GLOBALS['mod_strings']['LBL_SECTION_EDLABELS'], $html);
- 		echo $ajax->getJavascript();
- 	}
+            $html = $smarty->fetch('modules/ModuleBuilder/tpls/labels.tpl');
+            $ajax->addSection('center', $GLOBALS['mod_strings']['LBL_SECTION_EDLABELS'], $html);
+            echo $ajax->getJavascript();
+        }
     
     // fixing bug #39749: Quick Create in Studio
     function getVariableMap($module)
     {
         $variableMap = array(MB_EDITVIEW => 'EditView', 
-                             MB_DETAILVIEW => 'DetailView', 
-                             MB_QUICKCREATE => 'QuickCreate');
+                                MB_DETAILVIEW => 'DetailView', 
+                                MB_QUICKCREATE => 'QuickCreate');
         
         $hideQuickCreateForModules = array('KBDocuments',
-                                           'ProjectTask',
-                                           'Campaigns',
-                                           'Quotes',
-                                           'ProductTemplates');
+                                            'ProjectTask',
+                                            'Campaigns',
+                                            'Quotes',
+                                            'ProductTemplates');
         
         if(in_array($module, $hideQuickCreateForModules))
         {

modules/ModuleBuilder/views/view.modulefield.php

Indentation +65 added lines, -65 removed lines

@@ -43,20 +43,20 @@ 
 class ViewModulefield 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()
+    {
         $ac = $this->fetch();
         echo $ac->getJavascript();
     }
@@ -76,21 +76,21 @@ 
             $field_name = '';
 
         $action = 'saveField'; // tyoung bug 17606: default action is to save as a dynamic field; but for standard OOB
-                               // fields we override this so don't create a new dynamic field instead of updating the existing field
+                                // fields we override this so don't create a new dynamic field instead of updating the existing field
 
         $isClone = false;
         if(!empty($this->view_object_map['is_clone']) && $this->view_object_map['is_clone']
             && (strcmp($field_name, "name") != 0)   // bug #35767, do not allow cloning of name field
             )
             $isClone = true;
-		/*
+        /*
 		$field_types =  array('varchar'=>'YourField', 'int'=>'Integer', 'float'=>'Decimal','bool'=>'Checkbox','enum'=>'DropDown',
 				'date'=>'Date', 'phone' => 'Phone', 'currency' => 'Currency', 'html' => 'HTML', 'radioenum' => 'Radio',
 				'relate' => 'Relate', 'address' => 'Address', 'text' => 'TextArea', 'url' => 'Link');
 		*/
-		$field_types = $GLOBALS['mod_strings']['fieldTypes'];
-		if (isset($field_types['encrypt']))
-		  unset($field_types['encrypt']);
+        $field_types = $GLOBALS['mod_strings']['fieldTypes'];
+        if (isset($field_types['encrypt']))
+            unset($field_types['encrypt']);
         $field_name_exceptions = array(
             //bug 22264: Field name must not be an SQL keyword.
             //Taken from SQL Server's list of reserved keywords; http://msdn.microsoft.com/en-us/library/aa238507(SQL.80).aspx
@@ -110,26 +110,26 @@ 
             'DROP','OPENROWSET','VIEW','DUMMY','OPENXML','WAITFOR','DUMP','OPTION','WHEN','ELSE','OR','WHERE',
             'END','ORDER','WHILE','ERRLVL','OUTER','WITH','ESCAPE','OVER','WRITETEXT',
             //Mysql Keywords from http://dev.mysql.com/doc/refman/5.0/en/reserved-words.html (those not in MSSQL's list)
-			'ANALYZE', 'ASENSITIVE', 'BEFORE', 'BIGINT', 'BINARY', 'BOTH', 'CALL', 'CHANGE', 'CHARACTER',
-			'CONDITION', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DELAYED',
-			'DESCRIBE', 'DETERMINISTIC', 'DISTINCTROW', 'DIV', 'DUAL', 'EACH', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXPLAIN',
-			'FALSE', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FORCE', 'FULLTEXT', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE',
-			'HOUR_SECOND', 'IGNORE', 'INFILE', 'INOUT', 'INSENSITIVE', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8',
-			'INTEGER', 'ITERATE', 'KEYS', 'LEADING', 'LEAVE', 'LIMIT', 'LINES', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK',
-			'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT',
-			'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NO_WRITE_TO_BINLOG', 'NUMERIC', 'OPTIMIZE',
-			'OPTIONALLY', 'OUT', 'OUTFILE', 'PURGE', 'READS', 'REAL', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE',
-			'REQUIRE', 'RLIKE', 'SCHEMAS', 'SECOND_MICROSECOND', 'SENSITIVE', 'SEPARATOR', 'SHOW', 'SMALLINT', 'SONAME',
-			'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS',
-			'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TERMINATED', 'TINYBLOB', 'TINYINT', 'TINYTEXT',
-			'TRAILING', 'TRUE', 'UNDO', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP',
-			'VARBINARY', 'VARCHARACTER', 'WRITE', 'XOR', 'YEAR_MONTH', 'ZEROFILL', 'CONNECTION', 'LABEL', 'UPGRADE',
-			//Oracle datatypes
+            'ANALYZE', 'ASENSITIVE', 'BEFORE', 'BIGINT', 'BINARY', 'BOTH', 'CALL', 'CHANGE', 'CHARACTER',
+            'CONDITION', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DELAYED',
+            'DESCRIBE', 'DETERMINISTIC', 'DISTINCTROW', 'DIV', 'DUAL', 'EACH', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXPLAIN',
+            'FALSE', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FORCE', 'FULLTEXT', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE',
+            'HOUR_SECOND', 'IGNORE', 'INFILE', 'INOUT', 'INSENSITIVE', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8',
+            'INTEGER', 'ITERATE', 'KEYS', 'LEADING', 'LEAVE', 'LIMIT', 'LINES', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK',
+            'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT',
+            'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NO_WRITE_TO_BINLOG', 'NUMERIC', 'OPTIMIZE',
+            'OPTIONALLY', 'OUT', 'OUTFILE', 'PURGE', 'READS', 'REAL', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE',
+            'REQUIRE', 'RLIKE', 'SCHEMAS', 'SECOND_MICROSECOND', 'SENSITIVE', 'SEPARATOR', 'SHOW', 'SMALLINT', 'SONAME',
+            'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS',
+            'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TERMINATED', 'TINYBLOB', 'TINYINT', 'TINYTEXT',
+            'TRAILING', 'TRUE', 'UNDO', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP',
+            'VARBINARY', 'VARCHARACTER', 'WRITE', 'XOR', 'YEAR_MONTH', 'ZEROFILL', 'CONNECTION', 'LABEL', 'UPGRADE',
+            //Oracle datatypes
             'DATE','VARCHAR','VARCHAR2','NVARCHAR2','CHAR','NCHAR','NUMBER','PLS_INTEGER','BINARY_INTEGER','LONG','TIMESTAMP',
-			'INTERVAL','RAW','ROWID','UROWID','MLSLABEL','CLOB','NCLOB','BLOB','BFILE','XMLTYPE',
-			//SugarCRM reserved
-        	'ID', 'ID_C', 'PARENT_NAME', 'PARENT_ID',
-			);
+            'INTERVAL','RAW','ROWID','UROWID','MLSLABEL','CLOB','NCLOB','BLOB','BFILE','XMLTYPE',
+            //SugarCRM reserved
+            'ID', 'ID_C', 'PARENT_NAME', 'PARENT_ID',
+            );
 
 
         //C.L. - Add support to mark related module id columns as reserved keywords
@@ -173,14 +173,14 @@ 
                 $fv->ss->assign('hideLevel', 3);
             }
             if($isClone && isset($vardef['type']) && $vardef['type'] == 'datetime'){
-            	$vardef['type'] = 'datetimecombo';
+                $vardef['type'] = 'datetimecombo';
             }
             
-			require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/DynamicFields/FieldCases.php') ;
             $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
             $tf->module = $module;
             $tf->populateFromRow($vardef);
-			$vardef = array_merge($vardef, $tf->get_field_def());
+            $vardef = array_merge($vardef, $tf->get_field_def());
 
             //          $GLOBALS['log']->debug('vardefs after loading = '.print_r($vardef,true));
            
@@ -190,10 +190,10 @@ 
             $enumFields = array();
             foreach($module->field_defs as $field => $def)
             {
-            	if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
-            	   $allowAutoInc = false;
-            	   continue;
-            	}
+                if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
+                    $allowAutoInc = false;
+                    continue;
+                }
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
                     if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
@@ -210,7 +210,7 @@ 
             }
             $fv->ss->assign('module', $module);
             if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+                $field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
             $edit_or_add = 'editField' ;
 
@@ -244,7 +244,7 @@ 
                 }
             }
 
-			require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/DynamicFields/FieldCases.php') ;
             $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
             $tf->module = $module;
             $tf->populateFromRow($vardef);
@@ -258,8 +258,8 @@ 
 
             if(isset($vardef['vname']))
                 $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
-			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
+                $field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
@@ -280,7 +280,7 @@ 
         }
 
         if($_REQUEST['action'] == 'RefreshField'){
-        	require_once('modules/DynamicFields/FieldCases.php');
+            require_once('modules/DynamicFields/FieldCases.php');
             $field = get_widget($_POST['type']);
             $field->populateFromPost();
             $vardef = $field->get_field_def();
@@ -289,16 +289,16 @@ 
         }
 
         foreach(array("formula", "default", "comments", "help", "visiblityGrid") as $toEscape)
-		{
-			if (!empty($vardef[$toEscape]) && is_string($vardef[$toEscape])) {
-	        	$vardef[$toEscape] = htmlentities($vardef[$toEscape], ENT_QUOTES, 'UTF-8');
-	        }
-		}
+        {
+            if (!empty($vardef[$toEscape]) && is_string($vardef[$toEscape])) {
+                $vardef[$toEscape] = htmlentities($vardef[$toEscape], ENT_QUOTES, 'UTF-8');
+            }
+        }
 		
         if((!empty($vardef['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
            || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) // bug #35767, do not allow cloning of name field
             {
-               $fv->ss->assign('no_duplicate', true);
+                $fv->ss->assign('no_duplicate', true);
             }
 
         $fv->ss->assign('action',$action);
@@ -318,25 +318,25 @@ 
         $existing_field_names = array () ;
         foreach ( $module->mbvardefs->vardefs['fields'] as $field )
         {
-        	if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
-        	{
-        		$triggers [] = $field [ 'name' ] ;
-        	}
+            if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
+            {
+                $triggers [] = $field [ 'name' ] ;
+            }
         	
-        	if (!isset($field['source']) || $field['source'] != 'non-db') {
-        		if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
-        		{
-        			$existing_field_names [] = strtoupper($matches[1]);	
-        		}
-        	}
+            if (!isset($field['source']) || $field['source'] != 'non-db') {
+                if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
+                {
+                    $existing_field_names [] = strtoupper($matches[1]);	
+                }
+            }
         }
         
         $fv->ss->assign('triggers',$triggers);
         $fv->ss->assign('existing_field_names', $json->encode($existing_field_names));
         $fv->ss->assign('mod_strings',$GLOBALS['mod_strings']);
 
-		// jchi #24880
-		// end
+        // jchi #24880
+        // end
 
 
         $layout = $fv->getLayout($vardef);

modules/ModuleBuilder/views/view.deletepackage.php

Indentation +12 added lines, -12 removed lines

@@ -42,20 +42,20 @@ 
 
 class Viewdeletepackage 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()
     {
         global $mod_strings;
         
@@ -63,5 +63,5 @@ 
         $ajax->addSection('center', $mod_strings['LBL_PACKAGE_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

Indentation +38 added lines, -38 removed lines

@@ -40,51 +40,51 @@
 require_once('modules/ModuleBuilder/MB/AjaxCompose.php');
 class ViewHome extends SugarView
 {
-	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+    /**
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
-		global $current_user;
-		global $mod_strings;
-		$smarty = new Sugar_Smarty();
-		$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);
-		//initialize Assistant's display property.
-		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		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'));
-		echo $ajax->getJavascript();
-	}
+    function display()
+    {
+        global $current_user;
+        global $mod_strings;
+        $smarty = new Sugar_Smarty();
+        $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);
+        //initialize Assistant's display property.
+        $userPref = $current_user->getPreference('mb_assist', 'Assistant');
+        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'));
+        echo $ajax->getJavascript();
+    }
 
 
-	function generateHomeButtons() 
-	{
-	    global $current_user;
+    function generateHomeButtons() 
+    {
+        global $current_user;
         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['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');
         }
         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_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