adamjakab / SuiteCRM

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

Spacing +9 added lines, -9 removed lines

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

modules/ModuleBuilder/views/view.history.php

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

Spacing +74 added lines, -74 removed lines

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

Braces +4 added lines, -3 removed lines

@@ -103,8 +103,9 @@ 
         {
             $dbDate = $timedate->fromTimestamp($ts)->asDb();
             $displayTS = $timedate->to_display_date_time ( $dbDate ) ;
-            if ($page * $this->pageSize + $i + 1 == $count)
-                $displayTS = translate("LBL_MB_DEFAULT_LAYOUT");
+            if ($page * $this->pageSize + $i + 1 == $count) {
+                            $displayTS = translate("LBL_MB_DEFAULT_LAYOUT");
+            }
             $snapshots [ $ts ] = $displayTS ;
             $ts = $this->history->getNext () ;
         }
@@ -151,7 +152,7 @@ 
         {
         	require_once ("modules/ModuleBuilder/views/view.dashlet.php") ;
         	$view = new ViewDashlet ( ) ;
-        }  else if ($this->layout == 'popuplist' || $this->layout == 'popupsearch')
+        } else if ($this->layout == 'popuplist' || $this->layout == 'popupsearch')
         {
         	require_once ("modules/ModuleBuilder/views/view.popupview.php") ;
         	$view = new ViewPopupview ( ) ;

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

Spacing +31 added lines, -31 removed lines

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

modules/ModuleBuilder/views/view.modulefields.php

Spacing +30 added lines, -30 removed lines

@@ -52,7 +52,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -61,7 +61,7 @@ 
 	{
         $smarty = new Sugar_Smarty();
         global $mod_strings;
-        $bak_mod_strings=$mod_strings;
+        $bak_mod_strings = $mod_strings;
         $smarty->assign('mod_strings', $mod_strings);
 
         $module_name = $_REQUEST['view_module'];
@@ -77,7 +77,7 @@ 
         //add datetimecombo type field from the vardef overrides to point to Datetime type
         $fieldTypes['datetime'] = $fieldTypes['datetimecombo'];
 
-        if(!isset($_REQUEST['view_package']) || $_REQUEST['view_package'] == 'studio') {
+        if (!isset($_REQUEST['view_package']) || $_REQUEST['view_package'] == 'studio') {
             //$this->loadPackageHelp($module_name);
             $studioClass = new stdClass;
             $studioClass->name = $module_name;
@@ -88,12 +88,12 @@ 
             global $dictionary;
             $f = array($mod_strings['LBL_HCUSTOM']=>array(), $mod_strings['LBL_HDEFAULT']=>array());
 
-            foreach($dictionary[$objectName]['fields'] as $def) {
+            foreach ($dictionary[$objectName]['fields'] as $def) {
                 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'])) {
+                	if (isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
                        $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
                        $def['custom'] = true;
                     } else {
@@ -122,7 +122,7 @@ 
             $ajax->addCrumb($mod_strings['LBL_STUDIO'], 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
             $ajax->addCrumb(translate($module_name), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$module_name.'")');
             $ajax->addCrumb($mod_strings['LBL_FIELDS'], '');
-            $ajax->addSection('center', $mod_strings['LBL_EDIT_FIELDS'],$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/fields.tpl'));
+            $ajax->addSection('center', $mod_strings['LBL_EDIT_FIELDS'], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/fields.tpl'));
             $_REQUEST['field'] = '';
 
             echo $ajax->getJavascript();
@@ -139,20 +139,20 @@ 
             $this->mbModule->mbvardefs->vardefs['fields'] = array_reverse($this->mbModule->mbvardefs->vardefs['fields'], true);
             $loadedFields = array();
 
-            if(file_exists($this->mbModule->path. '/language/'.$current_language.'.lang.php'))
+            if (file_exists($this->mbModule->path.'/language/'.$current_language.'.lang.php'))
             {
-                include($this->mbModule->path .'/language/'.$current_language.'.lang.php');
-                $this->mbModule->setModStrings($current_language,$mod_strings);
-            }elseif(file_exists($this->mbModule->path. '/language/en_us.lang.php')){
-                include($this->mbModule->path .'/language/en_us.lang.php');
-                $this->mbModule->setModStrings('en_us',$mod_strings);
+                include($this->mbModule->path.'/language/'.$current_language.'.lang.php');
+                $this->mbModule->setModStrings($current_language, $mod_strings);
+            }elseif (file_exists($this->mbModule->path.'/language/en_us.lang.php')) {
+                include($this->mbModule->path.'/language/en_us.lang.php');
+                $this->mbModule->setModStrings('en_us', $mod_strings);
             }
 
-            foreach($this->mbModule->mbvardefs->vardefs['fields'] as $k=>$v)
+            foreach ($this->mbModule->mbvardefs->vardefs['fields'] as $k=>$v)
             {
                 if ($k != $this->mbModule->name)
                 {
-                    foreach($v as $field => $def)
+                    foreach ($v as $field => $def)
                     {
                         if (in_array($field, array_keys($this->mbModule->mbvardefs->vardefs['fields'][$this->mbModule->name])))
                         {
@@ -164,15 +164,15 @@ 
                 }
             }
 
-            foreach($this->mbModule->mbvardefs->vardefs['fields'] as $k=>$v)
+            foreach ($this->mbModule->mbvardefs->vardefs['fields'] as $k=>$v)
             {
-                if($k != $module_name)
+                if ($k != $module_name)
                 {
-                    $titleLBL[$k]=translate("LBL_".strtoupper($k),'ModuleBuilder');
-                }else{
-                    $titleLBL[$k]=$k;
+                    $titleLBL[$k] = translate("LBL_".strtoupper($k), 'ModuleBuilder');
+                } else {
+                    $titleLBL[$k] = $k;
                 }
-                foreach($v as $field => $def)
+                foreach ($v as $field => $def)
                 {
                 	if (isset($loadedFields[$field]))
                     {
@@ -199,15 +199,15 @@ 
             $smarty->assign('title', $titleLBL);
             $smarty->assign('package', $package);
             $smarty->assign('module', $this->mbModule);
-            $smarty->assign('editLabelsMb','1');
+            $smarty->assign('editLabelsMb', '1');
             $smarty->assign('studio', false);
 
             $ajax = new AjaxCompose();
             $ajax->addCrumb($bak_mod_strings['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
-            $ajax->addCrumb($package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
-            $ajax->addCrumb($module_name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$package->name.'&view_module='. $module_name . '")');
+            $ajax->addCrumb($package->name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
+            $ajax->addCrumb($module_name, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$package->name.'&view_module='.$module_name.'")');
             $ajax->addCrumb($bak_mod_strings['LBL_FIELDS'], '');
-            $ajax->addSection('center', $bak_mod_strings["LBL_FIELDS"],$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/fields.tpl'));
+            $ajax->addSection('center', $bak_mod_strings["LBL_FIELDS"], $smarty->fetch('modules/ModuleBuilder/tpls/MBModule/fields.tpl'));
             $_REQUEST['field'] = '';
 
             echo $ajax->getJavascript();
@@ -220,7 +220,7 @@ 
         $name
         )
     {
-        $this->mbModule->help['default'] = (empty($name))?'create':'modify';
+        $this->mbModule->help['default'] = (empty($name)) ? 'create' : 'modify';
         $this->mbModule->help['group'] = 'module';
         $this->mbModule->help['group'] = 'module';
     }
@@ -229,11 +229,11 @@ 
         $def
         )
     {
-        if(!empty($def['parent_id']))
+        if (!empty($def['parent_id']))
             unset($def['parent_id']);
-        if(!empty($def['parent_type']))
+        if (!empty($def['parent_type']))
             unset($def['parent_type']);
-        if(!empty($def['currency_id']))
+        if (!empty($def['currency_id']))
             unset($def['currency_id']);
         return $def;
     }
@@ -243,7 +243,7 @@ 
         )
 	{
     	if (isset($def['studio'])) {
-            if (is_array($def [ 'studio' ]))
+            if (is_array($def ['studio']))
             {
     			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
                     return true;
@@ -254,7 +254,7 @@ 
     		{
     			if ($def['studio'] == 'visible')
                     return true;
-                if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] )
+                if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'])
                     return false;
             }
         }

Braces +26 added lines, -18 removed lines

@@ -143,7 +143,7 @@ 
             {
                 include($this->mbModule->path .'/language/'.$current_language.'.lang.php');
                 $this->mbModule->setModStrings($current_language,$mod_strings);
-            }elseif(file_exists($this->mbModule->path. '/language/en_us.lang.php')){
+            } elseif(file_exists($this->mbModule->path. '/language/en_us.lang.php')){
                 include($this->mbModule->path .'/language/en_us.lang.php');
                 $this->mbModule->setModStrings('en_us',$mod_strings);
             }
@@ -169,7 +169,7 @@ 
                 if($k != $module_name)
                 {
                     $titleLBL[$k]=translate("LBL_".strtoupper($k),'ModuleBuilder');
-                }else{
+                } else{
                     $titleLBL[$k]=$k;
                 }
                 foreach($v as $field => $def)
@@ -229,12 +229,15 @@ 
         $def
         )
     {
-        if(!empty($def['parent_id']))
-            unset($def['parent_id']);
-        if(!empty($def['parent_type']))
-            unset($def['parent_type']);
-        if(!empty($def['currency_id']))
-            unset($def['currency_id']);
+        if(!empty($def['parent_id'])) {
+                    unset($def['parent_id']);
+        }
+        if(!empty($def['parent_type'])) {
+                    unset($def['parent_type']);
+        }
+        if(!empty($def['currency_id'])) {
+                    unset($def['currency_id']);
+        }
         return $def;
     }
 	
@@ -245,23 +248,28 @@ 
     	if (isset($def['studio'])) {
             if (is_array($def [ 'studio' ]))
             {
-    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
-                    return true;
-    			if (isset($def['studio']['required']) && $def['studio']['required'])
-                    return true;
+    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true) {
+    			                    return true;
+    			}
+    			if (isset($def['studio']['required']) && $def['studio']['required']) {
+    			                    return true;
+    			}
                     
     		} else
     		{
-    			if ($def['studio'] == 'visible')
-                    return true;
-                if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] )
-                    return false;
+    			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 ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id')) {
+    				  return true;
+    		}
 		}
 		
 		return false;

Indentation +38 added lines, -38 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']);
@@ -183,15 +183,15 @@ 
                     {
                         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];
                         }
                     }
                 }
@@ -249,29 +249,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

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

Braces +49 added lines, -31 removed lines

@@ -66,14 +66,17 @@ 
         )
     {
         $fv = new FieldViewer();
-        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name']))$_REQUEST['field'] = $_REQUEST['name'];
+        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name'])) {
+            $_REQUEST['field'] = $_REQUEST['name'];
+        }
         $field_name = '';
-        if(!empty($this->view_object_map['field_name']))
-            $field_name = $this->view_object_map['field_name'];
-        elseif(!empty($_REQUEST['field']))
-            $field_name = $_REQUEST['field'];
-        else
-            $field_name = '';
+        if(!empty($this->view_object_map['field_name'])) {
+                    $field_name = $this->view_object_map['field_name'];
+        } elseif(!empty($_REQUEST['field'])) {
+                    $field_name = $_REQUEST['field'];
+        } else {
+                    $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
@@ -81,16 +84,18 @@ 
         $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;
+            ) {
+                    $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']);
+		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
@@ -163,12 +168,13 @@ 
             }
           
             if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))
-                    $vardef['type'] = $_REQUEST['type'];
+                if(!empty($_REQUEST['type'])) {
+                                    $vardef['type'] = $_REQUEST['type'];
+                }
                     $fv->ss->assign('hideLevel', 0);
-            }elseif(isset($vardef['custom_module'])){
+            } elseif(isset($vardef['custom_module'])){
                 $fv->ss->assign('hideLevel', 2);
-            }else{
+            } else{
                 $action = 'saveSugarField'; // tyoung - for OOB fields we currently only support modifying the label
                 $fv->ss->assign('hideLevel', 3);
             }
@@ -196,10 +202,14 @@ 
             	}
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
-                    if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
+                    if(!empty($def['studio']) && $def['studio'] == "false") {
+                        continue;
+                    }
+                    //bug51866 
                     $enumFields[$field] = translate($def['vname'], $moduleName);
-                    if (substr($enumFields[$field], -1) == ":")
-                        $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
+                    if (substr($enumFields[$field], -1) == ":") {
+                                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
+                    }
                 }
             }
             $fv->ss->assign( 'allowAutoInc', $allowAutoInc);   
@@ -209,8 +219,9 @@ 
                 $fv->ss->assign('lbl_value', htmlentities(translate($vardef['vname'], $moduleName), ENT_QUOTES, 'UTF-8'));
             }
             $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'];
+            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent')) {
+            				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            }
 
             $edit_or_add = 'editField' ;
 
@@ -232,14 +243,16 @@ 
             }
 
             if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))$vardef['type'] = $_REQUEST['type'];
