adamjakab / SuiteCRM

modules/EmailTemplates/EmailTemplate.php

Braces +18 added lines, -11 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.
@@ -179,8 +181,9 @@ 
                             break;
                         }
                     }
-                    if ($dup)
-                        $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    if ($dup) {
+                                            $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    }
                 }
             }
         }
@@ -253,8 +256,9 @@ 
                             break;
                         }
                     }
-                    if ($dup)
-                        $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    if ($dup) {
+                                            $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
+                    }
                 }
             }
         }
@@ -314,8 +318,9 @@ 
     function parse_tracker_urls($template_text_array, $url_template, $tracked_urls, $removeme_url_template)
     {
         global $beanFiles, $beanList, $app_list_strings, $sugar_config;
-        if (!isset($this->parsed_urls))
-            $this->parsed_urls = array();
+        if (!isset($this->parsed_urls)) {
+                    $this->parsed_urls = array();
+        }
 
         $return_array = $template_text_array;
         if (count($tracked_urls) > 0) {
@@ -398,8 +403,9 @@ 
             $user->retrieve($focus->assigned_user_id);
         }
 
-        if (!isset($this->parsed_entities))
-            $this->parsed_entities = array();
+        if (!isset($this->parsed_entities)) {
+                    $this->parsed_entities = array();
+        }
 
         //parse the template and find all the dynamic strings that need replacement.
         // Bug #48111 It's strange why prefix for User module is contact_user (see self::generateFieldDefsJS method)
@@ -775,8 +781,9 @@ 
         $template = new EmailTemplate();
         $optionKey = $template->field_defs['type']['options'];
         $options = $GLOBALS['app_list_strings'][$optionKey];
-        if (!is_admin($GLOBALS['current_user']) && isset($options['workflow']))
-            unset($options['workflow']);
+        if (!is_admin($GLOBALS['current_user']) && isset($options['workflow'])) {
+                    unset($options['workflow']);
+        }
 
         return $options;
     }

modules/FP_events/responseEntryPoint.php

Braces +18 added lines, -31 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');
+}
 
 	global $db;
 	 
@@ -29,16 +31,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-    		}
-    		else {
+    		} else {
     			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
     		}	
-    	}
-    	else if($response == 'decline'){
+    	} else if($response == 'decline'){
     		//check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
              $check = $db->getOne($check_q);
@@ -52,12 +51,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-    		}
-    		else {
+    		} else {
     			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
     		}
     	}
@@ -79,16 +76,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-            }
-            else {
+            } else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }   
-    	}
-    	else if($response == 'decline'){
+    	} else if($response == 'decline'){
             //check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
              $check = $db->getOne($check_q);
@@ -101,12 +95,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-            }
-            else {
+            } else {
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
             }
     	}
@@ -127,16 +119,13 @@ 
                     
                     $url = $event->accept_redirect;
                     header('Location: ' . $url);    
-                }
-                else{
+                } else{
                     echo 'Thank you for accepting';
                 }   
-            }
-            else {
+            } else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }   
-    	}
-    	else if($response == 'decline'){
+    	} else if($response == 'decline'){
     		//check to see if they have already responded to the email
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
              $check = $db->getOne($check_q);
@@ -150,12 +139,10 @@ 
                     $url = $event->decline_redirect;
                     header('Location: ' . $url);    
                     
-                }
-                else{
+                } else{
                     echo 'Thank you for declining';
                 }
-            }
-            else {
+            } else {
                 echo 'There was a problem with the link please contact the sender of the invite';
             }
     	}

modules/Meetings/JoinExternalMeeting.php

