adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.deletemodule.php

Indentation +15 added lines, -15 removed lines

@@ -43,22 +43,22 @@
 class Viewdeletemodule extends SugarView
 {
 /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+ * @see SugarView::_getModuleTitleParams()
+ */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
- 		$ajax = new AjaxCompose();
-		$ajax->addSection('center', 'Module Deleted', $_REQUEST['module'] . ' was deleted from ' . $_REQUEST['package']);
-		echo $ajax->getJavascript(); 
- 	}
+    function display()
+    {
+            $ajax = new AjaxCompose();
+        $ajax->addSection('center', 'Module Deleted', $_REQUEST['module'] . ' was deleted from ' . $_REQUEST['package']);
+        echo $ajax->getJavascript(); 
+        }
 }
\ No newline at end of file

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

Indentation +51 added lines, -51 removed lines

@@ -69,16 +69,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
@@ -99,13 +99,13 @@ 
         $history = $parser->getHistory () ;
         $smarty = new Sugar_Smarty ( ) ;
         //Add in the module we are viewing to our current mod strings
-		if (! $this->fromModuleBuilder) {
-			global $current_language;
-			$editModStrings = return_module_language($current_language, $this->editModule);
-			$mod_strings = sugarArrayMerge($editModStrings, $mod_strings);
-		}
+        if (! $this->fromModuleBuilder) {
+            global $current_language;
+            $editModStrings = return_module_language($current_language, $this->editModule);
+            $mod_strings = sugarArrayMerge($editModStrings, $mod_strings);
+        }
         $smarty->assign('mod', $mod_strings);
-		$smarty->assign('MOD', $mod_strings);
+        $smarty->assign('MOD', $mod_strings);
         // assign buttons
         $images = array ( 'icon_save' => 'studio_save' , 'icon_publish' => 'studio_publish' , 'icon_address' => 'icon_Address' , 'icon_emailaddress' => 'icon_EmailAddress' , 'icon_phone' => 'icon_Phone' ) ;
         foreach ( $images as $image => $file )
@@ -127,9 +127,9 @@ 
 
             //Check if we need to synch edit view to other layouts
             if($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE){
-		        $parser2 = ParserFactory::getParser(MB_EDITVIEW,$this->editModule,$this->package);
+                $parser2 = ParserFactory::getParser(MB_EDITVIEW,$this->editModule,$this->package);
                 if($this->editLayout == MB_DETAILVIEW){
-		            $disableLayout = $parser2->getSyncDetailEditViews();
+                    $disableLayout = $parser2->getSyncDetailEditViews();
                 }
                 if(!empty($_REQUEST['copyFromEditView'])){
                     $editViewPanels = $parser2->convertFromCanonicalForm ( $parser2->_viewdefs [ 'panels' ] , $parser2->_fielddefs ) ;
@@ -138,34 +138,34 @@ 
                     $parser->setUseTabs($parser2->getUseTabs());
                     $parser->setTabDefs($parser2->getTabDefs());
                 }
-		    }
+            }
 
             if (! $this->fromModuleBuilder)
             {
-	            $buttons [] = array (
+                $buttons [] = array (
                     'id' => 'saveBtn' , 
                     'text' => translate ( 'LBL_BTN_SAVE' ) , 
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handleSave();'",
-                	'disabled' => $disableLayout, 
+                    'disabled' => $disableLayout, 
                 ) ;
                 $buttons [] = array ( 
                     'id' => 'publishBtn' , 
                     'text' => translate ( 'LBL_BTN_SAVEPUBLISH' ) , 
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handlePublish();'",
-                	'disabled' => $disableLayout, 
+                    'disabled' => $disableLayout, 
                 ) ;
                 $buttons [] = array ( 'id' => 'spacer' , 'width' => '33px' ) ;
                 $buttons [] = array ( 
-	                'id' => 'historyBtn' , 
-	                'text' => translate ( 'LBL_HISTORY' ) , 
-	                'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
+                    'id' => 'historyBtn' , 
+                    'text' => translate ( 'LBL_HISTORY' ) , 
+                    'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                     'disabled' => $disableLayout,
                 ) ;
                 $buttons [] = array ( 
-	                'id' => 'historyDefault' , 
-	                'text' => translate ( 'LBL_RESTORE_DEFAULT' ) , 
-	                'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
-                	'disabled' => $disableLayout, 
+                    'id' => 'historyDefault' , 
+                    'text' => translate ( 'LBL_RESTORE_DEFAULT' ) , 
+                    'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
+                    'disabled' => $disableLayout, 
                 ) ;
             } else
             {
@@ -205,15 +205,15 @@ 
         foreach ( $buttons as $button )
         {
             if ($button['id'] == "spacer") {
-            	$html .= "<td style='width:{$button['width']}'> </td>";
+                $html .= "<td style='width:{$button['width']}'> </td>";
             } else {
-        	    $html .= "<td><input id='{$button['id']}' type='button' valign='center' class='button' style='cursor:pointer' "
-        	       . "onmousedown='this.className=\"buttonOn\";return false;' onmouseup='this.className=\"button\"' "
-        	       . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'" ;
-        	    if(!empty($button['disabled'])){
-        	    	 $html .= " disabled";
-        	    }
-        	    $html .= "></td>";
+                $html .= "<td><input id='{$button['id']}' type='button' valign='center' class='button' style='cursor:pointer' "
+                    . "onmousedown='this.className=\"buttonOn\";return false;' onmouseup='this.className=\"button\"' "
+                    . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'" ;
+                if(!empty($button['disabled'])){
+                        $html .= " disabled";
+                }
+                $html .= "></td>";
             }
         }
 
@@ -243,10 +243,10 @@ 
         }
 
         $labels = array (
-        			MB_EDITVIEW => 'LBL_EDITVIEW' ,
-        			MB_DETAILVIEW => 'LBL_DETAILVIEW' ,
-        			MB_QUICKCREATE => 'LBL_QUICKCREATE',
-        			) ;
+                    MB_EDITVIEW => 'LBL_EDITVIEW' ,
+                    MB_DETAILVIEW => 'LBL_DETAILVIEW' ,
+                    MB_QUICKCREATE => 'LBL_QUICKCREATE',
+                    ) ;
 
         $layoutLabel = 'LBL_LAYOUTS' ;
         $layoutView = 'layouts' ;