+                if(!empty($_REQUEST['type'])) {
+                    $vardef['type'] = $_REQUEST['type'];
+                }
                     $fv->ss->assign('hideLevel', 0);
-            }else{
+            } else{
                 if(!empty($module->mbvardefs->vardef['fields'][$vardef['name']])){
                     $fv->ss->assign('hideLevel', 1);
-                }elseif(isset($vardef['custom_module'])){
+                } elseif(isset($vardef['custom_module'])){
                     $fv->ss->assign('hideLevel', 2);
-                }else{
+                } else{
                     $fv->ss->assign('hideLevel', 3); // tyoung bug 17350 - effectively mark template derived fields as readonly
                 }
             }
@@ -256,10 +269,12 @@ 
             $fv->ss->assign('package', $package);
             $fv->ss->assign('MB','1');
 
-            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(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'];
+			}
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
@@ -270,8 +285,9 @@ 
                     {
                         $enumFields[$field] = isset($module->mblanguage->strings[$current_language][$def['vname']]) ?
                             $this->mbModule->mblanguage->strings[$current_language][$def['vname']] : translate($field);
-                        if (substr($enumFields[$field], -1) == ":")
-                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                        if (substr($enumFields[$field], -1) == ":") {
+                                                    $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                        }
                     }
                 }
             }
