adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.history.php

Spacing +74 added lines, -74 removed lines

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

modules/ModuleBuilder/views/view.labels.php

Spacing +31 added lines, -31 removed lines

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

modules/ModuleBuilder/views/view.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;
             }
         }

modules/ModuleBuilder/views/view.deletepackage.php

Spacing +2 added lines, -2 removed lines

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

modules/ModuleBuilder/views/view.home.php

Spacing +12 added lines, -12 removed lines

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

modules/ModuleBuilder/parsers/StandardField.php

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;

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

modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php

Spacing +234 added lines, -234 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.
@@ -47,7 +47,7 @@ 
 class AbstractRelationship
 {
     
-    protected $definition ; // enough information to rebuild this relationship
+    protected $definition; // enough information to rebuild this relationship
     
 
     /*
@@ -56,35 +56,35 @@ 
      * The base set of keys are those used in the Relationships table 
      * Defined as Public as MBRelationship uses these to read the _POST data
      */
-    public static $definitionKeys = array ( 
+    public static $definitionKeys = array( 
         // atttributes of this relationship - here in the definition so they are preserved across saves and loads
         'for_activities',
     	'is_custom',
         'from_studio',
-        'readonly' , // a readonly relationship cannot be Built by subclasses of AbstractRelationships
-        'deleted' , // a deleted relationship will not be built, and if it had been built previously the built relationship will be removed
-        'relationship_only' , // means that we won't build any UI components for this relationship - required while the Subpanel code is restricted to one subpanel only from any module, and probably useful afterwards also for developers to build relationships for new code - it's a feature!
+        'readonly', // a readonly relationship cannot be Built by subclasses of AbstractRelationships
+        'deleted', // a deleted relationship will not be built, and if it had been built previously the built relationship will be removed
+        'relationship_only', // means that we won't build any UI components for this relationship - required while the Subpanel code is restricted to one subpanel only from any module, and probably useful afterwards also for developers to build relationships for new code - it's a feature!
         // keys not found in Relationships table
-        'label' , // optional
+        'label', // optional
         'rhs_label', // optional
         'lhs_label', // optional
-        'lhs_subpanel' , // subpanel FROM the lhs_module to display on the rhs_module detail view
-        'rhs_subpanel' , // subpanel FROM the rhs_module to display on the lhs_module detail view
+        'lhs_subpanel', // subpanel FROM the lhs_module to display on the rhs_module detail view
+        'rhs_subpanel', // subpanel FROM the rhs_module to display on the lhs_module detail view
         // keys from Relationships table
-        'relationship_name' ,
-        'lhs_module' , 
-        'lhs_table' , 
-        'lhs_key' , 
-        'rhs_module' , 
-        'rhs_table' , 
-        'rhs_key' , 
-        'join_table' , 
-        'join_key_lhs' , 
-        'join_key_rhs' , 
-        'relationship_type' , 
-        'relationship_role_column' , 
-        'relationship_role_column_value' , 
-        'reverse' ) ;
+        'relationship_name',
+        'lhs_module', 
+        'lhs_table', 
+        'lhs_key', 
+        'rhs_module', 
+        'rhs_table', 
+        'rhs_key', 
+        'join_table', 
+        'join_key_lhs', 
+        'join_key_rhs', 
+        'relationship_type', 
+        'relationship_role_column', 
+        'relationship_role_column_value', 
+        'reverse' );
 
     /*
      * Relationship_role_column and relationship_role_column_value:
@@ -104,65 +104,65 @@ 
      * Constructor
      * @param string $definition    Definition array for this relationship. Parameters are given in self::keys
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
         // set any undefined attributes to the default value
-        foreach ( array ( 'readonly' , 'deleted' , 'relationship_only', 'for_activities', 'is_custom', 'from_studio' ) as $key )
-            if (! isset ( $definition [ $key ] ))
-                $definition [ $key ] = false ;
+        foreach (array('readonly', 'deleted', 'relationship_only', 'for_activities', 'is_custom', 'from_studio') as $key)
+            if (!isset ($definition [$key]))
+                $definition [$key] = false;
         
-        foreach ( self::$definitionKeys as $key )
+        foreach (self::$definitionKeys as $key)
         {
-            $this->$key = isset ( $definition [ $key ] ) ? $definition [ $key ] : '' ;
+            $this->$key = isset ($definition [$key]) ? $definition [$key] : '';
         }
-        $this->definition = $definition ;
+        $this->definition = $definition;
     }
 
     /*
      * Get the unique name of this relationship
      * @return string   The unique name (actually just that given to the constructor)
      */
-    public function getName ()
+    public function getName()
     {
-        return isset ( $this->definition [ 'relationship_name' ] ) ? $this->definition [ 'relationship_name' ] : null ;
+        return isset ($this->definition ['relationship_name']) ? $this->definition ['relationship_name'] : null;
     }
 
-    public function setName ($relationshipName)
+    public function setName($relationshipName)
     {
-        $this->relationship_name = $this->definition [ 'relationship_name' ] = $relationshipName ;
+        $this->relationship_name = $this->definition ['relationship_name'] = $relationshipName;
     }
 
     /*
      * Is this relationship readonly or not?
      * @return boolean True if cannot be changed; false otherwise
      */
-    public function readonly ()
+    public function readonly()
     {
-        return $this->definition [ 'readonly' ] ;
+        return $this->definition ['readonly'];
     }
 
-    public function setReadonly ($set = true)
+    public function setReadonly($set = true)
     {
-        $this->readonly = $this->definition [ 'readonly' ] = $set ;
+        $this->readonly = $this->definition ['readonly'] = $set;
     }
 
-    public function setFromStudio ()
+    public function setFromStudio()
     {
-        $this->from_studio = $this->definition [ 'from_studio' ] = true ;
+        $this->from_studio = $this->definition ['from_studio'] = true;
     }
 
     /*
      * Has this relationship been deleted? A deleted relationship does not get built, and is no longer visible in the list of relationships
      * @return boolean True if it has been deleted; false otherwise
      */
-    public function deleted ()
+    public function deleted()
     {
-        return $this->definition [ 'deleted' ] ;
+        return $this->definition ['deleted'];
     }
 
-    public function delete ()
+    public function delete()
     {
-        $this->deleted = $this->definition [ 'deleted' ] = true ;
+        $this->deleted = $this->definition ['deleted'] = true;
     }
     
     public function getFromStudio()
@@ -180,19 +180,19 @@ 
         return $this->rhs_module;
     }
 