@@ -255,8 +255,8 @@ 
         $ajax = new AjaxCompose ( ) ;
 
         $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+        if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
+            $translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
         else if (isset($this->sm))
         {
             foreach($this->sm->sources as $file => $def)
@@ -294,20 +294,20 @@ 
         }
 
         // set up language files
-		$smarty->assign ( 'language', $parser->getLanguage() ) ; // for sugar_translate in the smarty template
+        $smarty->assign ( 'language', $parser->getLanguage() ) ; // for sugar_translate in the smarty template
         $smarty->assign('from_mb',$this->fromModuleBuilder);
         $smarty->assign('calc_field_list', json_encode($parser->getCalculatedFields()));
-		if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
+        if ($this->fromModuleBuilder) {
+            $mb = new ModuleBuilder ( ) ;
             $module = & $mb->getPackageModule ( $this->package, $this->editModule ) ;
-		    $smarty->assign('current_mod_strings', $module->getModStrings());
-		}
+            $smarty->assign('current_mod_strings', $module->getModStrings());
+        }
 
         $ajax->addSection ( 'center', $translatedViewType, $smarty->fetch ( 'modules/ModuleBuilder/tpls/layoutView.tpl' ) ) ;
         if ($preview) {
-        	echo $smarty->fetch ( 'modules/ModuleBuilder/tpls/Preview/layoutView.tpl' );
-		} else {
-			echo $ajax->getJavascript () ;
-    	}
+            echo $smarty->fetch ( 'modules/ModuleBuilder/tpls/Preview/layoutView.tpl' );
+        } else {
+            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.modulefields.php

Indentation +39 added lines, -39 removed lines

@@ -45,20 +45,20 @@ 
     var $mbModule;
     
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
+    function display()
+    {
         $smarty = new Sugar_Smarty();
         global $mod_strings;
         $bak_mod_strings=$mod_strings;
@@ -92,13 +92,13 @@ 
                 if ($this->isValidStudioField($def))
                 {
                     $def['label'] = translate($def['vname'], $module_name);
-					//Custom relate fields will have a non-db source, but custom_module set
-                	if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
-                       $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
-                       $def['custom'] = true;
+                    //Custom relate fields will have a non-db source, but custom_module set
+                    if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
+                        $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
+                        $def['custom'] = true;
                     } else {
-                       $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
-                       $def['custom'] = false;
+                        $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
+                        $def['custom'] = false;
                     }
 
                     $def['type'] = isset($fieldTypes[$def['type']]) ? $fieldTypes[$def['type']] : ucfirst($def['type']);
@@ -174,17 +174,17 @@ 
                 }
                 foreach($v as $field => $def)
                 {
-                	if (isset($loadedFields[$field]))
+                    if (isset($loadedFields[$field]))
                     {
-                	   unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
+                        unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
                     } else {
-                       $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
-                       $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
-                       $loadedFields[$field] = true;
+                        $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
+                        $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
+                        $loadedFields[$field] = true;
                         
-                       $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
-                       $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
-                       $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
+                        $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
+                        $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
+                        $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
                     }
                 }
             }
@@ -241,29 +241,29 @@ 
     function isValidStudioField(
         $def
         )
-	{
-    	if (isset($def['studio'])) {
+    {
+        if (isset($def['studio'])) {
             if (is_array($def [ 'studio' ]))
             {
-    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
+                if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
                     return true;
-    			if (isset($def['studio']['required']) && $def['studio']['required'])
+                if (isset($def['studio']['required']) && $def['studio']['required'])
                     return true;
                     
-    		} else
-    		{
-    			if ($def['studio'] == 'visible')
+            } else
+            {
+                if ($def['studio'] == 'visible')
                     return true;
                 if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] )
                     return false;
             }
         }
-    	if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
-		{
-    		if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
-		  return true;
-		}
+        if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
+        {
+            if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
+            return true;
+        }
 		
-		return false;
-	}
+        return false;
+    }
 }
\ No newline at end of file