@@ -296,9 +312,11 @@ 
 		}
 		
         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
+           || (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('action',$action);

Spacing +82 added lines, -82 removed lines

@@ -50,7 +50,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -66,11 +66,11 @@ 
         )
     {
         $fv = new FieldViewer();
-        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name']))$_REQUEST['field'] = $_REQUEST['name'];
+        if (empty($_REQUEST['field']) && !empty($_REQUEST['name']))$_REQUEST['field'] = $_REQUEST['name'];
         $field_name = '';
-        if(!empty($this->view_object_map['field_name']))
+        if (!empty($this->view_object_map['field_name']))
             $field_name = $this->view_object_map['field_name'];
-        elseif(!empty($_REQUEST['field']))
+        elseif (!empty($_REQUEST['field']))
             $field_name = $_REQUEST['field'];
         else
             $field_name = '';
@@ -79,7 +79,7 @@ 
                                // 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']
+        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;
@@ -94,21 +94,21 @@ 
         $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
-            'ADD','EXCEPT','PERCENT','ALL','EXEC','PLAN','ALTER','EXECUTE','PRECISION','AND','EXISTS','PRIMARY',
-            'ANY','EXIT','PRINT','AS','FETCH','PROC','ASC','FILE','PROCEDURE','AUTHORIZATION','FILLFACTOR','PUBLIC',
-            'BACKUP','FOR','RAISERROR','BEGIN','FOREIGN','READ','BETWEEN','FREETEXT','READTEXT','BREAK','FREETEXTTABLE',
-            'RECONFIGURE','BROWSE','FROM','REFERENCES','BULK','FULL','REPLICATION','BY','FUNCTION','RESTORE',
-            'CASCADE','GOTO','RESTRICT','CASE','GRANT','RETURN','CHECK','GROUP','REVOKE','CHECKPOINT','HAVING','RIGHT','CLOSE',
-            'HOLDLOCK','ROLLBACK','CLUSTERED','IDENTITY','ROWCOUNT','COALESCE','IDENTITY_INSERT','ROWGUIDCOL','COLLATE','IDENTITYCOL',
-            'RULE','COLUMN','IF','SAVE','COMMIT','IN','SCHEMA','COMPUTE','INDEX','SELECT','CONSTRAINT','INNER','SESSION_USER',
-            'CONTAINS','INSERT','SET','CONTAINSTABLE','INTERSECT','SETUSER','CONTINUE','INTO','SHUTDOWN','CONVERT','IS','SOME',
-            'CREATE','JOIN','STATISTICS','CROSS','KEY','SYSTEM_USER','CURRENT','KILL','TABLE','CURRENT_DATE','LEFT','TEXTSIZE',
-            'CURRENT_TIME','LIKE','THEN','CURRENT_TIMESTAMP','LINENO','TO','CURRENT_USER','LOAD','TOP','CURSOR','NATIONAL','TRAN',
-            'DATABASE','NOCHECK','TRANSACTION','DBCC','NONCLUSTERED','TRIGGER','DEALLOCATE','NOT','TRUNCATE','DECLARE','NULL','TSEQUAL',
-            'DEFAULT','NULLIF','UNION','DELETE','OF','UNIQUE','DENY','OFF','UPDATE','DESC','OFFSETS','UPDATETEXT',
-            'DISK','ON','USE','DISTINCT','OPEN','USER','DISTRIBUTED','OPENCONNECTOR','VALUES','DOUBLE','OPENQUERY','VARYING',
-            'DROP','OPENROWSET','VIEW','DUMMY','OPENXML','WAITFOR','DUMP','OPTION','WHEN','ELSE','OR','WHERE',
-            'END','ORDER','WHILE','ERRLVL','OUTER','WITH','ESCAPE','OVER','WRITETEXT',
+            'ADD', 'EXCEPT', 'PERCENT', 'ALL', 'EXEC', 'PLAN', 'ALTER', 'EXECUTE', 'PRECISION', 'AND', 'EXISTS', 'PRIMARY',
+            'ANY', 'EXIT', 'PRINT', 'AS', 'FETCH', 'PROC', 'ASC', 'FILE', 'PROCEDURE', 'AUTHORIZATION', 'FILLFACTOR', 'PUBLIC',
+            'BACKUP', 'FOR', 'RAISERROR', 'BEGIN', 'FOREIGN', 'READ', 'BETWEEN', 'FREETEXT', 'READTEXT', 'BREAK', 'FREETEXTTABLE',
+            'RECONFIGURE', 'BROWSE', 'FROM', 'REFERENCES', 'BULK', 'FULL', 'REPLICATION', 'BY', 'FUNCTION', 'RESTORE',
+            'CASCADE', 'GOTO', 'RESTRICT', 'CASE', 'GRANT', 'RETURN', 'CHECK', 'GROUP', 'REVOKE', 'CHECKPOINT', 'HAVING', 'RIGHT', 'CLOSE',
+            'HOLDLOCK', 'ROLLBACK', 'CLUSTERED', 'IDENTITY', 'ROWCOUNT', 'COALESCE', 'IDENTITY_INSERT', 'ROWGUIDCOL', 'COLLATE', 'IDENTITYCOL',
+            'RULE', 'COLUMN', 'IF', 'SAVE', 'COMMIT', 'IN', 'SCHEMA', 'COMPUTE', 'INDEX', 'SELECT', 'CONSTRAINT', 'INNER', 'SESSION_USER',
+            'CONTAINS', 'INSERT', 'SET', 'CONTAINSTABLE', 'INTERSECT', 'SETUSER', 'CONTINUE', 'INTO', 'SHUTDOWN', 'CONVERT', 'IS', 'SOME',
+            'CREATE', 'JOIN', 'STATISTICS', 'CROSS', 'KEY', 'SYSTEM_USER', 'CURRENT', 'KILL', 'TABLE', 'CURRENT_DATE', 'LEFT', 'TEXTSIZE',
+            'CURRENT_TIME', 'LIKE', 'THEN', 'CURRENT_TIMESTAMP', 'LINENO', 'TO', 'CURRENT_USER', 'LOAD', 'TOP', 'CURSOR', 'NATIONAL', 'TRAN',
+            'DATABASE', 'NOCHECK', 'TRANSACTION', 'DBCC', 'NONCLUSTERED', 'TRIGGER', 'DEALLOCATE', 'NOT', 'TRUNCATE', 'DECLARE', 'NULL', 'TSEQUAL',
+            'DEFAULT', 'NULLIF', 'UNION', 'DELETE', 'OF', 'UNIQUE', 'DENY', 'OFF', 'UPDATE', 'DESC', 'OFFSETS', 'UPDATETEXT',
+            'DISK', 'ON', 'USE', 'DISTINCT', 'OPEN', 'USER', 'DISTRIBUTED', 'OPENCONNECTOR', 'VALUES', 'DOUBLE', 'OPENQUERY', 'VARYING',
+            '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',
@@ -125,8 +125,8 @@ 
 			'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',
+            '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',
 			);