-    public function getType ()
+    public function getType()
     {
-        return $this->relationship_type ;
+        return $this->relationship_type;
     }
     
-    public function relationship_only ()
+    public function relationship_only()
     {
-        return $this->definition [ 'relationship_only' ] ;   
+        return $this->definition ['relationship_only'];   
     }
     
-    public function setRelationship_only ()
+    public function setRelationship_only()
     {
-        $this->relationship_only = $this->definition [ 'relationship_only' ] = true ;
+        $this->relationship_only = $this->definition ['relationship_only'] = true;
     }
 
     /*
@@ -203,9 +203,9 @@ 
      * `relationship_name`, `lhs_module`, `lhs_table`, `lhs_key`, `rhs_module`, `rhs_table`,`rhs_key`, `join_table`, `join_key_lhs`, `join_key_rhs`, `relationship_type`, `relationship_role_column`, `relationship_role_column_value`, `reverse`,
      * @return array    Set of parameters to pass to an AbstractRelationship constructor - must contain at least ['relationship_type']='OneToOne' or 'OneToMany' or 'ManyToMany'
      */
-    function getDefinition ()
+    function getDefinition()
     {
-        return $this->definition ;
+        return $this->definition;
     }
 
     /*
@@ -216,42 +216,42 @@ 
      * Define the labels to be added to the module for the new relationships
      * @return array    An array of system value => display value
      */
-    function buildLabels ($update=false)
+    function buildLabels($update = false)
     {
-        $labelDefinitions = array ( ) ;
+        $labelDefinitions = array( );
         if (!$this->relationship_only)
         {
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+        	if (!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")) {
         		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+        		if (isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])) {
         			$rightSysLabel = $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
         		}
         		$layout_defs = array();
         	}
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+        	if (!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")) {
         		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+        		if (isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])) {
         			$leftSysLabel = $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
         		}
         		$layout_defs = array();
         	}
-        	$labelDefinitions [] = array (
-        		'module' => $this->rhs_module ,
-        		'system_label' => isset($rightSysLabel)?$rightSysLabel : 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
-        		'display_label' => ($update && !empty($_REQUEST [ 'lhs_label' ] ))?$_REQUEST [ 'lhs_label' ] :(empty($this->lhs_label) ? translate ( $this->lhs_module ) : $this->lhs_label),
-        	) ;
-            $labelDefinitions [] = array (
-            	'module' => $this->lhs_module ,
-            	'system_label' =>  isset($leftSysLabel)?$leftSysLabel :'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel() ) . '_TITLE' ,
-            	'display_label' => ($update && !empty($_REQUEST [ 'rhs_label' ] ))?$_REQUEST [ 'rhs_label' ] :(empty($this->rhs_label) ? translate ( $this->rhs_module ) : $this->rhs_label),
-            ) ;
+        	$labelDefinitions [] = array(
+        		'module' => $this->rhs_module,
+        		'system_label' => isset($rightSysLabel) ? $rightSysLabel : 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE',
+        		'display_label' => ($update && !empty($_REQUEST ['lhs_label'])) ? $_REQUEST ['lhs_label'] : (empty($this->lhs_label) ? translate($this->lhs_module) : $this->lhs_label),
+        	);
+            $labelDefinitions [] = array(
+            	'module' => $this->lhs_module,
+            	'system_label' =>  isset($leftSysLabel) ? $leftSysLabel : 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE',
+            	'display_label' => ($update && !empty($_REQUEST ['rhs_label'])) ? $_REQUEST ['rhs_label'] : (empty($this->rhs_label) ? translate($this->rhs_module) : $this->rhs_label),
+            );
         }
-        return $labelDefinitions ;
+        return $labelDefinitions;
     }
 
 	function getLeftModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