Braces +6 added lines, -4 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.
@@ -56,7 +58,7 @@ 
 if ( $_REQUEST['host_meeting'] == '1' ) {
     if($meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
         SugarApplication::redirect($meetingBean->host_url);
-    }else{
+    } else{
         //since they are now the owner of the meeting nor an Admin they cannot start the meeting.
         $tplFile = 'modules/Meetings/tpls/extMeetingNoStart.tpl';
         if ( file_exists('custom/'.$tplFile) ) {
@@ -68,10 +70,10 @@ 
         $ss->assign('bean',$meetingBean->toArray());
         $ss->display($tplFile);
     }
-}else{
+} else{
     if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
       SugarApplication::redirect($meetingBean->join_url);
-    }else{
+    } else{
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';
         if ( file_exists('custom/'.$tplFile) ) {

modules/Meetings/MeetingsQuickCreate.php

Braces +12 added lines, -7 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.
@@ -75,12 +77,15 @@ 
         $this->javascript->setSugarBean($focus);
         $this->javascript->addAllFields('');
 
-		if (is_null($focus->date_start))
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
-		if (is_null($focus->time_start))
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
-		if (!isset ($focus->duration_hours))
-			$focus->duration_hours = "1";
+		if (is_null($focus->date_start)) {
+					$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
+		}
+		if (is_null($focus->time_start)) {
+					$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		}
+		if (!isset ($focus->duration_hours)) {
+					$focus->duration_hours = "1";
+		}
 
         
         $date_start_array=explode(" ",trim($focus->date_start));

modules/Meetings/Meeting.php

Braces +48 added lines, -39 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.
@@ -207,8 +209,9 @@ 
 		}*/
 
 		// prevent a mass mailing for recurring meetings created in Calendar module
-		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
-			$check_notify = false;
+		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
+					$check_notify = false;
+		}
 
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
@@ -312,10 +315,11 @@ 
 
         $query .= $custom_join['join'];
 
-		if($where != "")
-			$query .= " where $where AND ".$where_auto;
-		else
-			$query .= " where ".$where_auto;
+		if($where != "") {
+					$query .= " where $where AND ".$where_auto;
+		} else {
+					$query .= " where ".$where_auto;
+		}
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
@@ -405,15 +409,18 @@ 
 		}
 
         //setting default date and time
-		if (is_null($this->date_start))
-			$this->date_start = $timedate->now();
-		if (is_null($this->time_start))
-			$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		if (is_null($this->date_start)) {
+					$this->date_start = $timedate->now();
+		}
+		if (is_null($this->time_start)) {
+					$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		}
 		if (is_null($this->duration_hours)) {
 			$this->duration_hours = "0";
 		}
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
+		if (is_null($this->duration_minutes)) {
+					$this->duration_minutes = "1";
+		}
 
 		if(empty($this->id) && !empty($_REQUEST['date_start'])){
 			$this->date_start = $_REQUEST['date_start'];
@@ -432,8 +439,7 @@ 
                     $td = $td->modify("+{$this->duration_minutes} mins");
                 }
                 $this->date_end = $td->format($GLOBALS['timedate']->get_date_time_format());
-            } 
-            else 
+            } else 
             {
                 $GLOBALS['log']->fatal("Meeting::save: Bad date {$this->date_start} for format ".$GLOBALS['timedate']->get_date_time_format());
             }
@@ -455,8 +461,9 @@ 
 
 		if ( empty($this->id) ) {
 		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
+		    if ( isset($reminder_t) ) {
+		    		        $this->reminder_time = $reminder_t;
+		    }
 		}
 		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
 
@@ -465,8 +472,9 @@ 
 		}
 		if(empty($this->id)){ 
 			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
+			if(isset($reminder_t)) {
+					    		$this->email_reminder_time = $reminder_t;
+			}
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
 
@@ -482,12 +490,14 @@ 
 		$meeting_fields = $this->get_list_view_array();
 
 		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
-			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
+		if(isset($this->parent_type)) {
+					$meeting_fields['PARENT_MODULE'] = $this->parent_type;
+		}
 		if($this->status == "Planned") {
 			//cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
-			if(empty($action))
-			     $action = "index";
+			if(empty($action)) {
+						     $action = "index";
+			}
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
 			if ($this->ACLAccess('edit')) {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
@@ -502,7 +512,7 @@ 
 		$date_db = $timedate->to_db($mergeTime);
 		if($date_db	< $today	) {
 			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
+		} else if($date_db	< $nextday) {
 			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
 		} else {
 			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
@@ -669,14 +679,12 @@ 
 			{
 				vCal::cache_sugar_vcal($user);
 			}
-		}
-		else if($user->object_name == 'Contact')
+		} else if($user->object_name == 'Contact')
 		{
 			$relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
 			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
-		}
-        else if($user->object_name == 'Lead')
+		} else if($user->object_name == 'Lead')
 		{
 			$relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
@@ -730,8 +738,9 @@ 
 		global $sugar_config;
 		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
 			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
+			if(isset($list[$current_user->id])) {
+							unset($list[$current_user->id]);
+			}
 		}
 		return $list;
 	}