@@ -134,56 +134,56 @@ 
 
         //C.L. - Add support to mark related module id columns as reserved keywords
         require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php';
-        $relatedModules = array_keys(DeployedRelationships::findRelatableModules()) ;
+        $relatedModules = array_keys(DeployedRelationships::findRelatableModules());
         global $beanList, $current_language;
-        foreach($relatedModules as $relModule)
+        foreach ($relatedModules as $relModule)
         {
-            if(isset($beanList[$relModule]))
+            if (isset($beanList[$relModule]))
             {
-                $field_name_exceptions[] = strtoupper($beanList[$relModule]) . '_ID';
+                $field_name_exceptions[] = strtoupper($beanList[$relModule]).'_ID';
             }
         }
 
-        if(empty($_REQUEST['view_package']) || $_REQUEST['view_package'] == 'studio') {
+        if (empty($_REQUEST['view_package']) || $_REQUEST['view_package'] == 'studio') {
             $moduleName = $_REQUEST['view_module'];
             $objectName = BeanFactory::getObjectName($moduleName);
             $module = BeanFactory::getBean($moduleName);
 
-            VardefManager::loadVardef($moduleName, $objectName,true);
+            VardefManager::loadVardef($moduleName, $objectName, true);
             global $dictionary;
 
             // Fix for issue #1177 - when trying to add or edit fields in a module an error message is shown:
             // "Warning: Creating default object from empty value"
-            if(!isset($module->mbvardefs) || is_null($module->mbvardefs)) {
+            if (!isset($module->mbvardefs) || is_null($module->mbvardefs)) {
                 $module->mbvardefs = new stdClass();
             }
-            $module->mbvardefs->vardefs =  $dictionary[$objectName];
+            $module->mbvardefs->vardefs = $dictionary[$objectName];
 			
             $module->name = $moduleName;
-            if(!$ac){
+            if (!$ac) {
                 $ac = new AjaxCompose();
             }
-            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name]))? $module->mbvardefs->vardefs['fields'][$field_name]: array();
-            if($isClone){
+            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name])) ? $module->mbvardefs->vardefs['fields'][$field_name] : array();
+            if ($isClone) {
                 unset($vardef['name']);
             }
           