+		if ($this->lhs_module == $this->rhs_module) {
 			return $this->lhs_module.'_L';
 		}
 		return $this->lhs_module;
@@ -259,7 +259,7 @@ 
 
     function getRightModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
+		if ($this->lhs_module == $this->rhs_module) {
 			return $this->rhs_module.'_R';
 		}
 		return $this->rhs_module;
@@ -272,7 +272,7 @@ 
     public function getLabels() {
         $labels = array();
         $labelDefinitions = $this->buildLabels();
-        foreach($labelDefinitions as $def){
+        foreach ($labelDefinitions as $def) {
             $labels[$def['module']][$def['system_label']] = $def['display_label'];
         }
 
@@ -295,29 +295,29 @@ 
      * @param string $subpanelName      Name of the subpanel provided by the sourceModule
      * @param string $titleKeyName      Name of the subpanel title , if none, we will use the module name as the subpanel title.
      */
-    protected function getSubpanelDefinition ($relationshipName , $sourceModule , $subpanelName, $titleKeyName = '', $source = "")
+    protected function getSubpanelDefinition($relationshipName, $sourceModule, $subpanelName, $titleKeyName = '', $source = "")
     {
         if (empty($source)) 
         	$source = $this->getValidDBName($relationshipName);
-    	$subpanelDefinition = array ( ) ;
-        $subpanelDefinition [ 'order' ] = 100 ;
-        $subpanelDefinition [ 'module' ] = $sourceModule ;
-        $subpanelDefinition [ 'subpanel_name' ] = $subpanelName ;
+    	$subpanelDefinition = array( );
+        $subpanelDefinition ['order'] = 100;
+        $subpanelDefinition ['module'] = $sourceModule;
+        $subpanelDefinition ['subpanel_name'] = $subpanelName;
         // following two lines are required for the subpanel pagination code in ListView.php->processUnionBeans() to correctly determine the relevant field for sorting
-        $subpanelDefinition [ 'sort_order' ] = 'asc' ;
-        $subpanelDefinition [ 'sort_by' ] = 'id' ;
-		if(!empty($titleKeyName)){
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        $subpanelDefinition ['sort_order'] = 'asc';
+        $subpanelDefinition ['sort_by'] = 'id';
+		if (!empty($titleKeyName)) {
+			$subpanelDefinition ['title_key'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$titleKeyName).'_TITLE';
+		} else {
+			$subpanelDefinition ['title_key'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$sourceModule).'_TITLE';
 		}
-        $subpanelDefinition [ 'get_subpanel_data' ] = $source ;
-        $subpanelDefinition [ 'top_buttons' ] = array(
+        $subpanelDefinition ['get_subpanel_data'] = $source;
+        $subpanelDefinition ['top_buttons'] = array(
 		    array('widget_class' => "SubPanelTopButtonQuickCreate"),
 		    array('widget_class' => 'SubPanelTopSelectButton', 'mode'=>'MultiSelect')
 		);
         
-        return array ( $subpanelDefinition );
+        return array($subpanelDefinition);
     }
 
     
@@ -328,24 +328,24 @@ 
      * @param string $sourceModule      Name of the source module for this field
      * @param string $relationshipName  Name of the relationship
      */
-    protected function getLinkFieldDefinition ($sourceModule , $relationshipName, $right_side = false, $vname = "", $id_name = false)
+    protected function getLinkFieldDefinition($sourceModule, $relationshipName, $right_side = false, $vname = "", $id_name = false)
     {
-        $vardef = array ( ) ;
-
-        $vardef [ 'name' ] = $this->getValidDBName($relationshipName) ;
-        $vardef [ 'type' ] = 'link' ;
-        $vardef [ 'relationship' ] = $relationshipName ;
-        $vardef [ 'source' ] = 'non-db' ;
-        $vardef [ 'module' ] = $sourceModule ;
-        $vardef [ 'bean_name' ] = BeanFactory::getObjectName($sourceModule) ;
+        $vardef = array( );
+
+        $vardef ['name'] = $this->getValidDBName($relationshipName);
+        $vardef ['type'] = 'link';
+        $vardef ['relationship'] = $relationshipName;
+        $vardef ['source'] = 'non-db';
+        $vardef ['module'] = $sourceModule;
+        $vardef ['bean_name'] = BeanFactory::getObjectName($sourceModule);
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+        	$vardef ['side'] = 'right';
         if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
+            $vardef ['vname'] = $vname;
         if (!empty($id_name))
             $vardef['id_name'] = $id_name;
 
-        return $vardef ;
+        return $vardef;
     }
 
     /*
@@ -356,23 +356,23 @@ 
      * @param string $sourceModule      Name of the source module for this field
      * @param string $relationshipName  Name of the relationship
      */
-    protected function getLink2FieldDefinition ($sourceModule , $relationshipName, $right_side = false,  $vname = "")
+    protected function getLink2FieldDefinition($sourceModule, $relationshipName, $right_side = false, $vname = "")
     {
-        $vardef = array ( ) ;
+        $vardef = array( );
 
-        $vardef [ 'name' ] = $this->getIDName( $sourceModule ) ; // must match the id_name field value in the relate field definition
-        $vardef [ 'type' ] = 'link' ;
-        $vardef [ 'relationship' ] = $relationshipName ;
-        $vardef [ 'source' ] = 'non-db' ;
+        $vardef ['name'] = $this->getIDName($sourceModule); // must match the id_name field value in the relate field definition
+        $vardef ['type'] = 'link';
+        $vardef ['relationship'] = $relationshipName;
+        $vardef ['source'] = 'non-db';
 		$vardef ['reportable'] = false;
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+        	$vardef ['side'] = 'right';
         else
-        	$vardef [ 'side' ] = 'left' ;
+        	$vardef ['side'] = 'left';
         if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
+            $vardef ['vname'] = $vname;
 
-        return $vardef ;
+        return $vardef;
     }
 
     /*
@@ -382,78 +382,78 @@ 
      * @param string $relationshipName  Name of the relationship
      * @param string $moduleType        Optional - "Types" of the module - array of SugarObject types such as "file" or "basic"
      */
-    protected function getRelateFieldDefinition ($sourceModule , $relationshipName , $vnameLabel='')
+    protected function getRelateFieldDefinition($sourceModule, $relationshipName, $vnameLabel = '')
     {
-        $vardef = array ( ) ;
-        $vardef [ 'name' ] = $this->getValidDBName($relationshipName . "_name") ; // must end in _name for the QuickSearch code in TemplateHandler->createQuickSearchCode
-        $vardef [ 'type' ] = 'relate' ;
-
-        $vardef [ 'source' ] = 'non-db' ;
-		if(!empty($vnameLabel)){
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
-		}else{
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        $vardef = array( );
+        $vardef ['name'] = $this->getValidDBName($relationshipName."_name"); // must end in _name for the QuickSearch code in TemplateHandler->createQuickSearchCode
+        $vardef ['type'] = 'relate';
+
+        $vardef ['source'] = 'non-db';
+		if (!empty($vnameLabel)) {
+			$vardef ['vname'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$vnameLabel).'_TITLE';
+		} else {
+			$vardef ['vname'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$sourceModule).'_TITLE';
 		}
         
-        $vardef [ 'save' ] = true; // the magic value to tell SugarBean to save this relate field even though it is not listed in the $relationship_fields array
+        $vardef ['save'] = true; // the magic value to tell SugarBean to save this relate field even though it is not listed in the $relationship_fields array
        
         // id_name matches the join_key_ column in the relationship table for the sourceModule - that is, the column in the relationship table containing the id of the corresponding field in the source module's table (vardef['table'])
-        $vardef [ 'id_name' ] = $this->getIDName( $sourceModule ) ;
+        $vardef ['id_name'] = $this->getIDName($sourceModule);
         
         // link cannot match id_name otherwise the $bean->$id_name value set from the POST is overwritten by the Link object created by this 'link' entry
-        $vardef [ 'link' ] = $this->getValidDBName($relationshipName) ; // the name of the link field that points to the relationship - required for the save to function
-        $vardef [ 'table' ] = $this->getTablename( $sourceModule ) ;
-        $vardef [ 'module' ] = $sourceModule ;
+        $vardef ['link'] = $this->getValidDBName($relationshipName); // the name of the link field that points to the relationship - required for the save to function
+        $vardef ['table'] = $this->getTablename($sourceModule);
+        $vardef ['module'] = $sourceModule;
         
-        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php' ;
-        $parsedModuleName = AbstractRelationships::parseDeployedModuleName( $sourceModule ) ;
+        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php';
+        $parsedModuleName = AbstractRelationships::parseDeployedModuleName($sourceModule);
 
         // now determine the appropriate 'rname' field for this relate
         // the 'rname' points to the field in source module that contains the displayable name for the record
         // usually this is 'name' but sometimes it is not...
         
-        $vardef [ 'rname' ] = 'name' ;
-        if ( isset( $parsedModuleName['packageName'] ) )
+        $vardef ['rname'] = 'name';
+        if (isset($parsedModuleName['packageName']))
         {
-            require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-            $mb = new ModuleBuilder ( ) ;
-            $module = $mb->getPackageModule ( $parsedModuleName['packageName'] , $parsedModuleName['moduleName'] ) ;
-            if (in_array( 'file' , array_keys ( $module->config [ 'templates' ] ) ) ){
-                $vardef [ 'rname' ] = 'document_name' ;
-            }elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
-            	$vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+            require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+            $mb = new ModuleBuilder( );
+            $module = $mb->getPackageModule($parsedModuleName['packageName'], $parsedModuleName['moduleName']);
+            if (in_array('file', array_keys($module->config ['templates']))) {
+                $vardef ['rname'] = 'document_name';
+            }elseif (in_array('person', array_keys($module->config ['templates']))) {
+            	$vardef ['db_concat_fields'] = array(0 =>'first_name', 1 =>'last_name');
             }
         }
         else
         {
-            switch ( strtolower( $sourceModule ) )
+            switch (strtolower($sourceModule))
             {
                 case 'prospects' :
-                    $vardef [ 'rname' ] = 'account_name' ;
-                    break ;
+                    $vardef ['rname'] = 'account_name';
+                    break;
                 case 'documents' :
-                    $vardef [ 'rname' ] = 'document_name' ;
-                    break ;
+                    $vardef ['rname'] = 'document_name';
+                    break;
                 case 'kbdocuments' :
-                    $vardef [ 'rname' ] = 'kbdocument_name' ;
-                    break ;
+                    $vardef ['rname'] = 'kbdocument_name';
+                    break;
                 case 'leads' :
                 case 'contacts' : 
                     // special handling as these modules lack a name column in the database; instead 'name' refers to a non-db field that concatenates first_name and last_name
                     // luckily, the relate field mechanism can handle this with an equivalent additional db_concat_fields entry
-                    $vardef [ 'rname' ] = 'name' ;
-                    $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
-                    break ;
+                    $vardef ['rname'] = 'name';
+                    $vardef ['db_concat_fields'] = array(0 =>'first_name', 1 =>'last_name');
+                    break;
                 default :
                     // now see if we have any module inheriting from the 'file' template - records in file-type modules are named by the document_name field, not the usual 'name' field
-                    $object = $GLOBALS ['beanList'] [ $sourceModule ];
-                    require_once ( $GLOBALS ['beanFiles'] [ $object ] );
+                    $object = $GLOBALS ['beanList'] [$sourceModule];
+                    require_once ($GLOBALS ['beanFiles'] [$object]);
                     $bean = new $object();
-                    if ( isset ( $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    	if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		$vardef [ 'rname' ] = 'document_name' ;
-                    	}elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		 $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+                    if (isset ($GLOBALS ['dictionary'] [$object] ['templates'])) {
+                    	if (in_array('file', $GLOBALS ['dictionary'] [$object] ['templates'])) {
+                    		$vardef ['rname'] = 'document_name';
+                    	}elseif (in_array('person', $GLOBALS ['dictionary'] [$object] ['templates'])) {
+                    		 $vardef ['db_concat_fields'] = array(0 =>'first_name', 1 =>'last_name');
                     	}
                     }
                         
@@ -461,7 +461,7 @@ 
             
         }
             
-        return $vardef ;
+        return $vardef;
     }
 
     /*
@@ -474,111 +474,111 @@ 
      * @param string $relationshipType  Cardinality of the relationship, for example, MB_ONETOONE or MB_ONETOMANY or MB_MANYTOMANY
      * @param bool $checkExisting check if a realtionship with the given name is already depolyed in this instance. If so, we will clones its table and column names to preserve existing data.
      */
-    function getRelationshipMetaData ($relationshipType, $checkExisting = true)
+    function getRelationshipMetaData($relationshipType, $checkExisting = true)
     {
         global $dictionary;
-        $relationshipName = $this->definition [ 'relationship_name' ] ;
-        $lhs_module = $this->lhs_module ;
-        $rhs_module = $this->rhs_module ;
+        $relationshipName = $this->definition ['relationship_name'];
+        $lhs_module = $this->lhs_module;
+        $rhs_module = $this->rhs_module;
         
-        $lhs_table = $this->getTablename ( $lhs_module ) ;
-        $rhs_table = $this->getTablename ( $rhs_module ) ;
+        $lhs_table = $this->getTablename($lhs_module);
+        $rhs_table = $this->getTablename($rhs_module);
         
-        $properties = array ( ) ;
+        $properties = array( );
 
         //bug 47903
         if ($checkExisting && !empty($dictionary[$relationshipName])
-            && !empty($dictionary[$relationshipName][ 'true_relationship_type' ])
-            && $dictionary[$relationshipName][ 'true_relationship_type' ]  == $relationshipType
+            && !empty($dictionary[$relationshipName]['true_relationship_type'])
+            && $dictionary[$relationshipName]['true_relationship_type'] == $relationshipType
             && !empty($dictionary[$relationshipName]['relationships'][$relationshipName]))
         {
             //bug 51336
-            $properties [ 'true_relationship_type' ] = $relationshipType ;
+            $properties ['true_relationship_type'] = $relationshipType;
             $rel_properties = $dictionary[$relationshipName]['relationships'][$relationshipName];
         } else
         {
             // first define section 1, the relationship element of the metadata entry
 
-            $rel_properties = array ( ) ;
-            $rel_properties [ 'lhs_module' ] = $lhs_module ;
-            $rel_properties [ 'lhs_table' ] = $lhs_table ;
-            $rel_properties [ 'lhs_key' ] = 'id' ;
-            $rel_properties [ 'rhs_module' ] = $rhs_module ;
-            $rel_properties [ 'rhs_table' ] = $rhs_table ;
-            $rel_properties [ 'rhs_key' ] = 'id' ;
+            $rel_properties = array( );
+            $rel_properties ['lhs_module'] = $lhs_module;
+            $rel_properties ['lhs_table'] = $lhs_table;
+            $rel_properties ['lhs_key'] = 'id';
+            $rel_properties ['rhs_module'] = $rhs_module;
+            $rel_properties ['rhs_table'] = $rhs_table;
+            $rel_properties ['rhs_key'] = 'id';
 
             // because the implementation of one-to-many relationships within SugarBean does not use a join table and so requires schema changes to add a foreign key for each new relationship,
             // we currently implement all new relationships as many-to-many regardless of the real type and enforce cardinality through the relate fields and subpanels
-            $rel_properties [ 'relationship_type' ] = MB_MANYTOMANY ;
+            $rel_properties ['relationship_type'] = MB_MANYTOMANY;
             // but as we need to display the true cardinality in Studio and ModuleBuilder we also record the actual relationship type
             // this property is only used by Studio/MB
-            $properties [ 'true_relationship_type' ] = $relationshipType ;
+            $properties ['true_relationship_type'] = $relationshipType;
             if ($this->from_studio)
-                $properties [ 'from_studio' ] = true;
+                $properties ['from_studio'] = true;
 
-            $rel_properties [ 'join_table' ] = $this->getValidDBName ( $relationshipName."_c" ) ;
+            $rel_properties ['join_table'] = $this->getValidDBName($relationshipName."_c");
             // a and b are in case the module relates to itself
-            $rel_properties [ 'join_key_lhs' ] = $this->getJoinKeyLHS() ;
-            $rel_properties [ 'join_key_rhs' ] = $this->getJoinKeyRHS() ;
+            $rel_properties ['join_key_lhs'] = $this->getJoinKeyLHS();
+            $rel_properties ['join_key_rhs'] = $this->getJoinKeyRHS();
         }
         
         // set the extended properties if they exist = for now, many-to-many definitions do not have to contain a role_column even if role_column_value is set; we'll just create a likely name if missing
-        if (isset ( $this->definition [ 'relationship_role_column_value' ] ))
+        if (isset ($this->definition ['relationship_role_column_value']))
         {
-            if (! isset ( $this->definition [ 'relationship_role_column' ] ))
-                $this->definition [ 'relationship_role_column' ] = 'relationship_role_column' ;
-            $rel_properties [ 'relationship_role_column' ] = $this->definition [ 'relationship_role_column' ] ;
-            $rel_properties [ 'relationship_role_column_value' ] = $this->definition [ 'relationship_role_column_value' ] ;
+            if (!isset ($this->definition ['relationship_role_column']))
+                $this->definition ['relationship_role_column'] = 'relationship_role_column';
+            $rel_properties ['relationship_role_column'] = $this->definition ['relationship_role_column'];
+            $rel_properties ['relationship_role_column_value'] = $this->definition ['relationship_role_column_value'];
         }
         
-        $properties [ 'relationships' ] [ $relationshipName ] = $rel_properties ;
+        $properties ['relationships'] [$relationshipName] = $rel_properties;
         
         // construct section 2, the name of the join table
         
-        $properties [ 'table' ] = $rel_properties [ 'join_table' ] ;
+        $properties ['table'] = $rel_properties ['join_table'];
         
         // now construct section 3, the fields in the join table
         
-        $properties [ 'fields' ] [] = array ( 'name' => 'id' , 'type' => 'varchar' , 'len' => 36 ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => 'date_modified' , 'type' => 'datetime' ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => 'deleted' , 'type' => 'bool' , 'len' => '1' , 'default' => '0' , 'required' => true ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => $rel_properties [ 'join_key_lhs' ] , 'type' => 'varchar' , 'len' => 36 ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => $rel_properties [ 'join_key_rhs' ] , 'type' => 'varchar' , 'len' => 36 ) ;
-        if (strtolower ( $lhs_module ) == 'documents' || strtolower ( $rhs_module ) == 'documents' )
+        $properties ['fields'] [] = array('name' => 'id', 'type' => 'varchar', 'len' => 36);
+        $properties ['fields'] [] = array('name' => 'date_modified', 'type' => 'datetime');
+        $properties ['fields'] [] = array('name' => 'deleted', 'type' => 'bool', 'len' => '1', 'default' => '0', 'required' => true);
+        $properties ['fields'] [] = array('name' => $rel_properties ['join_key_lhs'], 'type' => 'varchar', 'len' => 36);
+        $properties ['fields'] [] = array('name' => $rel_properties ['join_key_rhs'], 'type' => 'varchar', 'len' => 36);
+        if (strtolower($lhs_module) == 'documents' || strtolower($rhs_module) == 'documents')
         {
-            $properties [ 'fields' ] [] = array ( 'name' => 'document_revision_id' , 'type' => 'varchar' , 'len' => '36' ) ;
+            $properties ['fields'] [] = array('name' => 'document_revision_id', 'type' => 'varchar', 'len' => '36');
         }
         // if we have an extended relationship condition, then add in the corresponding relationship_role_column to the relationship (join) table
         // for now this is restricted to extended relationships that can be specified by a varchar
-        if (isset ( $this->definition [ 'relationship_role_column_value' ] ))
+        if (isset ($this->definition ['relationship_role_column_value']))
         {
-            $properties [ 'fields' ] [] = array ( 'name' => $this->definition [ 'relationship_role_column' ] , 'type' => 'varchar' ) ;
+            $properties ['fields'] [] = array('name' => $this->definition ['relationship_role_column'], 'type' => 'varchar');
         }
         
         // finally, wrap up with section 4, the indices on the join table
         
-        $indexBase = $this->getValidDBName ( $relationshipName ) ;
-        $properties [ 'indices' ] [] = array ( 'name' => $indexBase . 'spk' , 'type' => 'primary' , 'fields' => array ( 'id' ) ) ;
+        $indexBase = $this->getValidDBName($relationshipName);
+        $properties ['indices'] [] = array('name' => $indexBase.'spk', 'type' => 'primary', 'fields' => array('id'));
 
         switch ($relationshipType)
         {
             case MB_ONETOONE:
-                $alternateKeys = array () ;
-                $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_ida1' , 'type' => 'index' , 'fields' => array ( $rel_properties [ 'join_key_lhs' ] ) ) ;
-                $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_idb2' , 'type' => 'index' , 'fields' => array ( $rel_properties [ 'join_key_rhs' ] ) ) ;
+                $alternateKeys = array();
+                $properties ['indices'] [] = array('name' => $indexBase.'_ida1', 'type' => 'index', 'fields' => array($rel_properties ['join_key_lhs']));
+                $properties ['indices'] [] = array('name' => $indexBase.'_idb2', 'type' => 'index', 'fields' => array($rel_properties ['join_key_rhs']));
                 break;
             case MB_ONETOMANY :
-                $alternateKeys = array ( $rel_properties [ 'join_key_rhs' ] ) ;
-                $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_ida1' , 'type' => 'index' , 'fields' => array ( $rel_properties [ 'join_key_lhs' ] ) ) ;
+                $alternateKeys = array($rel_properties ['join_key_rhs']);
+                $properties ['indices'] [] = array('name' => $indexBase.'_ida1', 'type' => 'index', 'fields' => array($rel_properties ['join_key_lhs']));
                 break;
             default:
-                $alternateKeys = array ( $rel_properties [ 'join_key_lhs' ] , $rel_properties [ 'join_key_rhs' ] ) ;
+                $alternateKeys = array($rel_properties ['join_key_lhs'], $rel_properties ['join_key_rhs']);
         }
         
-        if (count($alternateKeys)>0)
-            $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_alt' , 'type' => 'alternate_key' , 'fields' => $alternateKeys ) ; // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
+        if (count($alternateKeys) > 0)
+            $properties ['indices'] [] = array('name' => $indexBase.'_alt', 'type' => 'alternate_key', 'fields' => $alternateKeys); // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
         
-        return $properties ;
+        return $properties;
     }
     
     
@@ -591,9 +591,9 @@ 
      * Used primarily in UndeployedRelationships to ensure that the subpanels we construct for Activities get their data from the correct relationships
      * @param string $activitiesSubModuleName Name of the activities submodule, such as Tasks
      */
-    function getActivitiesSubModuleRelationshipName ( $activitiesSubModuleName )
+    function getActivitiesSubModuleRelationshipName($activitiesSubModuleName)
     {
-        return $this->lhs_module . "_" . strtolower ( $activitiesSubModuleName ) ;
+        return $this->lhs_module."_".strtolower($activitiesSubModuleName);
     }
 
     /*
@@ -604,10 +604,10 @@ 
      * @param string $ensureUnique 
      * @return string Valid column name trimmed to right length and with invalid characters removed
      */
-    static function getValidDBName ($name, $ensureUnique = true)
+    static function getValidDBName($name, $ensureUnique = true)
     {
 
-        require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+        require_once 'modules/ModuleBuilder/parsers/constants.php';
         return getValidDBName($name, $ensureUnique, MB_MAXDBIDENTIFIERLENGTH);
     }
 
@@ -616,25 +616,25 @@ 
      * @param string $type Relationship type
      * @return string Canonical type
      */
-    static function parseRelationshipType ($type)
+    static function parseRelationshipType($type)
     {
-        $type = strtolower ( $type ) ;
-        $type = preg_replace ( '/[^\w]+/i', '', strtolower ( $type ) ) ;
-        $canonicalTypes = array ( ) ;
-        foreach ( array ( MB_ONETOONE , MB_ONETOMANY , MB_MANYTOMANY , MB_MANYTOONE) as $canonicalType )
+        $type = strtolower($type);
+        $type = preg_replace('/[^\w]+/i', '', strtolower($type));
+        $canonicalTypes = array( );
+        foreach (array(MB_ONETOONE, MB_ONETOMANY, MB_MANYTOMANY, MB_MANYTOONE) as $canonicalType)
         {
-            if ($type == preg_replace ( '/[^\w]+/i', '', strtolower ( $canonicalType ) ))
-                return $canonicalType ;
+            if ($type == preg_replace('/[^\w]+/i', '', strtolower($canonicalType)))
+                return $canonicalType;
         }
         // ok, we give up...
-        return MB_MANYTOMANY ;
+        return MB_MANYTOMANY;
     }
 
     
     function getJoinKeyLHS()
     {
         if (!isset($this->joinKeyLHS))
-        	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+        	$this->joinKeyLHS = $this->getValidDBName($this->relationship_name.$this->lhs_module."_ida", true);
         
         return $this->joinKeyLHS;
     }
@@ -642,7 +642,7 @@ 
     function getJoinKeyRHS()
     {
         if (!isset($this->joinKeyRHS))
-        	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+        	$this->joinKeyRHS = $this->getValidDBName($this->relationship_name.$this->rhs_module."_idb", true);
     	
         return $this->joinKeyRHS;
     }
@@ -652,9 +652,9 @@ 
      * @param string $sourceModule  The name of the primary module in the relationship
      * @return string Name of the id field
      */
-    function getIDName( $sourceModule )
+    function getIDName($sourceModule)
     {
-        return ($sourceModule == $this->lhs_module ) ? $this->getJoinKeyLHS() : $this->getJoinKeyRHS() ;
+        return ($sourceModule == $this->lhs_module) ? $this->getJoinKeyLHS() : $this->getJoinKeyRHS();
     }
     
     /*
@@ -662,42 +662,42 @@ 
      * @param string $moduleName    Name of the module for which we are to find the table
      * @return string Tablename
      */
-    protected function getTablename ($moduleName)
+    protected function getTablename($moduleName)
     {
         // Check the moduleName exists in the beanList before calling get_module_info - Activities is the main culprit here
-        if (isset ( $GLOBALS [ 'beanList' ] [ $moduleName ] ))
+        if (isset ($GLOBALS ['beanList'] [$moduleName]))
         {
-            $module = get_module_info ( $moduleName ) ;
-            return $module->table_name ;
+            $module = get_module_info($moduleName);
+            return $module->table_name;
         }
-        return strtolower ( $moduleName ) ;
+        return strtolower($moduleName);
     }
 
-    public function getTitleKey($left=false){
-		if(!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+    public function getTitleKey($left = false) {
+		if (!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")) {
     		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+    		if (isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])) {
     			return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
     		}
-    	}else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+    	} else if (!$this->is_custom && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")) {
     		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+    		if (isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])) {
     			return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
     		}
     	}
     	
-    	if($left){
+    	if ($left) {
     		$titleKeyName = $this->getRightModuleSystemLabel();
     		$sourceModule = $this->rhs_module;
-    	}else{
+    	} else {
     		$titleKeyName = $this->getLeftModuleSystemLabel();
     		$sourceModule = $this->lhs_module;
     	}
     	
-		if(!empty($titleKeyName)){
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
+		if (!empty($titleKeyName)) {
+			$title_key = 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$titleKeyName).'_TITLE';
+		} else {
+			$title_key = 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$sourceModule).'_TITLE';
 		}
 		
 		return $title_key;

modules/ModuleBuilder/parsers/relationships/ManyToManyRelationship.php

Spacing +18 added lines, -18 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 Many-To-Many Relationship
@@ -57,9 +57,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);
     }
   
     /*
@@ -71,37 +71,37 @@ 
      * The format is that of TO_MODULE => relationship, FROM_MODULE, FROM_MODULES_SUBPANEL, mimicking the format in the layoutdefs.php
      * @return array    An array of subpanel definitions, keyed by module
      */
-    function buildSubpanelDefinitions ()
+    function buildSubpanelDefinitions()
     {        
-        $subpanelDefinitions = array ( ) ;
+        $subpanelDefinitions = array( );
         if (!$this->relationship_only)
         {
-            $subpanelDefinitions [ $this->rhs_module ] = $this->getSubpanelDefinition ( $this->relationship_name, $this->lhs_module, $this->lhs_subpanel, $this->getLeftModuleSystemLabel() ) ;
-            $subpanelDefinitions [ $this->lhs_module ] = $this->getSubpanelDefinition ( $this->relationship_name, $this->rhs_module, $this->rhs_subpanel, $this->getRightModuleSystemLabel() ) ;
+            $subpanelDefinitions [$this->rhs_module] = $this->getSubpanelDefinition($this->relationship_name, $this->lhs_module, $this->lhs_subpanel, $this->getLeftModuleSystemLabel());
+            $subpanelDefinitions [$this->lhs_module] = $this->getSubpanelDefinition($this->relationship_name, $this->rhs_module, $this->rhs_subpanel, $this->getRightModuleSystemLabel());
         }
-        return $subpanelDefinitions ;
+        return $subpanelDefinitions;
     }
 
 
     /*
      * @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' ) ;
-        $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()  ) . '_TITLE' ) ;
-        return $vardefs ;
+        $vardefs = array( );
+        $vardefs [$this->rhs_module] [] = $this->getLinkFieldDefinition($this->lhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE');
+        $vardefs [$this->lhs_module] [] = $this->getLinkFieldDefinition($this->rhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE');
+        return $vardefs;
     }
     
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
-        return array( $this->lhs_module => $this->getRelationshipMetaData ( MB_MANYTOMANY ) ) ;
+        return array($this->lhs_module => $this->getRelationshipMetaData(MB_MANYTOMANY));
     }