@@ -822,11 +831,10 @@ 
            //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
            	if(!empty($GLOBALS['soap_server_object'])){
            		$exclude = array('contact_id', 'user_id');
-           	}else{
+           	} else{
 	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
            	}
-           }
-           else{
+           } else{
            	$exclude = array('user_id');
            }
         }
@@ -841,13 +849,14 @@ 
 	{
 	    if ( $this->parent_type == 'Contacts' ) {
 	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
-	            $this->contacts->add($this->parent_id);
-	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
+	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) ) {
+	        	            $this->contacts->add($this->parent_id);
+	        }
+	    } elseif ( $this->parent_type == 'Leads' ) {
 	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
-	            $this->leads->add($this->parent_id);
+	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) ) {
+	        	            $this->leads->add($this->parent_id);
+	        }
 	    }
 
 	    parent::afterImportSave();

modules/Meetings/metadata/additionalDetails.php

Braces +6 added lines, -2 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.
@@ -94,7 +96,9 @@ 
 
     if(!empty($fields['DESCRIPTION'])) {
         $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+        if(strlen($fields['DESCRIPTION']) > 300) {
+            $overlib_string .= '...';
+        }
         $overlib_string .= '<br>';
     }
     $overlib_string .= '<br>';

modules/ModuleBuilder/views/view.module.php

Braces +6 added lines, -3 removed lines

@@ -87,11 +87,14 @@
 		$ajax = new AjaxCompose();
 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
 		$ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
-		if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
+		if(empty($module_name)) {
+		    $module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
+		}
 		$ajax->addCrumb($module_name, '');
 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
-		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
-			$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule') {
+					$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
+		}
 		$ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
 		
 		echo $ajax->getJavascript();

modules/ModuleBuilder/views/view.searchview.php

Braces +9 added lines, -4 removed lines

@@ -1,6 +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.
@@ -119,14 +120,18 @@ 
  			$ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
  			$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
  			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
+ 			if ( $layoutLabel == 'LBL_LAYOUTS' ) {
+ 			    $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
+ 			}
  			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
  		} else
  		{
  			$ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
  			$ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
  			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
+ 			if ( $layoutLabel == 'LBL_LAYOUTS' ) {
+ 			    $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
+ 			}
  			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
  		}
  		$this->title = $searchLabel;

modules/ModuleBuilder/views/view.relationship.php

Braces +10 added lines, -7 removed lines

@@ -120,8 +120,9 @@ 
                 
         $cardinality = array ( MB_ONETOONE => translate ( 'LBL_ONETOONE' ) , MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ) , MB_MANYTOONE=> translate ( 'LBL_MANYTOONE' ), MB_MANYTOMANY => translate ( 'LBL_MANYTOMANY' ), ) ;
         
-        if (!$this->fromModuleBuilder)
-            unset($cardinality[MB_MANYTOONE]);
+        if (!$this->fromModuleBuilder) {
+                    unset($cardinality[MB_MANYTOONE]);
+        }
             
         $relationships = $module->getRelationships () ;
         
@@ -136,7 +137,7 @@ 
 	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
 	            $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
 	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
-			}else{
+			} else{
 				#30624
 				if(!empty($_REQUEST['rhs_module'])){
 					$definition['rhs_label'] = $_REQUEST['rhs_module'];
@@ -254,12 +255,14 @@ 
                     }
                     $this->smarty->assign ( 'relationship_role_column_enum', $validRoleColumnFields ) ;
                 }
-                if (! empty ( $relationship->relationship_role_column_value ))
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                if (! empty ( $relationship->relationship_role_column_value )) {
+                                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                }
                 break ;
             case MB_MANYTOMANY :
-                if (! empty ( $relationship->relationship_role_column_value ))
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                if (! empty ( $relationship->relationship_role_column_value )) {
+                                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
+                }
                 break ;
         }