-            if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))
+            if (empty($vardef['name'])) {
+                if (!empty($_REQUEST['type']))
                     $vardef['type'] = $_REQUEST['type'];
                     $fv->ss->assign('hideLevel', 0);
-            }elseif(isset($vardef['custom_module'])){
+            }elseif (isset($vardef['custom_module'])) {
                 $fv->ss->assign('hideLevel', 2);
-            }else{
+            } else {
                 $action = 'saveSugarField'; // tyoung - for OOB fields we currently only support modifying the label
                 $fv->ss->assign('hideLevel', 3);
             }
-            if($isClone && isset($vardef['type']) && $vardef['type'] == 'datetime'){
+            if ($isClone && isset($vardef['type']) && $vardef['type'] == 'datetime') {
             	$vardef['type'] = 'datetimecombo';
             }
             
-			require_once ('modules/DynamicFields/FieldCases.php') ;
-            $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
+			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());
@@ -194,7 +194,7 @@ 
             //Check if autoincrement fields are allowed
             $allowAutoInc = true;
             $enumFields = array();
-            foreach($module->field_defs as $field => $def)
+            foreach ($module->field_defs as $field => $def)
             {
             	if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
             	   $allowAutoInc = false;
@@ -202,56 +202,56 @@ 
             	}
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
-                    if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
+                    if (!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
                     $enumFields[$field] = translate($def['vname'], $moduleName);
                     if (substr($enumFields[$field], -1) == ":")
                         $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
                 }
             }
-            $fv->ss->assign( 'allowAutoInc', $allowAutoInc);   
+            $fv->ss->assign('allowAutoInc', $allowAutoInc);   
 
-            $GLOBALS['log']->warn('view.modulefield: hidelevel '.$fv->ss->get_template_vars('hideLevel')." ".print_r($vardef,true));
-            if(!empty($vardef['vname'])){
+            $GLOBALS['log']->warn('view.modulefield: hidelevel '.$fv->ss->get_template_vars('hideLevel')." ".print_r($vardef, true));
+            if (!empty($vardef['vname'])) {
                 $fv->ss->assign('lbl_value', htmlentities(translate($vardef['vname'], $moduleName), ENT_QUOTES, 'UTF-8'));
             }
             $fv->ss->assign('module', $module);
-            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
+            if (empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
 				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
-            $edit_or_add = 'editField' ;
+            $edit_or_add = 'editField';
 
         } else
         {
             require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
             $mb = new ModuleBuilder();
             $moduleName = $_REQUEST['view_module'];
-            $module =& $mb->getPackageModule($_REQUEST['view_package'], $moduleName);
-            $package =& $mb->packages[$_REQUEST['view_package']];
+            $module = & $mb->getPackageModule($_REQUEST['view_package'], $moduleName);
+            $package = & $mb->packages[$_REQUEST['view_package']];
             $module->getVardefs();
-            if(!$ac){
+            if (!$ac) {
                 $ac = new AjaxCompose();
             }
-            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name]))? $module->mbvardefs->vardefs['fields'][$field_name]: array();
+            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name])) ? $module->mbvardefs->vardefs['fields'][$field_name] : array();
 
-            if($isClone){
+            if ($isClone) {
                 unset($vardef['name']);
             }
 
-            if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))$vardef['type'] = $_REQUEST['type'];
+            if (empty($vardef['name'])) {
+                if (!empty($_REQUEST['type']))$vardef['type'] = $_REQUEST['type'];
                     $fv->ss->assign('hideLevel', 0);
-            }else{
-                if(!empty($module->mbvardefs->vardef['fields'][$vardef['name']])){
+            } else {
+                if (!empty($module->mbvardefs->vardef['fields'][$vardef['name']])) {
                     $fv->ss->assign('hideLevel', 1);
-                }elseif(isset($vardef['custom_module'])){
+                }elseif (isset($vardef['custom_module'])) {
                     $fv->ss->assign('hideLevel', 2);
-                }else{
+                } else {
                     $fv->ss->assign('hideLevel', 3); // tyoung bug 17350 - effectively mark template derived fields as readonly
                 }
             }
 
-			require_once ('modules/DynamicFields/FieldCases.php') ;
-            $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
+			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());
@@ -260,24 +260,24 @@ 
 
             $fv->ss->assign('module', $module);
             $fv->ss->assign('package', $package);
-            $fv->ss->assign('MB','1');
+            $fv->ss->assign('MB', '1');
 
-            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'))
+            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'];
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
             {
-                foreach($module->mbvardefs->vardefs['fields'] as $field => $def)
+                foreach ($module->mbvardefs->vardefs['fields'] as $field => $def)
                 {
                     if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                     {
                         $enumFields[$field] = isset($module->mblanguage->strings[$current_language][$def['vname']]) ?
                             $this->mbModule->mblanguage->strings[$current_language][$def['vname']] : translate($field);
                         if (substr($enumFields[$field], -1) == ":")
-                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
                     }
                 }
             }
@@ -285,7 +285,7 @@ 
             $edit_or_add = 'mbeditField';
         }
 
-        if($_REQUEST['action'] == 'RefreshField'){
+        if ($_REQUEST['action'] == 'RefreshField') {
         	require_once('modules/DynamicFields/FieldCases.php');
             $field = get_widget($_POST['type']);
             $field->populateFromPost();
@@ -294,52 +294,52 @@ 
             $fv->ss->assign('lbl_value', htmlentities($_REQUEST['labelValue'], ENT_QUOTES, 'UTF-8'));
         }
 
-        foreach(array("formula", "default", "comments", "help", "visiblityGrid") as $toEscape)
+        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['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
+        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('action',$action);
+        $fv->ss->assign('action', $action);
         $fv->ss->assign('isClone', ($isClone ? 1 : 0));
         $fv->ss->assign("module_dd_fields", $enumFields);
         $json = getJSONobj();
 
         $fv->ss->assign('field_name_exceptions', $json->encode($field_name_exceptions));
         ksort($field_types);
-        $fv->ss->assign('field_types',$field_types);
+        $fv->ss->assign('field_types', $field_types);
 
 
         $fv->ss->assign('importable_options', $GLOBALS['app_list_strings']['custom_fields_importable_dom']);
         $fv->ss->assign('duplicate_merge_options', $GLOBALS['app_list_strings']['custom_fields_merge_dup_dom']);
 
-        $triggers = array () ;
-        $existing_field_names = array () ;
-        foreach ( $module->mbvardefs->vardefs['fields'] as $field )
+        $triggers = array();
+        $existing_field_names = array();
+        foreach ($module->mbvardefs->vardefs['fields'] as $field)
         {
-        	if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
+        	if ($field ['type'] == 'enum' || $field ['type'] == 'multienum')
         	{
-        		$triggers [] = $field [ 'name' ] ;
+        		$triggers [] = $field ['name'];
         	}
         	
         	if (!isset($field['source']) || $field['source'] != 'non-db') {
-        		if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
+        		if (preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
         		{
         			$existing_field_names [] = strtoupper($matches[1]);	
         		}
         	}
         }
         
-        $fv->ss->assign('triggers',$triggers);
+        $fv->ss->assign('triggers', $triggers);
         $fv->ss->assign('existing_field_names', $json->encode($existing_field_names));
-        $fv->ss->assign('mod_strings',$GLOBALS['mod_strings']);
+        $fv->ss->assign('mod_strings', $GLOBALS['mod_strings']);
 
 		// jchi #24880
 		// end
@@ -348,20 +348,20 @@ 
         $layout = $fv->getLayout($vardef);
 
         $fv->ss->assign('fieldLayout', $layout);
-        if(empty($vardef['type']))
+        if (empty($vardef['type']))
         {
             $vardef['type'] = 'varchar';
         }
 
         $fv->ss->assign('vardef', $vardef);
 
-        if(empty($_REQUEST['field'])){
+        if (empty($_REQUEST['field'])) {
             $edit_or_add = 'addField';
         }
 
         $fv->ss->assign('help_group', $edit_or_add);
         $body = $this->fetchTemplate($fv, 'modules/ModuleBuilder/tpls/MBModule/field.tpl');
-        $ac->addSection('east', translate('LBL_SECTION_FIELDEDITOR','ModuleBuilder'), $body );
+        $ac->addSection('east', translate('LBL_SECTION_FIELDEDITOR', 'ModuleBuilder'), $body);
         return $ac;
     }
 

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

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -61,7 +61,7 @@ 
         
         $ajax = new AjaxCompose();
         $ajax->addSection('center', $mod_strings['LBL_PACKAGE_DELETED'], 
-            str_replace('[[package]]',$_REQUEST['package'],$mod_strings['LBL_PACKAGE_WAS_DELETED']));
+            str_replace('[[package]]', $_REQUEST['package'], $mod_strings['LBL_PACKAGE_WAS_DELETED']));
         echo $ajax->getJavascript();
  	}
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.home.php

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

Spacing +12 added lines, -12 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -67,7 +67,9 @@
 		$smarty->assign('assistant',$assistant);
 		//initialize Assistant's display property.
 		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
+		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'));

modules/ModuleBuilder/parsers/StandardField.php

Indentation +16 added lines, -16 removed lines

@@ -44,9 +44,9 @@ 
 
 class StandardField extends DynamicField
 {
-	var $custom_def = array();
-	var $base_def = array();
-	var $baseField;
+    var $custom_def = array();
+    var $base_def = array();
+    var $baseField;
 	
 
     function __construct($module = '') {
@@ -54,15 +54,15 @@ 
     }
     
     protected function loadCustomDef($field){
-    	global $beanList;
-    	if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
-    	{
+        global $beanList;
+        if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
+        {
             $bean_name = get_valid_bean_name($this->module);
             $dictionary = array($bean_name => array("fields" => array($field => array())));
             include("$this->base_path/sugarfield_$field.php");
             if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field]))
                 $this->custom_def = $dictionary[$bean_name]["fields"][$field];
-    	}
+        }
     }
 
     protected function loadBaseDef($field){
@@ -118,24 +118,24 @@ 
         $this->baseField = get_widget ( $field->type) ;
         foreach ($field->vardef_map as $property => $fmd_col){
            
-        	if ($property == "action" || $property == "label_value" || $property == "label"
-            	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
+            if ($property == "action" || $property == "label_value" || $property == "label"
+                || ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
             ) 
-            	continue;
+                continue;
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
-            	((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
-            		|| (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
-            	)
+                ((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
+                    || (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
+                )
             ){
-            	$this->custom_def[$property] =
+                $this->custom_def[$property] =
                     is_string($newDef[$property]) ? htmlspecialchars_decode($newDef[$property], ENT_QUOTES) : $newDef[$property];
             }
             
             //Remove any orphaned entries
             if (isset($this->custom_def[$property]) && !isset($newDef[$property]))
-            	unset($this->custom_def[$property]);
+                unset($this->custom_def[$property]);
 
             //Handle overrides of out of the box definitions with empty
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
@@ -153,7 +153,7 @@ 
         }
         
         if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"]))
-        	unset($this->custom_def["duplicate_merge_dom_value"]);
+            unset($this->custom_def["duplicate_merge_dom_value"]);
         
         $this->writeVardefExtension($bean_name, $field, $this->custom_def);
     }

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
-    die ( 'Not A Valid Entry Point' ) ;
+if (!defined('sugarEntry') || !sugarEntry)
+    die ('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,7 +40,7 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/DynamicFields/DynamicField.php') ;
+require_once ('modules/DynamicFields/DynamicField.php');
 
 class StandardField extends DynamicField
 {
@@ -53,7 +53,7 @@ 
         parent::DynamicField($module);
     }
     
-    protected function loadCustomDef($field){
+    protected function loadCustomDef($field) {
     	global $beanList;
     	if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
     	{
@@ -65,7 +65,7 @@ 
     	}
     }
 
-    protected function loadBaseDef($field){
+    protected function loadBaseDef($field) {
         global $beanList;
         if (!empty($beanList[$this->module]) && is_file("modules/{$this->module}/vardefs.php"))
         {
@@ -82,7 +82,7 @@ 
      * @param Field Object $field
      * @return boolean
      */
-    function addFieldObject(&$field){
+    function addFieldObject(&$field) {
         global $dictionary, $beanList;
         
         
@@ -98,9 +98,9 @@ 
 
         // set $field->unified_search=true if field supports unified search
         // regarding #51427
-        if($field->supports_unified_search)
+        if ($field->supports_unified_search)
         {
-            if(isset($dictionary[$bean_name]['unified_search_default_enabled']) && isset($dictionary[$bean_name]['unified_search'])
+            if (isset($dictionary[$bean_name]['unified_search_default_enabled']) && isset($dictionary[$bean_name]['unified_search'])
             && $dictionary[$bean_name]['unified_search_default_enabled'] && $dictionary[$bean_name]['unified_search'])
             {
                 $currdef['unified_search'] = $field->unified_search = isset($currdef['unified_search'])
@@ -114,21 +114,21 @@ 
         $this->loadBaseDef($field->name);
         $newDef = $field->get_field_def();
         
-        require_once ('modules/DynamicFields/FieldCases.php') ;
-        $this->baseField = get_widget ( $field->type) ;
-        foreach ($field->vardef_map as $property => $fmd_col){
+        require_once ('modules/DynamicFields/FieldCases.php');
+        $this->baseField = get_widget($field->type);
+        foreach ($field->vardef_map as $property => $fmd_col) {
            
         	if ($property == "action" || $property == "label_value" || $property == "label"
-            	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
+            	|| ((substr($property, 0, 3) == 'ext' && strlen($property) == 4))
             ) 
             	continue;
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
-            	((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
+            	((!isset($currdef[$property]) && !$this->isDefaultValue($property, $newDef[$property], $this->baseField))
             		|| (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
             	)
-            ){
+            ) {
             	$this->custom_def[$property] =
                     is_string($newDef[$property]) ? htmlspecialchars_decode($newDef[$property], ENT_QUOTES) : $newDef[$property];
             }
@@ -141,11 +141,11 @@ 
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
             {
                 //Switch on type of the property to find what the correct 'empty' is.
-                if(is_string($this->base_def[$property]))
+                if (is_string($this->base_def[$property]))
                     $this->custom_def[$property] = "";
-                else if(is_array($this->base_def[$property]))
+                else if (is_array($this->base_def[$property]))
                     $this->custom_def[$property] = array();
-                else if(is_bool($this->base_def[$property]))
+                else if (is_bool($this->base_def[$property]))
                     $this->custom_def[$property] = false;
                 else
                     $this->custom_def[$property] = null;

Braces +32 added lines, -23 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -60,8 +61,9 @@ 
             $bean_name = get_valid_bean_name($this->module);
             $dictionary = array($bean_name => array("fields" => array($field => array())));
             include("$this->base_path/sugarfield_$field.php");
-            if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field]))
-                $this->custom_def = $dictionary[$bean_name]["fields"][$field];
+            if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field])) {
+                            $this->custom_def = $dictionary[$bean_name]["fields"][$field];
+            }
     	}
     }
 
@@ -71,8 +73,9 @@ 
         {
             $dictionary = array();
             include("modules/{$this->module}/vardefs.php");
-            if (!empty($dictionary[$beanList[$this->module]]) && isset($dictionary[$beanList[$this->module]]["fields"][$field]))
-                $this->base_def = $dictionary[$beanList[$this->module]]["fields"][$field];
+            if (!empty($dictionary[$beanList[$this->module]]) && isset($dictionary[$beanList[$this->module]]["fields"][$field])) {
+                            $this->base_def = $dictionary[$beanList[$this->module]]["fields"][$field];
+            }
         }
     }
     
@@ -86,13 +89,15 @@ 
         global $dictionary, $beanList;
         
         
-        if (empty($beanList[$this->module]))
-            return false;
+        if (empty($beanList[$this->module])) {
+                    return false;
+        }
 
         $bean_name = get_valid_bean_name($this->module);
 
-        if (empty($dictionary[$bean_name]) || empty($dictionary[$bean_name]["fields"][$field->name]))
-            return false;
+        if (empty($dictionary[$bean_name]) || empty($dictionary[$bean_name]["fields"][$field->name])) {
+                    return false;
+        }
 
         $currdef = $dictionary[$bean_name]["fields"][$field->name];
 
@@ -120,8 +125,9 @@ 
            
         	if ($property == "action" || $property == "label_value" || $property == "label"
             	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
-            ) 
-            	continue;
+            ) {
+        	            	continue;
+        	}
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
@@ -134,26 +140,29 @@ 
             }
             
             //Remove any orphaned entries
-            if (isset($this->custom_def[$property]) && !isset($newDef[$property]))
-            	unset($this->custom_def[$property]);
+            if (isset($this->custom_def[$property]) && !isset($newDef[$property])) {
+                        	unset($this->custom_def[$property]);
+            }
 
             //Handle overrides of out of the box definitions with empty
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
             {
                 //Switch on type of the property to find what the correct 'empty' is.
-                if(is_string($this->base_def[$property]))
-                    $this->custom_def[$property] = "";
-                else if(is_array($this->base_def[$property]))
-                    $this->custom_def[$property] = array();
-                else if(is_bool($this->base_def[$property]))
-                    $this->custom_def[$property] = false;
-                else
-                    $this->custom_def[$property] = null;
+                if(is_string($this->base_def[$property])) {
+                                    $this->custom_def[$property] = "";
+                } else if(is_array($this->base_def[$property])) {
+                                    $this->custom_def[$property] = array();
+                } else if(is_bool($this->base_def[$property])) {
+                                    $this->custom_def[$property] = false;
+                } else {
+                                    $this->custom_def[$property] = null;
+                }
             }
         }
         
-        if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"]))
-        	unset($this->custom_def["duplicate_merge_dom_value"]);
+        if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"])) {
+                	unset($this->custom_def["duplicate_merge_dom_value"]);
+        }
         
         $this->writeVardefExtension($bean_name, $field, $this->custom_def);
     }

modules/ModuleBuilder/parsers/relationships/OneToOneRelationship.php

Spacing +30 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
 
 /*
  * Class to manage the metadata for a One-To-One Relationship
@@ -71,9 +71,9 @@ 
      * Constructor
      * @param array $definition Parameters passed in as array with keys defined in parent::keys
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
-        parent::__construct ( $definition ) ;
+        parent::__construct($definition);
     }
     
     /*
@@ -83,55 +83,55 @@ 
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
-        return array( $this->lhs_module => $this->getRelationshipMetaData ( MB_ONETOONE ) ) ;
+        return array($this->lhs_module => $this->getRelationshipMetaData(MB_ONETOONE));
     }
 
     /* Build a set of Link Field definitions for this relationship
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-    function buildVardefs ( )
+    function buildVardefs( )
     {
-        $vardefs = array ( ) ;
-        $vardefs [ $this->rhs_module ] [] = $this->getLinkFieldDefinition ( $this->lhs_module, $this->relationship_name , false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
-            $this->relationship_only ? false : $this->getIDName( $this->lhs_module )
-        ) ;
-        $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()   ) . '_TITLE'  ,
-            $this->relationship_only ? false : $this->getIDName( $this->rhs_module )
-        ) ;
+        $vardefs = array( );
+        $vardefs [$this->rhs_module] [] = $this->getLinkFieldDefinition($this->lhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE',
+            $this->relationship_only ? false : $this->getIDName($this->lhs_module)
+        );
+        $vardefs [$this->lhs_module] [] = $this->getLinkFieldDefinition($this->rhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE',
+            $this->relationship_only ? false : $this->getIDName($this->rhs_module)
+        );
         
         if (!$this->relationship_only)
         {
-            $vardefs [ $this->lhs_module ] [] = $this->getRelateFieldDefinition ( $this->rhs_module, $this->relationship_name, $this->getRightModuleSystemLabel() ) ;
-            $vardefs [ $this->rhs_module ] [] = $this->getRelateFieldDefinition ( $this->lhs_module, $this->relationship_name, $this->getLeftModuleSystemLabel() ) ;
-            $vardefs [ $this->lhs_module ] [] = $this->getLink2FieldDefinition ( $this->rhs_module, $this->relationship_name , false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()   ) . '_TITLE' ) ;
-            $vardefs [ $this->rhs_module ] [] = $this->getLink2FieldDefinition ( $this->lhs_module, $this->relationship_name , false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ) ;
+            $vardefs [$this->lhs_module] [] = $this->getRelateFieldDefinition($this->rhs_module, $this->relationship_name, $this->getRightModuleSystemLabel());
+            $vardefs [$this->rhs_module] [] = $this->getRelateFieldDefinition($this->lhs_module, $this->relationship_name, $this->getLeftModuleSystemLabel());
+            $vardefs [$this->lhs_module] [] = $this->getLink2FieldDefinition($this->rhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE');
+            $vardefs [$this->rhs_module] [] = $this->getLink2FieldDefinition($this->lhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE');
         }
         
-        return $vardefs ;
+        return $vardefs;
     }
 
     /*
      * Define what fields to add to which modules layouts
      * @return array    An array of module => fieldname
      */
-    function buildFieldsToLayouts ()
+    function buildFieldsToLayouts()
     {
         if ($this->relationship_only)
-            return array () ;
+            return array();
  
         if ($this->lhs_module == $this->rhs_module) // don't add in two fields on recursive relationships
-            return array ( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") );
+            return array($this->lhs_module => $this->getValidDBName($this->relationship_name."_name"));
         else
-            return array (
-                $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ,
-                $this->rhs_module => $this->getValidDBName($this->relationship_name . "_name")
-            ) ;
+            return array(
+                $this->lhs_module => $this->getValidDBName($this->relationship_name."_name"),
+                $this->rhs_module => $this->getValidDBName($this->relationship_name."_name")
+            );
     }
 
 }

Braces +11 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -122,16 +124,19 @@ 
      */
     function buildFieldsToLayouts ()
     {
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
  
-        if ($this->lhs_module == $this->rhs_module) // don't add in two fields on recursive relationships
+        if ($this->lhs_module == $this->rhs_module) {
+            // don't add in two fields on recursive relationships
             return array ( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") );
-        else
-            return array (
+        } else {
+                    return array (
                 $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ,
                 $this->rhs_module => $this->getValidDBName($this->relationship_name . "_name")
             ) ;
+        }
     }
 
 }