adamjakab / SuiteCRM

modules/Leads/metadata/additionalDetails.php

Indentation +36 added lines, -36 removed lines

@@ -40,13 +40,13 @@ 
 
  
 function additionalDetailsLead($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Leads');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Leads');
+    }
 		
-	$overlib_string = '';
+    $overlib_string = '';
     if(!empty($fields['ID'])) {
         $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
         $overlib_string .= '">';
@@ -55,39 +55,39 @@ 
     $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
 
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
-		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+        !empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
+        !empty($fields['PRIMARY_ADDRESS_COUNTRY']))
+            $overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+    if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+    if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+        $overlib_string .= '<br>';  
+        if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+    if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+    if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+    if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
-								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
+    if(!empty($fields['EMAIL2'])) 
+        $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
+                                    "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
+                                    "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
+                                    "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
+                                    "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
+                                    "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
 	
-	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(!empty($fields['DESCRIPTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+    }	
 	
-	return array('fieldToAddTo' => 'NAME', 
-				 'string' => $overlib_string, 
-				 'editLink' => "index.php?action=EditView&module=Leads&return_module=Leads&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Leads&return_module=Leads&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'NAME', 
+                    'string' => $overlib_string, 
+                    'editLink' => "index.php?action=EditView&module=Leads&return_module=Leads&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Leads&return_module=Leads&record={$fields['ID']}");
 }
  
- ?>
+    ?>
  

Spacing +26 added lines, -26 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.
@@ -41,46 +41,46 @@ 
  
 function additionalDetailsLead($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Leads');
 	}
 		
 	$overlib_string = '';
-    if(!empty($fields['ID'])) {
-        $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
+    if (!empty($fields['ID'])) {
+        $overlib_string .= '<input type="hidden" value="'.$fields['ID'];
         $overlib_string .= '">';
     }
 
-    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
+    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName='.SugarThemeRegistry::current()->name.'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
 
-    if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
+    if (!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
 		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+			$overlib_string .= '<b>'.$mod_strings['LBL_PRIMARY_ADDRESS'].'</b><br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'].', ';
+	if (!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'].'<br>';
+	if (strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
 		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+		if (!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'.$mod_strings['LBL_MOBILE_PHONE'].'</b> <span class="phone">'.$fields['PHONE_MOBILE'].'</span><br>';
+	if (!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'.$mod_strings['LBL_HOME_PHONE'].'</b> <span class="phone">'.$fields['PHONE_HOME'].'</span><br>';
+	if (!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'.$mod_strings['LBL_OTHER_PHONE'].'</b> <span class="phone">'.$fields['PHONE_OTHER'].'</span><br>';
+	if (!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'.$mod_strings['LBL_LEAD_SOURCE'].'</b> '.$fields['LEAD_SOURCE'].'<br>';
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
+	if (!empty($fields['EMAIL2'])) 
+		$overlib_string .= '<b>'.$mod_strings['LBL_OTHER_EMAIL_ADDRESS'].'</b> '. 
+								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&".
+								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names".
+								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&".
+								 "to_email_addrs=".urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>").
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
 	
-	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 (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 	}	
 	
 	return array('fieldToAddTo' => 'NAME', 

Braces +42 added lines, -17 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,31 +58,54 @@ 
 
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+		!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+    			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    }
+	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+	}
+	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) {
+			$overlib_string .= '<br>';
+	}
+		if(!empty($fields['PHONE_MOBILE'])) {
+		    $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+		}
+	if(!empty($fields['PHONE_HOME'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+	}
+	if(!empty($fields['PHONE_OTHER'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+	}
+	if(!empty($fields['LEAD_SOURCE'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+	}
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
+	if(!empty($fields['EMAIL2'])) {
+			$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
 								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
 								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
 								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
 								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
+	}
 	
 	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 .= '...';
+		}
 	}	
 	
 	return array('fieldToAddTo' => 'NAME', 

modules/Leads/metadata/convertdefs.php

Indentation +13 added lines, -13 removed lines

@@ -46,13 +46,13 @@ 
         'form'=>array(
             'hidden'=>array(
                 '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
-    			'<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
-    			'<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
-    			'<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
-    			'<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">'
+                '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
+                '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
+                '<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
+                '<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">'
             )
         ),
-		'maxColumns' => '2', 
+        'maxColumns' => '2', 
         'widths' => array(
             array('label' => '10', 'field' => '30'), 
             array('label' => '10', 'field' => '30'),
@@ -105,7 +105,7 @@ 
     'copyData' => true,
     'required' => true,
     'select' => "account_name",
-	'default_action' => 'create',
+    'default_action' => 'create',
     'relationship' => 'accounts_contacts',
     'templateMeta' => array(
         'form'=>array(
@@ -229,7 +229,7 @@ 
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
             array (
-               'date_start', 
+                'date_start', 
                 array (
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
@@ -250,7 +250,7 @@ 
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
                     array (
-                      'required' => true,
+                        'required' => true,
                     ),
                 ),
             ),
@@ -288,8 +288,8 @@ 
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
             array (
-               'date_start', 
-	            array (
+                'date_start', 
+                array (
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
                     'customCode' => '{literal}
@@ -309,7 +309,7 @@ 
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
                     array (
-                      'required' => true,
+                        'required' => true,
                     ),
                 ),
             ),
@@ -344,8 +344,8 @@ 
             array (
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-			array (
-               'status', 'priority'
+            array (
+                'status', 'priority'
             ), 
             
             array (

Spacing +48 added lines, -48 removed lines

@@ -58,41 +58,41 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_CONTACT' => array (
-            array (
-                array (
+    'panels' =>array(
+        'LNK_NEW_CONTACT' => array(
+            array(
+                array(
                     'name' => 'first_name',
                     'customCode' => '{html_options name="Contactssalutation" options=$fields.salutation.options selected=$fields.salutation.value}&nbsp;<input name="Contactsfirst_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
                 ),
                 'title',
             ), 
-            array (
+            array(
                 
                 'last_name',
                 'department',
             ),
-            array (
+            array(
                 array('name' => 'primary_address_street', 'label' => 'LBL_PRIMARY_ADDRESS'),
                 'phone_work',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_city', 'label' => 'LBL_CITY'),
                 'phone_mobile',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_state', 'label' => 'LBL_STATE'),
                 'phone_other',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_postalcode', 'label' => 'LBL_POSTAL_CODE'),
                 'phone_fax',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_country', 'label' => 'LBL_COUNTRY'),
                 'lead_source',
             ),
-            array (
+            array(
                 'email1'
             ),
             array(
@@ -123,13 +123,13 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_ACCOUNT' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_ACCOUNT' => array(
+            array(
                 'name',
                 'phone_office',
             ),
-            array (
+            array(
                 'website',
             ),
             array(
@@ -152,21 +152,21 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_OPPORTUNITY' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_OPPORTUNITY' => array(
+            array(
                 'name',
                 'currency_id'
             ), 
-            array (
+            array(
                 'sales_stage',
                 'amount'
             ),
-            array (
+            array(
                 'date_closed',
                 ''
             ),
-            array (
+            array(
                 'description'
             ),
         )
@@ -191,13 +191,13 @@ 
             array('label' => '10', 'field' => '30'),    
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_NOTE' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_NOTE' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),
@@ -223,14 +223,14 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_CALL' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_CALL' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-            array (
+            array(
                'date_start', 
-                array (
+                array(
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
                     'customCode' => '{literal}
@@ -249,13 +249,13 @@ 
 {html_options name="Callsduration_minutes" options=$minutes_values selected=$fields.duration_minutes.value} &nbsp;
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
-                    array (
+                    array(
                       'required' => true,
                     ),
                 ),
             ),
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),
@@ -282,14 +282,14 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_MEETING' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_MEETING' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-            array (
+            array(
                'date_start', 
-	            array (
+	            array(
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
                     'customCode' => '{literal}
@@ -308,13 +308,13 @@ 
 {html_options name="Meetingsduration_minutes" options=$minutes_values selected=$fields.duration_minutes.value} &nbsp;
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
-                    array (
+                    array(
                       'required' => true,
                     ),
                 ),
             ),
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),
@@ -339,17 +339,17 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_TASK' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_TASK' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-			array (
+			array(
                'status', 'priority'
             ), 
             
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),

modules/Leads/metadata/editviewdefs.php

Indentation +84 added lines, -84 removed lines

@@ -1,177 +1,177 @@
 <?php
 $viewdefs ['Leads'] = 
 array (
-  'EditView' => 
-  array (
+    'EditView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'hidden' => 
         array (
-          0 => '<input type="hidden" name="prospect_id" value="{if isset($smarty.request.prospect_id)}{$smarty.request.prospect_id}{else}{$bean->prospect_id}{/if}">',
-          1 => '<input type="hidden" name="account_id" value="{if isset($smarty.request.account_id)}{$smarty.request.account_id}{else}{$bean->account_id}{/if}">',
-          2 => '<input type="hidden" name="contact_id" value="{if isset($smarty.request.contact_id)}{$smarty.request.contact_id}{else}{$bean->contact_id}{/if}">',
-          3 => '<input type="hidden" name="opportunity_id" value="{if isset($smarty.request.opportunity_id)}{$smarty.request.opportunity_id}{else}{$bean->opportunity_id}{/if}">',
+            0 => '<input type="hidden" name="prospect_id" value="{if isset($smarty.request.prospect_id)}{$smarty.request.prospect_id}{else}{$bean->prospect_id}{/if}">',
+            1 => '<input type="hidden" name="account_id" value="{if isset($smarty.request.account_id)}{$smarty.request.account_id}{else}{$bean->account_id}{/if}">',
+            2 => '<input type="hidden" name="contact_id" value="{if isset($smarty.request.contact_id)}{$smarty.request.contact_id}{else}{$bean->contact_id}{/if}">',
+            3 => '<input type="hidden" name="opportunity_id" value="{if isset($smarty.request.opportunity_id)}{$smarty.request.opportunity_id}{else}{$bean->opportunity_id}{/if}">',
         ),
         'buttons' => 
         array (
-          0 => 'SAVE',
-          1 => 'CANCEL',
+            0 => 'SAVE',
+            1 => 'CANCEL',
         ),
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        ),
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
-      ),
-      'javascript' => '<script type="text/javascript" language="Javascript">function copyAddressRight(form)  {ldelim} form.alt_address_street.value = form.primary_address_street.value;form.alt_address_city.value = form.primary_address_city.value;form.alt_address_state.value = form.primary_address_state.value;form.alt_address_postalcode.value = form.primary_address_postalcode.value;form.alt_address_country.value = form.primary_address_country.value;return true; {rdelim} function copyAddressLeft(form)  {ldelim} form.primary_address_street.value =form.alt_address_street.value;form.primary_address_city.value = form.alt_address_city.value;form.primary_address_state.value = form.alt_address_state.value;form.primary_address_postalcode.value =form.alt_address_postalcode.value;form.primary_address_country.value = form.alt_address_country.value;return true; {rdelim} </script>',
-      'useTabs' => false,
-      'tabDefs' => 
-      array (
+        ),
+        'javascript' => '<script type="text/javascript" language="Javascript">function copyAddressRight(form)  {ldelim} form.alt_address_street.value = form.primary_address_street.value;form.alt_address_city.value = form.primary_address_city.value;form.alt_address_state.value = form.primary_address_state.value;form.alt_address_postalcode.value = form.primary_address_postalcode.value;form.alt_address_country.value = form.primary_address_country.value;return true; {rdelim} function copyAddressLeft(form)  {ldelim} form.primary_address_street.value =form.alt_address_street.value;form.primary_address_city.value = form.alt_address_city.value;form.primary_address_state.value = form.alt_address_state.value;form.primary_address_postalcode.value =form.alt_address_postalcode.value;form.primary_address_country.value = form.alt_address_country.value;return true; {rdelim} </script>',
+        'useTabs' => false,
+        'tabDefs' => 
+        array (
         'LBL_CONTACT_INFORMATION' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ADVANCED' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'LBL_CONTACT_INFORMATION' => 
-      array (
+        'LBL_CONTACT_INFORMATION' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'first_name',
             'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}&nbsp;<input name="first_name"  id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 'last_name',
-          1 => 'phone_work',
+            0 => 'last_name',
+            1 => 'phone_work',
         ),
         2 => 
         array (
-          0 => 'title',
-          1 => 'phone_mobile',
+            0 => 'title',
+            1 => 'phone_mobile',
         ),
         3 => 
         array (
-          0 => 'department',
-          1 => 'phone_fax',
+            0 => 'department',
+            1 => 'phone_fax',
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'account_name',
             'type' => 'varchar',
             'validateDependency' => false,
             'customCode' => '<input name="account_name" id="EditView_account_name" {if ($fields.converted.value == 1)}disabled="true"{/if} size="30" maxlength="255" type="text" value="{$fields.account_name.value}">',
-          ),
-          1 => 'website',
+            ),
+            1 => 'website',
         ),
         5 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'primary_address_street',
             'hideLabel' => true,
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'primary',
-              'rows' => 2,
-              'cols' => 30,
-              'maxlength' => 150,
+                'key' => 'primary',
+                'rows' => 2,
+                'cols' => 30,
+                'maxlength' => 150,
             ),
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'alt_address_street',
             'hideLabel' => true,
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'alt',
-              'copy' => 'primary',
-              'rows' => 2,
-              'cols' => 30,
-              'maxlength' => 150,
+                'key' => 'alt',
+                'copy' => 'primary',
+                'rows' => 2,
+                'cols' => 30,
+                'maxlength' => 150,
+            ),
             ),
-          ),
         ),
         6 => 
         array (
-          0 => 'email1',
+            0 => 'email1',
         ),
         7 => 
         array (
-          0 => 'description',
+            0 => 'description',
+        ),
         ),
-      ),
-      'LBL_PANEL_ADVANCED' => 
-      array (
+        'LBL_PANEL_ADVANCED' => 
+        array (
         0 => 
         array (
-          0 => 'status',
-          1 => 'lead_source',
+            0 => 'status',
+            1 => 'lead_source',
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'status_description',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'lead_source_description',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 'opportunity_amount',
-          1 => 'refered_by',
+            0 => 'opportunity_amount',
+            1 => 'refered_by',
         ),
         3 => 
         array (
-          0 => 'campaign_name',
+            0 => 'campaign_name',
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' => 
-      array (
+        ),
+        'LBL_PANEL_ASSIGNMENT' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

Spacing +39 added lines, -39 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 $viewdefs ['Leads'] = 
-array (
+array(
   'EditView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'hidden' => 
-        array (
+        array(
           0 => '<input type="hidden" name="prospect_id" value="{if isset($smarty.request.prospect_id)}{$smarty.request.prospect_id}{else}{$bean->prospect_id}{/if}">',
           1 => '<input type="hidden" name="account_id" value="{if isset($smarty.request.account_id)}{$smarty.request.account_id}{else}{$bean->account_id}{/if}">',
           2 => '<input type="hidden" name="contact_id" value="{if isset($smarty.request.contact_id)}{$smarty.request.contact_id}{else}{$bean->contact_id}{/if}">',
           3 => '<input type="hidden" name="opportunity_id" value="{if isset($smarty.request.opportunity_id)}{$smarty.request.opportunity_id}{else}{$bean->opportunity_id}{/if}">',
         ),
         'buttons' => 
-        array (
+        array(
           0 => 'SAVE',
           1 => 'CANCEL',
         ),
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -37,55 +37,55 @@ 
       'javascript' => '<script type="text/javascript" language="Javascript">function copyAddressRight(form)  {ldelim} form.alt_address_street.value = form.primary_address_street.value;form.alt_address_city.value = form.primary_address_city.value;form.alt_address_state.value = form.primary_address_state.value;form.alt_address_postalcode.value = form.primary_address_postalcode.value;form.alt_address_country.value = form.primary_address_country.value;return true; {rdelim} function copyAddressLeft(form)  {ldelim} form.primary_address_street.value =form.alt_address_street.value;form.primary_address_city.value = form.alt_address_city.value;form.primary_address_state.value = form.alt_address_state.value;form.primary_address_postalcode.value =form.alt_address_postalcode.value;form.primary_address_country.value = form.alt_address_country.value;return true; {rdelim} </script>',
       'useTabs' => false,
       'tabDefs' => 
-      array (
+      array(
         'LBL_CONTACT_INFORMATION' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ADVANCED' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'LBL_CONTACT_INFORMATION' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'first_name',
             'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}&nbsp;<input name="first_name"  id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 'last_name',
           1 => 'phone_work',
         ),
         2 => 
-        array (
+        array(
           0 => 'title',
           1 => 'phone_mobile',
         ),
         3 => 
-        array (
+        array(
           0 => 'department',
           1 => 'phone_fax',
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'account_name',
             'type' => 'varchar',
             'validateDependency' => false,
@@ -94,14 +94,14 @@ 
           1 => 'website',
         ),
         5 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'primary_address_street',
             'hideLabel' => true,
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'primary',
               'rows' => 2,
               'cols' => 30,
@@ -109,12 +109,12 @@ 
             ),
           ),
           1 => 
-          array (
+          array(
             'name' => 'alt_address_street',
             'hideLabel' => true,
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'alt',
               'copy' => 'primary',
               'rows' => 2,
@@ -124,48 +124,48 @@ 
           ),
         ),
         6 => 
-        array (
+        array(
           0 => 'email1',
         ),
         7 => 
-        array (
+        array(
           0 => 'description',
         ),
       ),
       'LBL_PANEL_ADVANCED' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'status',
           1 => 'lead_source',
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'status_description',
           ),
           1 => 
-          array (
+          array(
             'name' => 'lead_source_description',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 'opportunity_amount',
           1 => 'refered_by',
         ),
         3 => 
-        array (
+        array(
           0 => 'campaign_name',
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
           ),

modules/Leads/metadata/SearchFields.php

Indentation +23 added lines, -23 removed lines

@@ -45,18 +45,18 @@ 
         'last_name'=> array('query_type'=>'default'),
         'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
         'account_name'=> array('query_type'=>'default','db_field'=>array('leads.account_name')),
-		/*'acc_name_from_accounts' => array('query_type'=>'default','related_field'=>'account_name'),*/
+        /*'acc_name_from_accounts' => array('query_type'=>'default','related_field'=>'account_name'),*/
         'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options'=>'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
         'do_not_call'=> array('query_type'=>'default', 'operator'=>'=', 'input_type' => 'checkbox'),
         'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','phone_home')),
-		'email'=> array(
-			'query_type' => 'default',
-			'operator' => 'subquery',
-			'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
-			'db_field' => array(
-				'id',
-			),
-		),	
+        'email'=> array(
+            'query_type' => 'default',
+            'operator' => 'subquery',
+            'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
+            'db_field' => array(
+                'id',
+            ),
+        ),	
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
@@ -75,20 +75,20 @@ 
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options'=>'lead_status_dom', 'template_var' => 'STATUS_OPTIONS'),
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('status'),
-			'operator'=>'not in',
-			'closed_values' => array('Dead', 'Recycled', 'Converted'),
-			'type'=>'bool',
-		),
-		//Range Search Support 
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('status'),
+            'operator'=>'not in',
+            'closed_values' => array('Dead', 'Recycled', 'Converted'),
+            'type'=>'bool',
+        ),
+        //Range Search Support 
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
         'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 				
+        //Range Search Support 				
     );
 ?>
\ No newline at end of file

Spacing +20 added lines, -20 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.
@@ -40,15 +40,15 @@ 
 global $current_user;
 $module_name = "Leads";
 $searchFields['Leads'] = 
-    array (
-        'first_name' => array( 'query_type'=>'default'),
+    array(
+        'first_name' => array('query_type'=>'default'),
         'last_name'=> array('query_type'=>'default'),
-        'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
-        'account_name'=> array('query_type'=>'default','db_field'=>array('leads.account_name')),
+        'search_name'=> array('query_type'=>'default', 'db_field'=>array('first_name', 'last_name'), 'force_unifiedsearch'=>true),
+        'account_name'=> array('query_type'=>'default', 'db_field'=>array('leads.account_name')),
 		/*'acc_name_from_accounts' => array('query_type'=>'default','related_field'=>'account_name'),*/
-        'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options'=>'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+        'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options'=>'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
         'do_not_call'=> array('query_type'=>'default', 'operator'=>'=', 'input_type' => 'checkbox'),
-        'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','phone_home')),
+        'phone'=> array('query_type'=>'default', 'db_field'=>array('phone_mobile', 'phone_work', 'phone_other', 'phone_fax', 'phone_home')),
 		'email'=> array(
 			'query_type' => 'default',
 			'operator' => 'subquery',
@@ -63,16 +63,16 @@ 
             'subquery' => 'SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = "'.$module_name.'"
-			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
+			                        and favorites.assigned_user_id = "' .$current_user->id.'") OR NOT ({0}',
             'db_field'=>array('id')),
         'assistant'=> array('query_type'=>'default'),
         'website'=> array('query_type'=>'default'),
-        'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-        'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-        'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-        'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-        'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'address_street'=> array('query_type'=>'default', 'db_field'=>array('primary_address_street', 'alt_address_street')),
+        'address_city'=> array('query_type'=>'default', 'db_field'=>array('primary_address_city', 'alt_address_city')),
+        'address_state'=> array('query_type'=>'default', 'db_field'=>array('primary_address_state', 'alt_address_state')),
+        'address_postalcode'=> array('query_type'=>'default', 'db_field'=>array('primary_address_postalcode', 'alt_address_postalcode')),
+        'address_country'=> array('query_type'=>'default', 'db_field'=>array('primary_address_country', 'alt_address_country')),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options'=>'lead_status_dom', 'template_var' => 'STATUS_OPTIONS'),
 		'open_only' => array(
@@ -83,12 +83,12 @@ 
 			'type'=>'bool',
 		),
 		//Range Search Support 
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	    'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    //Range Search Support 				
     );
 ?>
\ No newline at end of file

Braces +3 added lines, -1 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.

modules/Leads/metadata/detailviewdefs.php

Indentation +101 added lines, -101 removed lines

@@ -1,217 +1,217 @@
 <?php
 $viewdefs ['Leads'] = 
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 'EDIT',
-          1 => 'DUPLICATE',
-          2 => 'DELETE',
-          3 => 
-          array (
+            0 => 'EDIT',
+            1 => 'DUPLICATE',
+            2 => 'DELETE',
+            3 => 
+            array (
             'customCode' => '{if $bean->aclAccess("edit") && !$DISABLE_CONVERT_ACTION}<input title="{$MOD.LBL_CONVERTLEAD_TITLE}" accessKey="{$MOD.LBL_CONVERTLEAD_BUTTON_KEY}" type="button" class="button" onClick="document.location=\'index.php?module=Leads&action=ConvertLead&record={$fields.id.value}\'" name="convert" value="{$MOD.LBL_CONVERTLEAD}">{/if}',
             'sugar_html' => 
             array (
-              'type' => 'button',
-              'value' => '{$MOD.LBL_CONVERTLEAD}',
-              'htmlOptions' => 
-              array (
+                'type' => 'button',
+                'value' => '{$MOD.LBL_CONVERTLEAD}',
+                'htmlOptions' => 
+                array (
                 'title' => '{$MOD.LBL_CONVERTLEAD_TITLE}',
                 'accessKey' => '{$MOD.LBL_CONVERTLEAD_BUTTON_KEY}',
                 'class' => 'button',
                 'onClick' => 'document.location=\'index.php?module=Leads&action=ConvertLead&record={$fields.id.value}\'',
                 'name' => 'convert',
                 'id' => 'convert_lead_button',
-              ),
-              'template' => '{if $bean->aclAccess("edit") && !$DISABLE_CONVERT_ACTION}[CONTENT]{/if}',
+                ),
+                'template' => '{if $bean->aclAccess("edit") && !$DISABLE_CONVERT_ACTION}[CONTENT]{/if}',
             ),
-          ),
-          4 => 'FIND_DUPLICATES',
-          5 => 
-          array (
+            ),
+            4 => 'FIND_DUPLICATES',
+            5 => 
+            array (
             'customCode' => '<input title="{$APP.LBL_MANAGE_SUBSCRIPTIONS}" class="button" onclick="this.form.return_module.value=\'Leads\'; this.form.return_action.value=\'DetailView\';this.form.return_id.value=\'{$fields.id.value}\'; this.form.action.value=\'Subscriptions\'; this.form.module.value=\'Campaigns\'; this.form.module_tab.value=\'Leads\';" type="submit" name="Manage Subscriptions" value="{$APP.LBL_MANAGE_SUBSCRIPTIONS}">',
             'sugar_html' => 
             array (
-              'type' => 'submit',
-              'value' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
-              'htmlOptions' => 
-              array (
+                'type' => 'submit',
+                'value' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
+                'htmlOptions' => 
+                array (
                 'title' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
                 'class' => 'button',
                 'id' => 'manage_subscriptions_button',
                 'onclick' => 'this.form.return_module.value=\'Leads\'; this.form.return_action.value=\'DetailView\';this.form.return_id.value=\'{$fields.id.value}\'; this.form.action.value=\'Subscriptions\'; this.form.module.value=\'Campaigns\'; this.form.module_tab.value=\'Leads\';',
                 'name' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
-              ),
+                ),
+            ),
             ),
-          ),
-          'AOS_GENLET' => 
-          array (
+            'AOS_GENLET' => 
+            array (
             'customCode' => '<input type="button" class="button" onClick="showPopup();" value="{$APP.LBL_GENERATE_LETTER}">',
-          ),
+            ),
         ),
         'headerTpl' => 'modules/Leads/tpls/DetailViewHeader.tpl',
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        ),
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'includes' => 
-      array (
+        'includes' => 
+        array (
         0 => 
         array (
-          'file' => 'modules/Leads/Lead.js',
+            'file' => 'modules/Leads/Lead.js',
+        ),
         ),
-      ),
-      'useTabs' => true,
-      'tabDefs' => 
-      array (
+        'useTabs' => true,
+        'tabDefs' => 
+        array (
         'LBL_CONTACT_INFORMATION' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ADVANCED' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'LBL_CONTACT_INFORMATION' => 
-      array (
+        'LBL_CONTACT_INFORMATION' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'full_name',
             'label' => 'LBL_NAME',
-          ),
-          1 => 'phone_work',
+            ),
+            1 => 'phone_work',
         ),
         1 => 
         array (
-          0 => 'title',
-          1 => 'phone_mobile',
+            0 => 'title',
+            1 => 'phone_mobile',
         ),
         2 => 
         array (
-          0 => 'department',
-          1 => 'phone_fax',
+            0 => 'department',
+            1 => 'phone_fax',
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'account_name',
-          ),
-          1 => 'website',
+            ),
+            1 => 'website',
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'primary_address_street',
             'label' => 'LBL_PRIMARY_ADDRESS',
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'primary',
+                'key' => 'primary',
+            ),
             ),
-          ),
-          1 => 
-          array (
+            1 => 
+            array (
             'name' => 'alt_address_street',
             'label' => 'LBL_ALTERNATE_ADDRESS',
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'alt',
+                'key' => 'alt',
+            ),
             ),
-          ),
         ),
         5 => 
         array (
-          0 => 'email1',
+            0 => 'email1',
         ),
         6 => 
         array (
-          0 => 'description',
+            0 => 'description',
         ),
         7 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
+            ),
+        ),
         ),
-      ),
-      'LBL_PANEL_ADVANCED' => 
-      array (
+        'LBL_PANEL_ADVANCED' => 
+        array (
         0 => 
         array (
-          0 => 'status',
-          1 => 'lead_source',
+            0 => 'status',
+            1 => 'lead_source',
         ),
         1 => 
         array (
-          0 => 'status_description',
-          1 => 'lead_source_description',
+            0 => 'status_description',
+            1 => 'lead_source_description',
         ),
         2 => 
         array (
-          0 => 'opportunity_amount',
-          1 => 'refered_by',
+            0 => 'opportunity_amount',
+            1 => 'refered_by',
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'campaign_name',
             'label' => 'LBL_CAMPAIGN',
-          ),
+            ),
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' => 
-      array (
+        'LBL_PANEL_ASSIGNMENT' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
-          ),
-          1 =>
-          array (
+            ),
+            1 =>
+            array (
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +48 added lines, -48 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 $viewdefs ['Leads'] = 
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
           3 => 
-          array (
+          array(
             'customCode' => '{if $bean->aclAccess("edit") && !$DISABLE_CONVERT_ACTION}<input title="{$MOD.LBL_CONVERTLEAD_TITLE}" accessKey="{$MOD.LBL_CONVERTLEAD_BUTTON_KEY}" type="button" class="button" onClick="document.location=\'index.php?module=Leads&action=ConvertLead&record={$fields.id.value}\'" name="convert" value="{$MOD.LBL_CONVERTLEAD}">{/if}',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'button',
               'value' => '{$MOD.LBL_CONVERTLEAD}',
               'htmlOptions' => 
-              array (
+              array(
                 'title' => '{$MOD.LBL_CONVERTLEAD_TITLE}',
                 'accessKey' => '{$MOD.LBL_CONVERTLEAD_BUTTON_KEY}',
                 'class' => 'button',
@@ -33,14 +33,14 @@ 
           ),
           4 => 'FIND_DUPLICATES',
           5 => 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_MANAGE_SUBSCRIPTIONS}" class="button" onclick="this.form.return_module.value=\'Leads\'; this.form.return_action.value=\'DetailView\';this.form.return_id.value=\'{$fields.id.value}\'; this.form.action.value=\'Subscriptions\'; this.form.module.value=\'Campaigns\'; this.form.module_tab.value=\'Leads\';" type="submit" name="Manage Subscriptions" value="{$APP.LBL_MANAGE_SUBSCRIPTIONS}">',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
               'htmlOptions' => 
-              array (
+              array(
                 'title' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
                 'class' => 'button',
                 'id' => 'manage_subscriptions_button',
@@ -50,7 +50,7 @@ 
             ),
           ),
           'AOS_GENLET' => 
-          array (
+          array(
             'customCode' => '<input type="button" class="button" onClick="showPopup();" value="{$APP.LBL_GENERATE_LETTER}">',
           ),
         ),
@@ -58,154 +58,154 @@ 
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'includes' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'file' => 'modules/Leads/Lead.js',
         ),
       ),
       'useTabs' => true,
       'tabDefs' => 
-      array (
+      array(
         'LBL_CONTACT_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ADVANCED' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'LBL_CONTACT_INFORMATION' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'full_name',
             'label' => 'LBL_NAME',
           ),
           1 => 'phone_work',
         ),
         1 => 
-        array (
+        array(
           0 => 'title',
           1 => 'phone_mobile',
         ),
         2 => 
-        array (
+        array(
           0 => 'department',
           1 => 'phone_fax',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'account_name',
           ),
           1 => 'website',
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'primary_address_street',
             'label' => 'LBL_PRIMARY_ADDRESS',
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'primary',
             ),
           ),
           1 => 
-          array (
+          array(
             'name' => 'alt_address_street',
             'label' => 'LBL_ALTERNATE_ADDRESS',
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'alt',
             ),
           ),
         ),
         5 => 
-        array (
+        array(
           0 => 'email1',
         ),
         6 => 
-        array (
+        array(
           0 => 'description',
         ),
         7 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
           ),
         ),
       ),
       'LBL_PANEL_ADVANCED' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'status',
           1 => 'lead_source',
         ),
         1 => 
-        array (
+        array(
           0 => 'status_description',
           1 => 'lead_source_description',
         ),
         2 => 
-        array (
+        array(
           0 => 'opportunity_amount',
           1 => 'refered_by',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'campaign_name',
             'label' => 'LBL_CAMPAIGN',
           ),
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
           ),
           1 =>
-          array (
+          array(
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
           ),

modules/Leads/metadata/quickcreatedefs.php

Indentation +69 added lines, -69 removed lines

@@ -47,131 +47,131 @@
 
 $viewdefs ['Leads'] = 
 array (
-  'QuickCreate' => 
-  array (
+    'QuickCreate' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'hidden' => 
         array (
-          0 => '<input type="hidden" name="prospect_id" value="{if isset($smarty.request.prospect_id)}{$smarty.request.prospect_id}{else}{$bean->prospect_id}{/if}">',
-          1 => '<input type="hidden" name="contact_id" value="{if isset($smarty.request.contact_id)}{$smarty.request.contact_id}{else}{$bean->contact_id}{/if}">',
-          2 => '<input type="hidden" name="opportunity_id" value="{if isset($smarty.request.opportunity_id)}{$smarty.request.opportunity_id}{else}{$bean->opportunity_id}{/if}">',
-          3 => '<input type="hidden" name="account_id" value="{if isset($smarty.request.account_id)}{$smarty.request.account_id}{else}{$bean->account_id}{/if}">',
+            0 => '<input type="hidden" name="prospect_id" value="{if isset($smarty.request.prospect_id)}{$smarty.request.prospect_id}{else}{$bean->prospect_id}{/if}">',
+            1 => '<input type="hidden" name="contact_id" value="{if isset($smarty.request.contact_id)}{$smarty.request.contact_id}{else}{$bean->contact_id}{/if}">',
+            2 => '<input type="hidden" name="opportunity_id" value="{if isset($smarty.request.opportunity_id)}{$smarty.request.opportunity_id}{else}{$bean->opportunity_id}{/if}">',
+            3 => '<input type="hidden" name="account_id" value="{if isset($smarty.request.account_id)}{$smarty.request.account_id}{else}{$bean->account_id}{/if}">',
+        ),
         ),
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'javascript' => '<script type="text/javascript" language="Javascript">function copyAddressRight(form)  {ldelim} form.alt_address_street.value = form.primary_address_street.value;form.alt_address_city.value = form.primary_address_city.value;form.alt_address_state.value = form.primary_address_state.value;form.alt_address_postalcode.value = form.primary_address_postalcode.value;form.alt_address_country.value = form.primary_address_country.value;return true; {rdelim} function copyAddressLeft(form)  {ldelim} form.primary_address_street.value =form.alt_address_street.value;form.primary_address_city.value = form.alt_address_city.value;form.primary_address_state.value = form.alt_address_state.value;form.primary_address_postalcode.value =form.alt_address_postalcode.value;form.primary_address_country.value = form.alt_address_country.value;return true; {rdelim} </script>',
-      'useTabs' => false,
+        'javascript' => '<script type="text/javascript" language="Javascript">function copyAddressRight(form)  {ldelim} form.alt_address_street.value = form.primary_address_street.value;form.alt_address_city.value = form.primary_address_city.value;form.alt_address_state.value = form.primary_address_state.value;form.alt_address_postalcode.value = form.primary_address_postalcode.value;form.alt_address_country.value = form.primary_address_country.value;return true; {rdelim} function copyAddressLeft(form)  {ldelim} form.primary_address_street.value =form.alt_address_street.value;form.primary_address_city.value = form.alt_address_city.value;form.primary_address_state.value = form.alt_address_state.value;form.primary_address_postalcode.value =form.alt_address_postalcode.value;form.primary_address_country.value = form.alt_address_country.value;return true; {rdelim} </script>',
+        'useTabs' => false,
     ),
     'panels' => 
     array (
-      'lbl_contact_information' => 
-      array (
+        'lbl_contact_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'first_name',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'status',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'last_name',
             'displayParams' => 
             array (
-              'required' => true,
+                'required' => true,
+            ),
             ),
-          ),
-          1 => 
-          array (
+            1 => 
+            array (
             'name' => 'phone_work',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'title',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'phone_mobile',
-          ),
+            ),
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'department',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'phone_fax',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'account_name',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'do_not_call',
-          ),
+            ),
         ),
         5 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'email1',
-          ),
+            ),
         ),
         6 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'lead_source',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'refered_by',
-          ),
+            ),
         ),
         7 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'team_name',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>
\ No newline at end of file

Spacing +35 added lines, -35 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.
@@ -46,15 +46,15 @@ 
  ********************************************************************************/
 
 $viewdefs ['Leads'] = 
-array (
+array(
   'QuickCreate' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'hidden' => 
-        array (
+        array(
           0 => '<input type="hidden" name="prospect_id" value="{if isset($smarty.request.prospect_id)}{$smarty.request.prospect_id}{else}{$bean->prospect_id}{/if}">',
           1 => '<input type="hidden" name="contact_id" value="{if isset($smarty.request.contact_id)}{$smarty.request.contact_id}{else}{$bean->contact_id}{/if}">',
           2 => '<input type="hidden" name="opportunity_id" value="{if isset($smarty.request.opportunity_id)}{$smarty.request.opportunity_id}{else}{$bean->opportunity_id}{/if}">',
@@ -63,14 +63,14 @@ 
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -79,94 +79,94 @@ 
       'useTabs' => false,
     ),
     'panels' => 
-    array (
+    array(
       'lbl_contact_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'first_name',
           ),
           1 => 
-          array (
+          array(
             'name' => 'status',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'last_name',
             'displayParams' => 
-            array (
+            array(
               'required' => true,
             ),
           ),
           1 => 
-          array (
+          array(
             'name' => 'phone_work',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'title',
           ),
           1 => 
-          array (
+          array(
             'name' => 'phone_mobile',
           ),
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'department',
           ),
           1 => 
-          array (
+          array(
             'name' => 'phone_fax',
           ),
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'account_name',
           ),
           1 => 
-          array (
+          array(
             'name' => 'do_not_call',
           ),
         ),
         5 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'email1',
           ),
         ),
         6 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'lead_source',
           ),
           1 => 
-          array (
+          array(
             'name' => 'refered_by',
           ),
         ),
         7 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
           ),
           1 => 
-          array (
+          array(
             'name' => 'team_name',
           ),
         ),

Braces +3 added lines, -1 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.

modules/Leads/metadata/listviewdefs.php

Indentation +88 added lines, -88 removed lines

@@ -43,8 +43,8 @@ 
 
 $listViewDefs ['Leads'] = 
 array (
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_LIST_NAME',
     'link' => true,
@@ -52,180 +52,180 @@ 
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'first_name',
-      1 => 'last_name',
-      2 => 'salutation',
+        0 => 'first_name',
+        1 => 'last_name',
+        2 => 'salutation',
+    ),
     ),
-  ),
-  'STATUS' => 
-  array (
+    'STATUS' => 
+    array (
     'width' => '7%',
     'label' => 'LBL_LIST_STATUS',
     'default' => true,
-  ),
-  'ACCOUNT_NAME' => 
-  array (
+    ),
+    'ACCOUNT_NAME' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_LIST_ACCOUNT_NAME',
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'account_id',
+        0 => 'account_id',
+    ),
     ),
-  ),
-  'PHONE_WORK' => 
-  array (
+    'PHONE_WORK' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_LIST_PHONE',
     'default' => true,
-  ),
-  'EMAIL1' => 
-  array (
+    ),
+    'EMAIL1' => 
+    array (
     'width' => '16%',
     'label' => 'LBL_LIST_EMAIL_ADDRESS',
     'sortable' => false,
     'customCode' => '{$EMAIL1_LINK}{$EMAIL1}</a>',
     'default' => true,
-  ),
-  'ASSIGNED_USER_NAME' => 
-  array (
+    ),
+    'ASSIGNED_USER_NAME' => 
+    array (
     'width' => '5%',
     'label' => 'LBL_LIST_ASSIGNED_USER',
     'module' => 'Employees',
     'id' => 'ASSIGNED_USER_ID',
     'default' => true,
-  ),
-  'TITLE' => 
-  array (
+    ),
+    'TITLE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_TITLE',
     'default' => false,
-  ),
-  'REFERED_BY' => 
-  array (
+    ),
+    'REFERED_BY' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_REFERED_BY',
     'default' => false,
-  ),
-  'LEAD_SOURCE' => 
-  array (
+    ),
+    'LEAD_SOURCE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_LEAD_SOURCE',
     'default' => false,
-  ),
-  'DEPARTMENT' => 
-  array (
+    ),
+    'DEPARTMENT' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_DEPARTMENT',
     'default' => false,
-  ),
-  'DO_NOT_CALL' => 
-  array (
+    ),
+    'DO_NOT_CALL' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_DO_NOT_CALL',
     'default' => false,
-  ),
-  'PHONE_HOME' => 
-  array (
+    ),
+    'PHONE_HOME' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_HOME_PHONE',
     'default' => false,
-  ),
-  'PHONE_MOBILE' => 
-  array (
+    ),
+    'PHONE_MOBILE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_MOBILE_PHONE',
     'default' => false,
-  ),
-  'PHONE_OTHER' => 
-  array (
+    ),
+    'PHONE_OTHER' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_OTHER_PHONE',
     'default' => false,
-  ),
-  'PHONE_FAX' => 
-  array (
+    ),
+    'PHONE_FAX' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_FAX_PHONE',
     'default' => false,
-  ),
-  'PRIMARY_ADDRESS_COUNTRY' => 
-  array (
+    ),
+    'PRIMARY_ADDRESS_COUNTRY' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_COUNTRY',
     'default' => false,
-  ),
-  'PRIMARY_ADDRESS_STREET' => 
-  array (
+    ),
+    'PRIMARY_ADDRESS_STREET' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_STREET',
     'default' => false,
-  ),
-  'PRIMARY_ADDRESS_CITY' => 
-  array (
+    ),
+    'PRIMARY_ADDRESS_CITY' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_CITY',
     'default' => false,
-  ),
-  'PRIMARY_ADDRESS_STATE' => 
-  array (
+    ),
+    'PRIMARY_ADDRESS_STATE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_STATE',
     'default' => false,
-  ),
-  'PRIMARY_ADDRESS_POSTALCODE' => 
-  array (
+    ),
+    'PRIMARY_ADDRESS_POSTALCODE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_POSTALCODE',
     'default' => false,
-  ),
-  'ALT_ADDRESS_COUNTRY' => 
-  array (
+    ),
+    'ALT_ADDRESS_COUNTRY' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_COUNTRY',
     'default' => false,
-  ),
-  'ALT_ADDRESS_STREET' => 
-  array (
+    ),
+    'ALT_ADDRESS_STREET' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_STREET',
     'default' => false,
-  ),
-  'ALT_ADDRESS_CITY' => 
-  array (
+    ),
+    'ALT_ADDRESS_CITY' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_CITY',
     'default' => false,
-  ),
-  'ALT_ADDRESS_STATE' => 
-  array (
+    ),
+    'ALT_ADDRESS_STATE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_STATE',
     'default' => false,
-  ),
-  'ALT_ADDRESS_POSTALCODE' => 
-  array (
+    ),
+    'ALT_ADDRESS_POSTALCODE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_POSTALCODE',
     'default' => false,
-  ),
-  'CREATED_BY' => 
-  array (
+    ),
+    'CREATED_BY' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_CREATED',
     'default' => false,
-  ),
-  'MODIFIED_BY_NAME' => 
-  array (
+    ),
+    'MODIFIED_BY_NAME' => 
+    array (
     'width' => '5%',
     'label' => 'LBL_MODIFIED',
     'default' => false,
-  ),
-  'DATE_ENTERED' => 
-  array (
+    ),
+    'DATE_ENTERED' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true,
-  ),  
+    ),  
 );
 ?>
\ No newline at end of file

Spacing +32 added lines, -32 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.
@@ -42,45 +42,45 @@ 
 
 
 $listViewDefs ['Leads'] = 
-array (
+array(
   'NAME' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_NAME',
     'link' => true,
     'orderBy' => 'name',
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'first_name',
       1 => 'last_name',
       2 => 'salutation',
     ),
   ),
   'STATUS' => 
-  array (
+  array(
     'width' => '7%',
     'label' => 'LBL_LIST_STATUS',
     'default' => true,
   ),
   'ACCOUNT_NAME' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_ACCOUNT_NAME',
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'account_id',
     ),
   ),
   'PHONE_WORK' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_PHONE',
     'default' => true,
   ),
   'EMAIL1' => 
-  array (
+  array(
     'width' => '16%',
     'label' => 'LBL_LIST_EMAIL_ADDRESS',
     'sortable' => false,
@@ -88,7 +88,7 @@ 
     'default' => true,
   ),
   'ASSIGNED_USER_NAME' => 
-  array (
+  array(
     'width' => '5%',
     'label' => 'LBL_LIST_ASSIGNED_USER',
     'module' => 'Employees',
@@ -96,133 +96,133 @@ 
     'default' => true,
   ),
   'TITLE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_TITLE',
     'default' => false,
   ),
   'REFERED_BY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_REFERED_BY',
     'default' => false,
   ),
   'LEAD_SOURCE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LEAD_SOURCE',
     'default' => false,
   ),
   'DEPARTMENT' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DEPARTMENT',
     'default' => false,
   ),
   'DO_NOT_CALL' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DO_NOT_CALL',
     'default' => false,
   ),
   'PHONE_HOME' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_HOME_PHONE',
     'default' => false,
   ),
   'PHONE_MOBILE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_MOBILE_PHONE',
     'default' => false,
   ),
   'PHONE_OTHER' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_OTHER_PHONE',
     'default' => false,
   ),
   'PHONE_FAX' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_FAX_PHONE',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_COUNTRY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_COUNTRY',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_STREET' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_STREET',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_CITY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_CITY',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_STATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_STATE',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_POSTALCODE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_POSTALCODE',
     'default' => false,
   ),
   'ALT_ADDRESS_COUNTRY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_COUNTRY',
     'default' => false,
   ),
   'ALT_ADDRESS_STREET' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_STREET',
     'default' => false,
   ),
   'ALT_ADDRESS_CITY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_CITY',
     'default' => false,
   ),
   'ALT_ADDRESS_STATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_STATE',
     'default' => false,
   ),
   'ALT_ADDRESS_POSTALCODE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_POSTALCODE',
     'default' => false,
   ),
   'CREATED_BY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_CREATED',
     'default' => false,
   ),
   'MODIFIED_BY_NAME' => 
-  array (
+  array(
     'width' => '5%',
     'label' => 'LBL_MODIFIED',
     'default' => false,
   ),
   'DATE_ENTERED' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true,

Braces +3 added lines, -1 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.

modules/Leads/views/view.showduplicates.php

Indentation +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
             $this->ss->assign('RETURN_MODULE', 'Emails');
             $this->ss->assign('RETURN_ACTION', 'EditView');
             if(isset($_REQUEST['start'])) {
-               $this->ss->assign('START', $_REQUEST['start']);
+                $this->ss->assign('START', $_REQUEST['start']);
             }
         }
         ////	END INBOUND EMAIL WORKFLOW
@@ -191,7 +191,7 @@ 
         $template = 'modules/Leads/tpls/ShowDuplicates.tpl';
         if(file_exists('custom/' . $template))
         {
-           $template = 'custom/' . $template;
+            $template = 'custom/' . $template;
         }
 
         $saveLabel = string_format($app_strings['LBL_SAVE_OBJECT'], array($this->module));

Spacing +17 added lines, -17 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.
@@ -56,13 +56,13 @@ 
         global $current_language;
         global $mod_strings;
 
-        if(!isset($_SESSION['SHOW_DUPLICATES']))
+        if (!isset($_SESSION['SHOW_DUPLICATES']))
         {
             $GLOBALS['log']->error("Unauthorized access to this area.");
             sugar_die("Unauthorized access to this area.");
         }
 
-        parse_str($_SESSION['SHOW_DUPLICATES'],$_POST);
+        parse_str($_SESSION['SHOW_DUPLICATES'], $_POST);
         $post = array_map("securexss", $_POST);
         foreach ($post as $k => $v) {
             $_POST[$k] = $v;
@@ -95,8 +95,8 @@ 
         $duplicateLeads = array();
         $db = DBManagerFactory::getInstance();
         $result = $db->query($query);
-        $i=0;
-        while (($row=$db->fetchByAssoc($result)) != null) {
+        $i = 0;
+        while (($row = $db->fetchByAssoc($result)) != null) {
             $duplicateLeads[$i] = $row;
             $i++;
         }
@@ -119,11 +119,11 @@ 
         }
 
         // Bug 25311 - Add special handling for when the form specifies many-to-many relationships
-        if(!empty($_POST['Leadsrelate_to'])) {
+        if (!empty($_POST['Leadsrelate_to'])) {
             $input .= "<input type='hidden' name='relate_to' value='{$_POST['Leadsrelate_to']}'>\n";
         }
 
-        if(!empty($_POST['Leadsrelate_id'])) {
+        if (!empty($_POST['Leadsrelate_id'])) {
             $input .= "<input type='hidden' name='relate_id' value='{$_POST['Leadsrelate_id']}'>\n";
         }
 
@@ -132,7 +132,7 @@ 
         $input .= $emailAddress->getEmailAddressWidgetDuplicatesView($lead);
 
         $get = '';
-        if(!empty($_POST['return_module']))
+        if (!empty($_POST['return_module']))
         {
             $this->ss->assign('RETURN_MODULE', $_POST['return_module']);
         } else {
@@ -140,7 +140,7 @@ 
         }
 
         $get .= "&return_action=";
-        if(!empty($_POST['return_action']))
+        if (!empty($_POST['return_action']))
         {
             $this->ss->assign('RETURN_ACTION', $_POST['return_action']);
         } else {
@@ -149,38 +149,38 @@ 
 
         ///////////////////////////////////////////////////////////////////////////////
         ////	INBOUND EMAIL WORKFLOW
-        if(isset($_REQUEST['inbound_email_id'])) {
+        if (isset($_REQUEST['inbound_email_id'])) {
             $this->ss->assign('INBOUND_EMAIL_ID', $_REQUEST['inbound_email_id']);
             $this->ss->assign('RETURN_MODULE', 'Emails');
             $this->ss->assign('RETURN_ACTION', 'EditView');
-            if(isset($_REQUEST['start'])) {
+            if (isset($_REQUEST['start'])) {
                $this->ss->assign('START', $_REQUEST['start']);
             }
         }
         ////	END INBOUND EMAIL WORKFLOW
         ///////////////////////////////////////////////////////////////////////////////
-        if(!empty($_POST['popup']))
+        if (!empty($_POST['popup']))
         {
             $input .= '<input type="hidden" name="popup" value="'.$_POST['popup'].'">';
         } else {
             $input .= '<input type="hidden" name="popup" value="false">';
         }
 
-        if(!empty($_POST['to_pdf']))
+        if (!empty($_POST['to_pdf']))
         {
             $input .= '<input type="hidden" name="to_pdf" value="'.$_POST['to_pdf'].'">';
         } else {
             $input .= '<input type="hidden" name="to_pdf" value="false">';
         }
 
-        if(!empty($_POST['create']))
+        if (!empty($_POST['create']))
         {
             $input .= '<input type="hidden" name="create" value="'.$_POST['create'].'">';
         } else {
             $input .= '<input type="hidden" name="create" value="false">';
         }
 
-        if(!empty($_POST['return_id']))
+        if (!empty($_POST['return_id']))
         {
             $this->ss->assign('RETURN_ID', $_POST['return_id']);
         }
@@ -189,9 +189,9 @@ 
 
         //Load the appropriate template
         $template = 'modules/Leads/tpls/ShowDuplicates.tpl';
-        if(file_exists('custom/' . $template))
+        if (file_exists('custom/'.$template))
         {
-           $template = 'custom/' . $template;
+           $template = 'custom/'.$template;
         }
 
         $saveLabel = string_format($app_strings['LBL_SAVE_OBJECT'], array($this->module));

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.
@@ -85,7 +87,9 @@ 
             $first = true;
             foreach ($duplicates as $duplicate_id)
             {
-                if (!$first) $query .= ' OR ';
+                if (!$first) {
+                    $query .= ' OR ';
+                }
                 $first = false;
                 $query .= "id='$duplicate_id' ";
             }

modules/Leads/views/view.convertlead.php

Braces +63 added lines, -65 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,7 @@ 
         if($sugar_config['lead_conv_activity_opt'] == 'move')
         {
         	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('None'=>$app_strings['LBL_NONE'], 'Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));	
-        }
-        else if($sugar_config['lead_conv_activity_opt'] == 'copy')
+        } else if($sugar_config['lead_conv_activity_opt'] == 'copy')
         {
         	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));
         }
@@ -212,17 +213,14 @@ 
 	                if ($module == "Accounts" && $field == 'name')
 	                {
 	                    $focus->name = $this->focus->account_name;
-	                }
-	                else if ($module == "Opportunities" && $field == 'amount')
+	                } else if ($module == "Opportunities" && $field == 'amount')
 	                {
 	                    $focus->amount = unformat_number($this->focus->opportunity_amount);
-	                } 
-                 	else if ($module == "Opportunities" && $field == 'name') {
+	                } else if ($module == "Opportunities" && $field == 'name') {
                  		if ($opportunityNameInLayout && !empty($this->focus->opportunity_name)){
                            $focus->name = $this->focus->opportunity_name;
                  		}
-                   	}
-	                else if ($field == "id")
+                   	} else if ($field == "id")
                     {
 						//If it is not a contact, don't copy the ID from the lead
                     	if ($module == "Contacts") {
@@ -232,25 +230,25 @@ 
 	                {
 	                	//Special case where company and person have the same field with a different name
 	                	$focus->phone_office = $this->focus->phone_work;
-	                }
-					else if (strpos($field, "billing_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */         
+	                } else if (strpos($field, "billing_address") !== false && $focus->field_defs[$field]["type"] == "varchar") {
+					    /* Bug 42219 fix */         
 					{
 						$tmp_field = str_replace("billing_", "primary_", $field);
+					}
 						$focus->field_defs[$field]["type"] = "text";
                         if (isset($this->focus->$tmp_field)) {
 						    $focus->$field = $this->focus->$tmp_field;
                         }
-					 }
-
-					else if (strpos($field, "shipping_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */
+					 } else if (strpos($field, "shipping_address") !== false && $focus->field_defs[$field]["type"] == "varchar") {
+					    /* Bug 42219 fix */
 					{
 						$tmp_field = str_replace("shipping_", "primary_", $field);
+					}
 						if (isset($this->focus->$tmp_field)) {
                             $focus->$field = $this->focus->$tmp_field;
                         }
 						$focus->field_defs[$field]["type"] = "text";
-					}    					
-                    else if (isset($this->focus->$field))
+					} else if (isset($this->focus->$field))
                     {
                         $focus->$field = $this->focus->$field;
                     }
@@ -403,8 +401,7 @@ 
                 unset($_REQUEST["convert_create_Contacts"]);
                 unset($_POST["convert_create_Contacts"]);
             }
-        }
-        elseif (!empty($_REQUEST["convert_create_Contacts"]) && $_REQUEST["convert_create_Contacts"] != "false" && !isset($_POST['ContinueContact'])) 
+        } elseif (!empty($_REQUEST["convert_create_Contacts"]) && $_REQUEST["convert_create_Contacts"] != "false" && !isset($_POST['ContinueContact'])) 
         {
             require_once('modules/Contacts/ContactFormBase.php');
             $contactForm = new ContactFormBase();
@@ -425,8 +422,7 @@ 
             $_REQUEST['account_id'] = $_REQUEST['selectedAccount'];
             unset($_REQUEST["convert_create_Accounts"]);
             unset($_POST["convert_create_Accounts"]);
-        }
-        elseif (!empty($_REQUEST["convert_create_Accounts"]) && $_REQUEST["convert_create_Accounts"] != "false" && empty($_POST['ContinueAccount']))
+        } elseif (!empty($_REQUEST["convert_create_Accounts"]) && $_REQUEST["convert_create_Accounts"] != "false" && empty($_POST['ContinueAccount']))
         {
             require_once('modules/Accounts/AccountFormBase.php');
             $accountForm = new AccountFormBase();
@@ -445,8 +441,9 @@ 
             {
                 //Save the new record
                 $bean = $beanList[$module];
-	            if (empty($beans[$module]))
-	            	$beans[$module] = new $bean();
+	            if (empty($beans[$module])) {
+	            	            	$beans[$module] = new $bean();
+	            }
 
             	$this->populateNewBean($module, $beans[$module], $beans['Contacts'], $lead);
                 // when creating a new contact, create the id for linking with other modules
@@ -536,8 +533,7 @@ 
                     {
                         $id_field = $relObject->rhs_key;
                         $lead->$id_field = $bean->id;
-                    }
-                    else 
+                    } else 
                     {
                         $bean->$leadsRel->add($lead->id);
                     }
@@ -550,8 +546,7 @@ 
                 {
                     $bean->account_id = $beans['Accounts']->id;
                     $bean->account_name = $beans['Accounts']->name;
-                }
-                else if (!empty($selects['Accounts']))
+                } else if (!empty($selects['Accounts']))
                 {
                     $bean->account_id = $selects['Accounts'];
                 }
@@ -591,8 +586,7 @@ 
             $bean->load_relationship($meetingsRel);
             $bean->$meetingsRel->add($current_user->id);
             return $bean;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -611,8 +605,7 @@ 
                     <a href='index.php?module={$bean->module_dir}&action=DetailView&record={$bean->id}'>
                        {$bean->get_summary_text()}
                     </a></li>";
-            }
-            else {
+            } else {
                 global $app_list_strings;
                 if(!empty($app_list_strings['moduleListSingular'][$bean->module_dir])) {
                     $module_name = $app_list_strings['moduleListSingular'][$bean->module_dir];
@@ -652,7 +645,7 @@ 
             $account_id = create_guid();
             if(!empty($beans['Accounts']->id)){
                 $account_id = $beans['Accounts']->id;
-            }else{
+            } else{
                 $beans['Accounts']->id = $account_id;
             }
             $accountParentInfo = array('id'=>$account_id,'type'=>'Accounts');
@@ -683,8 +676,7 @@ 
 	                                        }
 	                                    }
 	                                }
-	                            }
-	                            else if ($sugar_config['lead_conv_activity_opt'] == 'move') {
+	                            } else if ($sugar_config['lead_conv_activity_opt'] == 'move') {
 	                                // if to move activities, should be only one module selected
 	                                if ($_POST['lead_conv_ac_op_sel'] == $module) {
 	                                    $this->moveActivity($activity, $bean);
@@ -749,7 +741,9 @@ 
 	    $lead
 	    )
 	{
-		if (!$lead) return;
+		if (!$lead) {
+		    return;
+		}
 
 		global $beanList, $db;
 
@@ -855,7 +849,10 @@ 
 			if(!isset($_REQUEST[$module . $field]) && isset($lead->$field) && $field != 'id')
 			{
 				$bean->$field = $lead->$field;
-				if($field == 'date_entered') $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format()); //bug 41030
+				if($field == 'date_entered') {
+				    $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format());
+				}
+				//bug 41030
 			}
 		}
         populateFromPost($module, $bean, true);
@@ -872,10 +869,11 @@ 
 				$contact->$fieldDef['id_name'] = $bean->id ;
 				if ($fieldDef['id_name'] != $select) {
 					$rname = isset($fieldDef['rname']) ? $fieldDef['rname'] : "";
-					if (!empty($rname) && isset($bean->$rname))
-						$contact->$select = $bean->$rname;
-					else
-						$contact->$select = $bean->name;
+					if (!empty($rname) && isset($bean->$rname)) {
+											$contact->$select = $bean->$rname;
+					} else {
+											$contact->$select = $bean->name;
+					}
 				}
 			}
 		} else if ($module != "Contacts"){
@@ -911,30 +909,33 @@ 
 				if(!isset($_REQUEST[$bean->module_dir . $field]) && strpos($field, "_address_") !== false)
 				{
 					$set = "primary";
-					if (strpos($field, "alt_") !== false || strpos($field, "shipping_") !== false)
-						$set = "alt";
+					if (strpos($field, "alt_") !== false || strpos($field, "shipping_") !== false) {
+											$set = "alt";
+					}
 					$type = "";
 
-					if(strpos($field, "_address_street_2") !== false)
-						$type = "_address_street_2";
-					else if(strpos($field, "_address_street_3") !== false)
-						$type = "_address_street_3";
-					else if(strpos($field, "_address_street_4") !== false)
-						$type = "";
-					else if(strpos($field, "_address_street") !== false)
-						$type = "_address_street";
-					else if(strpos($field, "_address_city") !== false)
-						$type = "_address_city";
-					else if(strpos($field, "_address_state") !== false)
-						$type = "_address_state";
-					else if(strpos($field, "_address_postalcode") !== false)
-						$type = "_address_postalcode";
-					else if(strpos($field, "_address_country") !== false)
-						$type = "_address_country";
+					if(strpos($field, "_address_street_2") !== false) {
+											$type = "_address_street_2";
+					} else if(strpos($field, "_address_street_3") !== false) {
+											$type = "_address_street_3";
+					} else if(strpos($field, "_address_street_4") !== false) {
+											$type = "";
+					} else if(strpos($field, "_address_street") !== false) {
+											$type = "_address_street";
+					} else if(strpos($field, "_address_city") !== false) {
+											$type = "_address_city";
+					} else if(strpos($field, "_address_state") !== false) {
+											$type = "_address_state";
+					} else if(strpos($field, "_address_postalcode") !== false) {
+											$type = "_address_postalcode";
+					} else if(strpos($field, "_address_country") !== false) {
+											$type = "_address_country";
+					}
 
 						$var = $set.$type;
-					if (isset($contact->$var))
-						$bean->$field = $contact->$var;
+					if (isset($contact->$var)) {
+											$bean->$field = $contact->$var;
+					}
 				}
 			}
 	}
@@ -956,12 +957,10 @@ 
                 if (isset($dictionary[$from->object_name]['relationships']) && isset($dictionary[$from->object_name]['relationships'][$rel_name]))
                 {
                     $rel_def = $dictionary[$from->object_name]['relationships'][$rel_name];
-                }
-                else if (isset($dictionary[$to->object_name]['relationships']) && isset($dictionary[$to->object_name]['relationships'][$rel_name]))
+                } else if (isset($dictionary[$to->object_name]['relationships']) && isset($dictionary[$to->object_name]['relationships'][$rel_name]))
                 {
                     $rel_def = $dictionary[$to->object_name]['relationships'][$rel_name];
-                }
-                else if (isset($dictionary[$rel_name]) && isset($dictionary[$rel_name]['relationships'])
+                } else if (isset($dictionary[$rel_name]) && isset($dictionary[$rel_name]['relationships'])
                         && isset($dictionary[$rel_name]['relationships'][$rel_name]))
                 {
                 	$rel_def = $dictionary[$rel_name]['relationships'][$rel_name];
@@ -970,8 +969,7 @@ 
                     if ($rel_def['lhs_module'] == $from->module_dir && $rel_def['rhs_module'] == $to->module_dir )
                     {
                     	return $field;
-                    }
-                    else if ($rel_def['rhs_module'] == $from->module_dir && $rel_def['lhs_module'] == $to->module_dir )
+                    } else if ($rel_def['rhs_module'] == $from->module_dir && $rel_def['lhs_module'] == $to->module_dir )
                     {
                     	return $field;
                     }

Indentation +284 added lines, -284 removed lines

@@ -52,7 +52,7 @@ 
         )
     {
         parent::__construct($bean, $view_object_map);
-    	$this->medataDataFile = $this->fileName;
+        $this->medataDataFile = $this->fileName;
         if (file_exists("custom/$this->fileName"))
         {
             $this->medataDataFile = "custom/$this->fileName";
@@ -68,42 +68,42 @@ 
     }
 
     /**
-	 * @see SugarView::display()
-	 */
-	public function display()
+     * @see SugarView::display()
+     */
+    public function display()
     {
         if (!empty($_REQUEST['handle']) && $_REQUEST['handle'] == 'save')
         {
-        	return $this->handleSave();
+            return $this->handleSave();
         }
 
-    	global $beanList;
+        global $beanList;
 
-    	// get the EditView defs to check if opportunity_name exists, for a check below for populating data
-    	$opportunityNameInLayout = false;
-    	$editviewFile = 'modules/Leads/metadata/editviewdefs.php';
+        // get the EditView defs to check if opportunity_name exists, for a check below for populating data
+        $opportunityNameInLayout = false;
+        $editviewFile = 'modules/Leads/metadata/editviewdefs.php';
         $this->medataDataFile = $editviewFile;
         if (file_exists("custom/{$editviewFile}"))
         {
             $this->medataDataFile = "custom/{$editviewFile}";
         }
-    	include($this->medataDataFile);
-    	foreach($viewdefs['Leads']['EditView']['panels'] as $panel_index => $section){
-    	    foreach($section as $row_array){
-    	        foreach($row_array as $cell){
-        	        if(isset($cell['name']) && $cell['name'] == 'opportunity_name'){
-        	            $opportunityNameInLayout = true;
-        	        }
-    	        }
-    	    }
-    	}
+        include($this->medataDataFile);
+        foreach($viewdefs['Leads']['EditView']['panels'] as $panel_index => $section){
+            foreach($section as $row_array){
+                foreach($row_array as $cell){
+                    if(isset($cell['name']) && $cell['name'] == 'opportunity_name'){
+                        $opportunityNameInLayout = true;
+                    }
+                }
+            }
+        }
 
         $this->medataDataFile = $this->fileName;
         if (file_exists("custom/$this->fileName"))
         {
             $this->medataDataFile = "custom/$this->fileName";
         }
-    	$this->loadDefs();
+        $this->loadDefs();
         $this->getRecord();
         $this->checkForDuplicates($this->focus);
         $smarty = new Sugar_Smarty();
@@ -165,7 +165,7 @@ 
         $smarty->assign("module", "Leads");
         $smarty->assign("view", "convertlead");
         $smarty->assign("bean", $this->focus);
-		$smarty->assign("record_id", $this->focus->id);
+        $smarty->assign("record_id", $this->focus->id);
         global $mod_strings;
         $smarty->assign('MOD', $mod_strings);
         $smarty->display("modules/Leads/tpls/ConvertLeadHeader.tpl");
@@ -178,11 +178,11 @@ 
         //Switch up list depending on copy or move
         if($sugar_config['lead_conv_activity_opt'] == 'move')
         {
-        	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('None'=>$app_strings['LBL_NONE'], 'Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));	
+            $smarty->assign('convertModuleListOptions', get_select_options_with_id(array('None'=>$app_strings['LBL_NONE'], 'Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));	
         }
         else if($sugar_config['lead_conv_activity_opt'] == 'copy')
         {
-        	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));
+            $smarty->assign('convertModuleListOptions', get_select_options_with_id(array('Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));
         }
         
         
@@ -207,49 +207,49 @@ 
             $focus->fill_in_additional_detail_fields();
             foreach($focus->field_defs as $field => $def)
             {
-            	if(isset($vdef[$ev->view]['copyData']) && $vdef[$ev->view]['copyData'])
+                if(isset($vdef[$ev->view]['copyData']) && $vdef[$ev->view]['copyData'])
                 {
-	                if ($module == "Accounts" && $field == 'name')
-	                {
-	                    $focus->name = $this->focus->account_name;
-	                }
-	                else if ($module == "Opportunities" && $field == 'amount')
-	                {
-	                    $focus->amount = unformat_number($this->focus->opportunity_amount);
-	                } 
-                 	else if ($module == "Opportunities" && $field == 'name') {
-                 		if ($opportunityNameInLayout && !empty($this->focus->opportunity_name)){
-                           $focus->name = $this->focus->opportunity_name;
-                 		}
-                   	}
-	                else if ($field == "id")
+                    if ($module == "Accounts" && $field == 'name')
+                    {
+                        $focus->name = $this->focus->account_name;
+                    }
+                    else if ($module == "Opportunities" && $field == 'amount')
+                    {
+                        $focus->amount = unformat_number($this->focus->opportunity_amount);
+                    } 
+                        else if ($module == "Opportunities" && $field == 'name') {
+                            if ($opportunityNameInLayout && !empty($this->focus->opportunity_name)){
+                            $focus->name = $this->focus->opportunity_name;
+                            }
+                        }
+                    else if ($field == "id")
                     {
-						//If it is not a contact, don't copy the ID from the lead
-                    	if ($module == "Contacts") {
-                    	   $focus->$field = $this->focus->$field;
+                        //If it is not a contact, don't copy the ID from the lead
+                        if ($module == "Contacts") {
+                            $focus->$field = $this->focus->$field;
                         }
                     } else if (is_a($focus, "Company") && $field == 'phone_office')
-	                {
-	                	//Special case where company and person have the same field with a different name
-	                	$focus->phone_office = $this->focus->phone_work;
-	                }
-					else if (strpos($field, "billing_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */         
-					{
-						$tmp_field = str_replace("billing_", "primary_", $field);
-						$focus->field_defs[$field]["type"] = "text";
+                    {
+                        //Special case where company and person have the same field with a different name
+                        $focus->phone_office = $this->focus->phone_work;
+                    }
+                    else if (strpos($field, "billing_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */         
+                    {
+                        $tmp_field = str_replace("billing_", "primary_", $field);
+                        $focus->field_defs[$field]["type"] = "text";
                         if (isset($this->focus->$tmp_field)) {
-						    $focus->$field = $this->focus->$tmp_field;
+                            $focus->$field = $this->focus->$tmp_field;
+                        }
                         }
-					 }
 
-					else if (strpos($field, "shipping_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */
-					{
-						$tmp_field = str_replace("shipping_", "primary_", $field);
-						if (isset($this->focus->$tmp_field)) {
+                    else if (strpos($field, "shipping_address") !== false && $focus->field_defs[$field]["type"] == "varchar") /* Bug 42219 fix */
+                    {
+                        $tmp_field = str_replace("shipping_", "primary_", $field);
+                        if (isset($this->focus->$tmp_field)) {
                             $focus->$field = $this->focus->$tmp_field;
                         }
-						$focus->field_defs[$field]["type"] = "text";
-					}    					
+                        $focus->field_defs[$field]["type"] = "text";
+                    }    					
                     else if (isset($this->focus->$field))
                     {
                         $focus->$field = $this->focus->$field;
@@ -272,18 +272,18 @@ 
 
     protected function getRecord()
     {
-    	$this->focus = new Lead();
-    	if (isset($_REQUEST['record']))
-    	{
-    		$this->focus->retrieve($_REQUEST['record']);
-    	}
+        $this->focus = new Lead();
+        if (isset($_REQUEST['record']))
+        {
+            $this->focus->retrieve($_REQUEST['record']);
+        }
     }
 
     protected function loadDefs()
     {
-    	$viewdefs = array();
-    	include($this->medataDataFile);
-    	$this->defs = $viewdefs;
+        $viewdefs = array();
+        include($this->medataDataFile);
+        $this->defs = $viewdefs;
     }
 
     /**
@@ -315,7 +315,7 @@ 
                     }
                     ";
         if ($validateSelect) {
-        	$jsOut  .= "
+            $jsOut  .= "
                     removeFromValidate('ConvertLead', '{$viewdef['select']}');";
         }
 
@@ -348,7 +348,7 @@ 
             YAHOO.util.Event.onDOMReady(SUGAR.convert.toggle$module);";
         } else if (isset($viewdef['default_action'])  && $viewdef['default_action'] == "create")
         {
-             $jsOut .= "\n            SUGAR.convert.{$module}Enabled = true;";
+                $jsOut .= "\n            SUGAR.convert.{$module}Enabled = true;";
         }
         $jsOut .= "
             YAHOO.util.Event.addListener('new$module', 'click', SUGAR.convert.toggle$module);
@@ -441,14 +441,14 @@ 
         foreach ($this->defs as $module => $vdef)
         {
             //Create a new record if "create" was selected
-        	if (!empty($_REQUEST["convert_create_$module"]) && $_REQUEST["convert_create_$module"] != "false")
+            if (!empty($_REQUEST["convert_create_$module"]) && $_REQUEST["convert_create_$module"] != "false")
             {
                 //Save the new record
                 $bean = $beanList[$module];
-	            if (empty($beans[$module]))
-	            	$beans[$module] = new $bean();
+                if (empty($beans[$module]))
+                    $beans[$module] = new $bean();
 
-            	$this->populateNewBean($module, $beans[$module], $beans['Contacts'], $lead);
+                $this->populateNewBean($module, $beans[$module], $beans['Contacts'], $lead);
                 // when creating a new contact, create the id for linking with other modules
                 // and do not populate it with lead's old account_id
                 if ($module == 'Contacts')
@@ -602,8 +602,8 @@ 
         $beans
         )
     {
-    	global $beanList;
-    	echo "<div><ul>";
+        global $beanList;
+        echo "<div><ul>";
         foreach($beans as $bean)
         {
             $beanName = $bean->object_name;
@@ -630,7 +630,7 @@ 
             }
         }
 
-    	echo "</ul></div>";
+        echo "</ul></div>";
     }
 
     protected function handleActivities(
@@ -638,12 +638,12 @@ 
         $beans
         )
     {
-    	global $app_list_strings;
+        global $app_list_strings;
         global $sugar_config;
         global $app_strings;
-    	$parent_types = $app_list_strings['record_type_display'];
+        $parent_types = $app_list_strings['record_type_display'];
 
-    	$activities = $this->getActivitiesFromLead($lead);
+        $activities = $this->getActivitiesFromLead($lead);
 
         //if account is being created, we will specify the account as the parent bean
         $accountParentInfo = array();
@@ -659,42 +659,42 @@ 
             $accountParentInfo = array('id'=>$account_id,'type'=>'Accounts');
         }
 
-    	foreach($beans as $module => $bean)
-    	{
-	    	if (isset($parent_types[$module]))
-	    	{
+        foreach($beans as $module => $bean)
+        {
+            if (isset($parent_types[$module]))
+            {
                 if (empty($bean->id))
                 {
                     $bean->id = create_guid();
-		            $bean->new_with_id = true;
+                    $bean->new_with_id = true;
                 }
                 if( isset($_POST['lead_conv_ac_op_sel']) && $_POST['lead_conv_ac_op_sel'] != 'None')
                 {
-	                foreach($activities as $activity)
-			    	{
-	                            if (!isset($sugar_config['lead_conv_activity_opt']) || $sugar_config['lead_conv_activity_opt'] == 'copy') {
-	                                if (isset($_POST['lead_conv_ac_op_sel'])) {
-	                                    //if the copy to module(s) are defined, copy only to those module(s)
-	                                    if (is_array($_POST['lead_conv_ac_op_sel'])) {
-	                                        foreach ($_POST['lead_conv_ac_op_sel'] as $mod) {
-	                                            if ($mod == $module) {
-	                                                $this->copyActivityAndRelateToBean($activity, $bean, $accountParentInfo);
-	                                                break;
-	                                            }
-	                                        }
-	                                    }
-	                                }
-	                            }
-	                            else if ($sugar_config['lead_conv_activity_opt'] == 'move') {
-	                                // if to move activities, should be only one module selected
-	                                if ($_POST['lead_conv_ac_op_sel'] == $module) {
-	                                    $this->moveActivity($activity, $bean);
-	                                }
-	                            }
-			    	}
+                    foreach($activities as $activity)
+                    {
+                                if (!isset($sugar_config['lead_conv_activity_opt']) || $sugar_config['lead_conv_activity_opt'] == 'copy') {
+                                    if (isset($_POST['lead_conv_ac_op_sel'])) {
+                                        //if the copy to module(s) are defined, copy only to those module(s)
+                                        if (is_array($_POST['lead_conv_ac_op_sel'])) {
+                                            foreach ($_POST['lead_conv_ac_op_sel'] as $mod) {
+                                                if ($mod == $module) {
+                                                    $this->copyActivityAndRelateToBean($activity, $bean, $accountParentInfo);
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                else if ($sugar_config['lead_conv_activity_opt'] == 'move') {
+                                    // if to move activities, should be only one module selected
+                                    if ($_POST['lead_conv_ac_op_sel'] == $module) {
+                                        $this->moveActivity($activity, $bean);
+                                    }
+                                }
+                    }
                 }
-	    	}
-    	}
+            }
+        }
     }
 
     /**
@@ -746,46 +746,46 @@ 
      * @param Lead $lead Lead to get activities from
      * @return Array of Activity SugarBeans .
      */
-	protected function getActivitiesFromLead(
-	    $lead
-	    )
-	{
-		if (!$lead) return;
-
-		global $beanList, $db;
-
-		$activitesList = array("Calls", "Tasks", "Meetings", "Emails", "Notes");
-		$activities = array();
-
-		foreach($activitesList as $module)
-		{
-			$beanName = $beanList[$module];
-			$activity = new $beanName();
-			$query = "SELECT id FROM {$activity->table_name} WHERE parent_id = '{$lead->id}' AND parent_type = 'Leads' AND deleted = 0";
-			$result = $db->query($query,true);
+    protected function getActivitiesFromLead(
+        $lead
+        )
+    {
+        if (!$lead) return;
+
+        global $beanList, $db;
+
+        $activitesList = array("Calls", "Tasks", "Meetings", "Emails", "Notes");
+        $activities = array();
+
+        foreach($activitesList as $module)
+        {
+            $beanName = $beanList[$module];
+            $activity = new $beanName();
+            $query = "SELECT id FROM {$activity->table_name} WHERE parent_id = '{$lead->id}' AND parent_type = 'Leads' AND deleted = 0";
+            $result = $db->query($query,true);
             while($row = $db->fetchByAssoc($result))
             {
-            	$activity = new $beanName();
-				$activity->retrieve($row['id']);
-				$activity->fixUpFormatting();
-				$activities[] = $activity;
+                $activity = new $beanName();
+                $activity->retrieve($row['id']);
+                $activity->fixUpFormatting();
+                $activities[] = $activity;
             }
-		}
+        }
 
-		return $activities;
-	}
+        return $activities;
+    }
 
-	protected function copyActivityAndRelateToBean(
-	    $activity,
-	    $bean,
+    protected function copyActivityAndRelateToBean(
+        $activity,
+        $bean,
         $parentArr = array()
-	    )
-	{
-		global $beanList;
+        )
+    {
+        global $beanList;
 
-		$newActivity = clone $activity;
-		$newActivity->id = create_guid();
-		$newActivity->new_with_id = true;
+        $newActivity = clone $activity;
+        $newActivity->id = create_guid();
+        $newActivity->new_with_id = true;
 
         //set the parent id and type if it was passed in, otherwise use blank to wipe it out
         $parentID = '';
@@ -801,13 +801,13 @@ 
 
         }
 
-		//Special case to prevent duplicated tasks from appearing under Contacts multiple times
-    	if ($newActivity->module_dir == "Tasks" && $bean->module_dir != "Contacts")
-    	{
+        //Special case to prevent duplicated tasks from appearing under Contacts multiple times
+        if ($newActivity->module_dir == "Tasks" && $bean->module_dir != "Contacts")
+        {
             $newActivity->contact_id = $newActivity->contact_name = "";
-    	}
+        }
 
-		if ($rel = $this->findRelationship($newActivity, $bean))
+        if ($rel = $this->findRelationship($newActivity, $bean))
         {
             if (isset($newActivity->$rel))
             {
@@ -828,14 +828,14 @@ 
             $newActivity->parent_id =  $parentID;
             $newActivity->parent_type = $parentType;
 
-	        $newActivity->update_date_modified = false; //bug 41747
-	        $newActivity->save();
+            $newActivity->update_date_modified = false; //bug 41747
+            $newActivity->save();
             $newActivity->$rel->add($bean);
             if ($newActivity->module_dir == "Notes" && $newActivity->filename) {
-	        	UploadFile::duplicate_file($activity->id, $newActivity->id,  $newActivity->filename);
-	        }
-         }
-	}
+                UploadFile::duplicate_file($activity->id, $newActivity->id,  $newActivity->filename);
+            }
+            }
+    }
 
     /**
      * Populates the passed in Bean fron the contact and the $_REQUEST
@@ -843,103 +843,103 @@ 
      * @param SugarBean $bean SugarBean to be populated.
      * @param Contact $contact Contact to relate the bean to.
      */
-	protected function populateNewBean(
-	    $module,
-	    $bean,
-	    $contact,
-	    $lead
-	    )
-	{
-		//Copy data from the contact to new bean
-		foreach($bean->field_defs as $field => $def)
-		{
-			if(!isset($_REQUEST[$module . $field]) && isset($lead->$field) && $field != 'id')
-			{
-				$bean->$field = $lead->$field;
-				if($field == 'date_entered') $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format()); //bug 41030
-			}
-		}
+    protected function populateNewBean(
+        $module,
+        $bean,
+        $contact,
+        $lead
+        )
+    {
+        //Copy data from the contact to new bean
+        foreach($bean->field_defs as $field => $def)
+        {
+            if(!isset($_REQUEST[$module . $field]) && isset($lead->$field) && $field != 'id')
+            {
+                $bean->$field = $lead->$field;
+                if($field == 'date_entered') $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format()); //bug 41030
+            }
+        }
         populateFromPost($module, $bean, true);
-		//Try to link to the new contact
-		$contactRel = "";
-		if (!empty($vdef['ConvertLead']['select']))
-		{
-			$select = $vdef['ConvertLead']['select'];
-			$fieldDef = $contact->field_defs[$select];
-			if (!empty($fieldDef['id_name']))
-			{
-				$bean->id = create_guid();
-				$bean->new_with_id = true;
+        //Try to link to the new contact
+        $contactRel = "";
+        if (!empty($vdef['ConvertLead']['select']))
+        {
+            $select = $vdef['ConvertLead']['select'];
+            $fieldDef = $contact->field_defs[$select];
+            if (!empty($fieldDef['id_name']))
+            {
+                $bean->id = create_guid();
+                $bean->new_with_id = true;
                 $idName = $fieldDef['id_name'];
-				$contact->$idName = $bean->id ;
-				if ($idName != $select) {
-					$rname = isset($fieldDef['rname']) ? $fieldDef['rname'] : "";
-					if (!empty($rname) && isset($bean->$rname))
-						$contact->$select = $bean->$rname;
-					else
-						$contact->$select = $bean->name;
-				}
-			}
-		} else if ($module != "Contacts"){
-			$contactRel = $this->findRelationship($contact, $bean);
-			if (!empty($contactRel))
-			{
-				$bean->id = create_guid();
-				$bean->new_with_id = true;
-				$contact->load_relationship ($contactRel) ;
-				$relObject = $contact->$contactRel->getRelationshipObject();
-				if ($relObject->relationship_type == "one-to-many" && $contact->$contactRel->_get_bean_position())
-				{
-					$id_field = $relObject->rhs_key;
-					$bean->$id_field = $contact->id;
-				} else {
-					$contact->$contactRel->add($bean);
-				}
-				//Set the parent of activites to the new Contact
-				if (isset($bean->field_defs['parent_id']) && isset($bean->field_defs['parent_type']))
-				{
-					$bean->parent_id = $contact->id;
-					$bean->parent_type = "Contacts";
-				}
-			}
-		}
-	}
-
-	protected function copyAddressFields($bean, $contact)
-	{
-	//Copy over address info from the contact to any beans with address not set
-	        foreach($bean->field_defs as $field => $def)
-			{
-				if(!isset($_REQUEST[$bean->module_dir . $field]) && strpos($field, "_address_") !== false)
-				{
-					$set = "primary";
-					if (strpos($field, "alt_") !== false || strpos($field, "shipping_") !== false)
-						$set = "alt";
-					$type = "";
-
-					if(strpos($field, "_address_street_2") !== false)
-						$type = "_address_street_2";
-					else if(strpos($field, "_address_street_3") !== false)
-						$type = "_address_street_3";
-					else if(strpos($field, "_address_street_4") !== false)
-						$type = "";
-					else if(strpos($field, "_address_street") !== false)
-						$type = "_address_street";
-					else if(strpos($field, "_address_city") !== false)
-						$type = "_address_city";
-					else if(strpos($field, "_address_state") !== false)
-						$type = "_address_state";
-					else if(strpos($field, "_address_postalcode") !== false)
-						$type = "_address_postalcode";
-					else if(strpos($field, "_address_country") !== false)
-						$type = "_address_country";
-
-						$var = $set.$type;
-					if (isset($contact->$var))
-						$bean->$field = $contact->$var;
-				}
-			}
-	}
+                $contact->$idName = $bean->id ;
+                if ($idName != $select) {
+                    $rname = isset($fieldDef['rname']) ? $fieldDef['rname'] : "";
+                    if (!empty($rname) && isset($bean->$rname))
+                        $contact->$select = $bean->$rname;
+                    else
+                        $contact->$select = $bean->name;
+                }
+            }
+        } else if ($module != "Contacts"){
+            $contactRel = $this->findRelationship($contact, $bean);
+            if (!empty($contactRel))
+            {
+                $bean->id = create_guid();
+                $bean->new_with_id = true;
+                $contact->load_relationship ($contactRel) ;
+                $relObject = $contact->$contactRel->getRelationshipObject();
+                if ($relObject->relationship_type == "one-to-many" && $contact->$contactRel->_get_bean_position())
+                {
+                    $id_field = $relObject->rhs_key;
+                    $bean->$id_field = $contact->id;
+                } else {
+                    $contact->$contactRel->add($bean);
+                }
+                //Set the parent of activites to the new Contact
+                if (isset($bean->field_defs['parent_id']) && isset($bean->field_defs['parent_type']))
+                {
+                    $bean->parent_id = $contact->id;
+                    $bean->parent_type = "Contacts";
+                }
+            }
+        }
+    }
+
+    protected function copyAddressFields($bean, $contact)
+    {
+    //Copy over address info from the contact to any beans with address not set
+            foreach($bean->field_defs as $field => $def)
+            {
+                if(!isset($_REQUEST[$bean->module_dir . $field]) && strpos($field, "_address_") !== false)
+                {
+                    $set = "primary";
+                    if (strpos($field, "alt_") !== false || strpos($field, "shipping_") !== false)
+                        $set = "alt";
+                    $type = "";
+
+                    if(strpos($field, "_address_street_2") !== false)
+                        $type = "_address_street_2";
+                    else if(strpos($field, "_address_street_3") !== false)
+                        $type = "_address_street_3";
+                    else if(strpos($field, "_address_street_4") !== false)
+                        $type = "";
+                    else if(strpos($field, "_address_street") !== false)
+                        $type = "_address_street";
+                    else if(strpos($field, "_address_city") !== false)
+                        $type = "_address_city";
+                    else if(strpos($field, "_address_state") !== false)
+                        $type = "_address_state";
+                    else if(strpos($field, "_address_postalcode") !== false)
+                        $type = "_address_postalcode";
+                    else if(strpos($field, "_address_country") !== false)
+                        $type = "_address_country";
+
+                        $var = $set.$type;
+                    if (isset($contact->$var))
+                        $bean->$field = $contact->$var;
+                }
+            }
+    }
 
 
     protected function findRelationship(
@@ -947,12 +947,12 @@ 
         $to
         )
     {
-    	global $dictionary;
-    	require_once("modules/TableDictionary.php");
-    	foreach ($from->field_defs as $field=>$def)
+        global $dictionary;
+        require_once("modules/TableDictionary.php");
+        foreach ($from->field_defs as $field=>$def)
         {
             if (isset($def['type']) && $def['type'] == "link" && isset($def['relationship'])) 
-			{
+            {
                 $rel_name = $def['relationship'];
                 $rel_def = "";
                 if (isset($dictionary[$from->object_name]['relationships']) && isset($dictionary[$from->object_name]['relationships'][$rel_name]))
@@ -966,16 +966,16 @@ 
                 else if (isset($dictionary[$rel_name]) && isset($dictionary[$rel_name]['relationships'])
                         && isset($dictionary[$rel_name]['relationships'][$rel_name]))
                 {
-                	$rel_def = $dictionary[$rel_name]['relationships'][$rel_name];
+                    $rel_def = $dictionary[$rel_name]['relationships'][$rel_name];
                 }
                 if (!empty($rel_def)) {
                     if ($rel_def['lhs_module'] == $from->module_dir && $rel_def['rhs_module'] == $to->module_dir )
                     {
-                    	return $field;
+                        return $field;
                     }
                     else if ($rel_def['rhs_module'] == $from->module_dir && $rel_def['lhs_module'] == $to->module_dir )
                     {
-                    	return $field;
+                        return $field;
                     }
                 }
             }
@@ -996,16 +996,16 @@ 
         }
         return false;
     }
-	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
-	    $params = parent::_getModuleTitleParams($browserTitle);
-	    $params[] = "<a href='index.php?module=Leads&action=DetailView&record={$this->bean->id}'>{$this->bean->name}</a>";
-	    $params[] = $mod_strings['LBL_CONVERTLEAD'];
-    	return $params;
+    /**
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
+        $params = parent::_getModuleTitleParams($browserTitle);
+        $params[] = "<a href='index.php?module=Leads&action=DetailView&record={$this->bean->id}'>{$this->bean->name}</a>";
+        $params[] = $mod_strings['LBL_CONVERTLEAD'];
+        return $params;
     }
 
 
@@ -1013,27 +1013,27 @@ 
         $lead
         )
     {
-    	if ($lead->status == "Converted")
-    	{
-    		echo ("<span class='error'>" . translate('LBL_CONVERTLEAD_WARNING'));
-    		$dupes = array();
-    		$q = "SELECT id, first_name, last_name FROM contacts WHERE first_name LIKE '{$lead->first_name}' AND last_name LIKE '{$lead->last_name}' AND deleted = 0";
-    		$result = $lead->db->query($q);
-    		while($row = $lead->db->fetchByAssoc($result)) {
-    			$contact = new Contact();
-    			$contact->retrieve($row['id']);
-    			$dupes[$row['id']] = $contact->name;
-    		}
-    		if (!empty($dupes))
-    		{
-    			foreach($dupes as $id => $name)
-    			{
-    				echo (translate('LBL_CONVERTLEAD_WARNING_INTO_RECORD') . "<a href='index.php?module=Contacts&action=DetailView&record=$id'>$name</a>");
-    				break;
-    			}
-    		}
-    		echo "</span>";
-    	}
-    	return false;
+        if ($lead->status == "Converted")
+        {
+            echo ("<span class='error'>" . translate('LBL_CONVERTLEAD_WARNING'));
+            $dupes = array();
+            $q = "SELECT id, first_name, last_name FROM contacts WHERE first_name LIKE '{$lead->first_name}' AND last_name LIKE '{$lead->last_name}' AND deleted = 0";
+            $result = $lead->db->query($q);
+            while($row = $lead->db->fetchByAssoc($result)) {
+                $contact = new Contact();
+                $contact->retrieve($row['id']);
+                $dupes[$row['id']] = $contact->name;
+            }
+            if (!empty($dupes))
+            {
+                foreach($dupes as $id => $name)
+                {
+                    echo (translate('LBL_CONVERTLEAD_WARNING_INTO_RECORD') . "<a href='index.php?module=Contacts&action=DetailView&record=$id'>$name</a>");
+                    break;
+                }
+            }
+            echo "</span>";
+        }
+        return false;
     }
 }

Spacing +71 added lines, -71 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.
@@ -88,10 +88,10 @@ 
             $this->medataDataFile = "custom/{$editviewFile}";
         }
     	include($this->medataDataFile);
-    	foreach($viewdefs['Leads']['EditView']['panels'] as $panel_index => $section){
-    	    foreach($section as $row_array){
-    	        foreach($row_array as $cell){
-        	        if(isset($cell['name']) && $cell['name'] == 'opportunity_name'){
+    	foreach ($viewdefs['Leads']['EditView']['panels'] as $panel_index => $section) {
+    	    foreach ($section as $row_array) {
+    	        foreach ($row_array as $cell) {
+        	        if (isset($cell['name']) && $cell['name'] == 'opportunity_name') {
         	            $opportunityNameInLayout = true;
         	        }
     	        }
@@ -125,15 +125,15 @@ 
         // Check if Lead has an account set
         if (!empty($this->focus->account_name))
         {
-            $filter .= '&name_advanced=' . urlencode($this->focus->account_name);
+            $filter .= '&name_advanced='.urlencode($this->focus->account_name);
         }
         // Check if Lead First name is available
         if (!empty($this->focus->first_name))
         {
-            $filter .= '&first_name_advanced=' . urlencode($this->focus->first_name);
+            $filter .= '&first_name_advanced='.urlencode($this->focus->first_name);
         }
         // Lead Last Name is always available
-        $filter .= '&last_name_advanced=' . urlencode($this->focus->last_name);
+        $filter .= '&last_name_advanced='.urlencode($this->focus->last_name);
         
         $smarty->assign('initialFilter', $filter);
         $smarty->assign('displayParams', array('initial_filter' => '{$initialFilter}'));
@@ -176,20 +176,20 @@ 
         $smarty->assign('lead_conv_activity_opt', $sugar_config['lead_conv_activity_opt']);
         
         //Switch up list depending on copy or move
-        if($sugar_config['lead_conv_activity_opt'] == 'move')
+        if ($sugar_config['lead_conv_activity_opt'] == 'move')
         {
         	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('None'=>$app_strings['LBL_NONE'], 'Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));	
         }
-        else if($sugar_config['lead_conv_activity_opt'] == 'copy')
+        else if ($sugar_config['lead_conv_activity_opt'] == 'copy')
         {
         	$smarty->assign('convertModuleListOptions', get_select_options_with_id(array('Contacts' => $app_list_strings["moduleListSingular"]['Contacts']), ''));
         }
         
         
 
-        foreach($this->defs as $module => $vdef)
+        foreach ($this->defs as $module => $vdef)
         {
-            if(!isset($beanList[$module]))
+            if (!isset($beanList[$module]))
             {
                 continue;
             }
@@ -205,9 +205,9 @@ 
             }
 
             $focus->fill_in_additional_detail_fields();
-            foreach($focus->field_defs as $field => $def)
+            foreach ($focus->field_defs as $field => $def)
             {
-            	if(isset($vdef[$ev->view]['copyData']) && $vdef[$ev->view]['copyData'])
+            	if (isset($vdef[$ev->view]['copyData']) && $vdef[$ev->view]['copyData'])
                 {
 	                if ($module == "Accounts" && $field == 'name')
 	                {
@@ -218,7 +218,7 @@ 
 	                    $focus->amount = unformat_number($this->focus->opportunity_amount);
 	                } 
                  	else if ($module == "Opportunities" && $field == 'name') {
-                 		if ($opportunityNameInLayout && !empty($this->focus->opportunity_name)){
+                 		if ($opportunityNameInLayout && !empty($this->focus->opportunity_name)) {
                            $focus->name = $this->focus->opportunity_name;
                  		}
                    	}
@@ -301,7 +301,7 @@ 
         )
     {
         $validateSelect = isset($viewdef['required']) && $viewdef['required'] && !empty($viewdef['select']);
-        $jsOut  = "
+        $jsOut = "
         <script type='text/javascript'>
             if (!SUGAR.convert)  SUGAR.convert = {requiredFields: {}};
             SUGAR.convert.toggle$module = function(){
@@ -315,7 +315,7 @@ 
                     }
                     ";
         if ($validateSelect) {
-        	$jsOut  .= "
+        	$jsOut .= "
                     removeFromValidate('ConvertLead', '{$viewdef['select']}');";
         }
 
@@ -327,9 +327,9 @@ 
                         removeFromValidate('ConvertLead', '$module' + i);
                     }";
         if ($validateSelect) {
-            $jsOut  .= "
+            $jsOut .= "
                 addToValidate('ConvertLead', '{$viewdef['select']}', 'varchar', true, '"
-            . translate($this->contact->field_defs[$viewdef['select']]['vname']) . "');";
+            . translate($this->contact->field_defs[$viewdef['select']]['vname'])."');";
         }
         $jsOut .= "
                     SUGAR.convert.{$module}Enabled = false;
@@ -346,19 +346,19 @@ 
             }
             $jsOut .= "
             YAHOO.util.Event.onDOMReady(SUGAR.convert.toggle$module);";
-        } else if (isset($viewdef['default_action'])  && $viewdef['default_action'] == "create")
+        } else if (isset($viewdef['default_action']) && $viewdef['default_action'] == "create")
         {
              $jsOut .= "\n            SUGAR.convert.{$module}Enabled = true;";
         }
         $jsOut .= "
             YAHOO.util.Event.addListener('new$module', 'click', SUGAR.convert.toggle$module);
             SUGAR.convert.requiredFields.$module = {};";
-        foreach($focus->field_defs as $field => $def)
+        foreach ($focus->field_defs as $field => $def)
         {
             if (isset($def['required']) && $def['required'])
             {
                 $jsOut .= "
-            SUGAR.convert.requiredFields.$module.$field = '". translate($def['vname'], $module) . "';\n";
+            SUGAR.convert.requiredFields.$module.$field = '".translate($def['vname'], $module)."';\n";
             }
         }
 
@@ -412,7 +412,7 @@ 
 
             if (isset($duplicateContacts))
             {
-                echo $contactForm->buildTableForm($duplicateContacts,  'Contacts');
+                echo $contactForm->buildTableForm($duplicateContacts, 'Contacts');
                 return;
             }
             $this->new_contact = true;
@@ -604,26 +604,26 @@ 
     {
     	global $beanList;
     	echo "<div><ul>";
-        foreach($beans as $bean)
+        foreach ($beans as $bean)
         {
             $beanName = $bean->object_name;
-            if ( $beanName == 'Contact' && !$this->new_contact ) {
-                echo "<li>" . translate("LBL_EXISTING_CONTACT") . " -
+            if ($beanName == 'Contact' && !$this->new_contact) {
+                echo "<li>".translate("LBL_EXISTING_CONTACT")." -
                     <a href='index.php?module={$bean->module_dir}&action=DetailView&record={$bean->id}'>
                        {$bean->get_summary_text()}
                     </a></li>";
             }
             else {
                 global $app_list_strings;
-                if(!empty($app_list_strings['moduleListSingular'][$bean->module_dir])) {
+                if (!empty($app_list_strings['moduleListSingular'][$bean->module_dir])) {
                     $module_name = $app_list_strings['moduleListSingular'][$bean->module_dir];
                 } else {
                     $module_name = translate('LBL_MODULE_NAME', $bean->module_dir);
                 }
-                if(empty($module_name)) {
+                if (empty($module_name)) {
                     $module_name = translate($beanName);
                 }
-                echo "<li>" . translate("LBL_CREATED_NEW") . ' ' . $module_name . " -
+                echo "<li>".translate("LBL_CREATED_NEW").' '.$module_name." -
                     <a href='index.php?module={$bean->module_dir}&action=DetailView&record={$bean->id}'>
                        {$bean->get_summary_text()}
                     </a></li>";
@@ -649,17 +649,17 @@ 
         $accountParentInfo = array();
 
         //determine the account id info ahead of time if it is being created as part of this conversion
-        if(!empty($beans['Accounts'])){
+        if (!empty($beans['Accounts'])) {
             $account_id = create_guid();
-            if(!empty($beans['Accounts']->id)){
+            if (!empty($beans['Accounts']->id)) {
                 $account_id = $beans['Accounts']->id;
-            }else{
+            } else {
                 $beans['Accounts']->id = $account_id;
             }
-            $accountParentInfo = array('id'=>$account_id,'type'=>'Accounts');
+            $accountParentInfo = array('id'=>$account_id, 'type'=>'Accounts');
         }
 
-    	foreach($beans as $module => $bean)
+    	foreach ($beans as $module => $bean)
     	{
 	    	if (isset($parent_types[$module]))
 	    	{
@@ -668,9 +668,9 @@ 
                     $bean->id = create_guid();
 		            $bean->new_with_id = true;
                 }
-                if( isset($_POST['lead_conv_ac_op_sel']) && $_POST['lead_conv_ac_op_sel'] != 'None')
+                if (isset($_POST['lead_conv_ac_op_sel']) && $_POST['lead_conv_ac_op_sel'] != 'None')
                 {
-	                foreach($activities as $activity)
+	                foreach ($activities as $activity)
 			    	{
 	                            if (!isset($sugar_config['lead_conv_activity_opt']) || $sugar_config['lead_conv_activity_opt'] == 'copy') {
 	                                if (isset($_POST['lead_conv_ac_op_sel'])) {
@@ -714,7 +714,7 @@ 
 
         // delete the old relationship to the old parent (lead)
         if ($rel = $this->findRelationship($activity, $lead)) {
-            $activity->load_relationship ($rel) ;
+            $activity->load_relationship($rel);
 
             if ($activity->parent_id && $activity->id) {
                 $activity->$rel->delete($activity->id, $activity->parent_id);
@@ -723,10 +723,10 @@ 
 
         // add the new relationship to the new parent (contact, account, etc)
         if ($rel = $this->findRelationship($activity, $bean)) {
-            $activity->load_relationship ($rel) ;
+            $activity->load_relationship($rel);
 
             $relObj = $activity->$rel->getRelationshipObject();
-            if ( $relObj->relationship_type=='one-to-one' || $relObj->relationship_type == 'one-to-many' )
+            if ($relObj->relationship_type == 'one-to-one' || $relObj->relationship_type == 'one-to-many')
             {
                 $key = $relObj->rhs_key;
                 $activity->$key = $bean->id;
@@ -757,13 +757,13 @@ 
 		$activitesList = array("Calls", "Tasks", "Meetings", "Emails", "Notes");
 		$activities = array();
 
-		foreach($activitesList as $module)
+		foreach ($activitesList as $module)
 		{
 			$beanName = $beanList[$module];
 			$activity = new $beanName();
 			$query = "SELECT id FROM {$activity->table_name} WHERE parent_id = '{$lead->id}' AND parent_type = 'Leads' AND deleted = 0";
-			$result = $db->query($query,true);
-            while($row = $db->fetchByAssoc($result))
+			$result = $db->query($query, true);
+            while ($row = $db->fetchByAssoc($result))
             {
             	$activity = new $beanName();
 				$activity->retrieve($row['id']);
@@ -790,12 +790,12 @@ 
         //set the parent id and type if it was passed in, otherwise use blank to wipe it out
         $parentID = '';
         $parentType = '';
-        if(!empty($parentArr)){
-            if(!empty($parentArr['id'])){
+        if (!empty($parentArr)) {
+            if (!empty($parentArr['id'])) {
                 $parentID = $parentArr['id'];
             }
 
-            if(!empty($parentArr['type'])){
+            if (!empty($parentArr['type'])) {
                 $parentType = $parentArr['type'];
             }
 
@@ -815,9 +815,9 @@ 
                 $newActivity->$rel = '';
             }
 
-            $newActivity->load_relationship ($rel) ;
+            $newActivity->load_relationship($rel);
             $relObj = $newActivity->$rel->getRelationshipObject();
-            if ( $relObj->relationship_type=='one-to-one' || $relObj->relationship_type == 'one-to-many' )
+            if ($relObj->relationship_type == 'one-to-one' || $relObj->relationship_type == 'one-to-many')
             {
                 $key = $relObj->rhs_key;
                 $newActivity->$key = $bean->id;
@@ -825,14 +825,14 @@ 
 
             //parent (related to field) should be blank unless it is explicitly sent in
             //it is not sent in unless the account is being created as well during lead conversion
-            $newActivity->parent_id =  $parentID;
+            $newActivity->parent_id = $parentID;
             $newActivity->parent_type = $parentType;
 
 	        $newActivity->update_date_modified = false; //bug 41747
 	        $newActivity->save();
             $newActivity->$rel->add($bean);
             if ($newActivity->module_dir == "Notes" && $newActivity->filename) {
-	        	UploadFile::duplicate_file($activity->id, $newActivity->id,  $newActivity->filename);
+	        	UploadFile::duplicate_file($activity->id, $newActivity->id, $newActivity->filename);
 	        }
          }
 	}
@@ -851,12 +851,12 @@ 
 	    )
 	{
 		//Copy data from the contact to new bean
-		foreach($bean->field_defs as $field => $def)
+		foreach ($bean->field_defs as $field => $def)
 		{
-			if(!isset($_REQUEST[$module . $field]) && isset($lead->$field) && $field != 'id')
+			if (!isset($_REQUEST[$module.$field]) && isset($lead->$field) && $field != 'id')
 			{
 				$bean->$field = $lead->$field;
-				if($field == 'date_entered') $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format()); //bug 41030
+				if ($field == 'date_entered') $bean->$field = gmdate($GLOBALS['timedate']->get_db_date_time_format()); //bug 41030
 			}
 		}
         populateFromPost($module, $bean, true);
@@ -871,7 +871,7 @@ 
 				$bean->id = create_guid();
 				$bean->new_with_id = true;
                 $idName = $fieldDef['id_name'];
-				$contact->$idName = $bean->id ;
+				$contact->$idName = $bean->id;
 				if ($idName != $select) {
 					$rname = isset($fieldDef['rname']) ? $fieldDef['rname'] : "";
 					if (!empty($rname) && isset($bean->$rname))
@@ -880,13 +880,13 @@ 
 						$contact->$select = $bean->name;
 				}
 			}
-		} else if ($module != "Contacts"){
+		} else if ($module != "Contacts") {
 			$contactRel = $this->findRelationship($contact, $bean);
 			if (!empty($contactRel))
 			{
 				$bean->id = create_guid();
 				$bean->new_with_id = true;
-				$contact->load_relationship ($contactRel) ;
+				$contact->load_relationship($contactRel);
 				$relObject = $contact->$contactRel->getRelationshipObject();
 				if ($relObject->relationship_type == "one-to-many" && $contact->$contactRel->_get_bean_position())
 				{
@@ -908,30 +908,30 @@ 
 	protected function copyAddressFields($bean, $contact)
 	{
 	//Copy over address info from the contact to any beans with address not set
-	        foreach($bean->field_defs as $field => $def)
+	        foreach ($bean->field_defs as $field => $def)
 			{
-				if(!isset($_REQUEST[$bean->module_dir . $field]) && strpos($field, "_address_") !== false)
+				if (!isset($_REQUEST[$bean->module_dir.$field]) && strpos($field, "_address_") !== false)
 				{
 					$set = "primary";
 					if (strpos($field, "alt_") !== false || strpos($field, "shipping_") !== false)
 						$set = "alt";
 					$type = "";
 
-					if(strpos($field, "_address_street_2") !== false)
+					if (strpos($field, "_address_street_2") !== false)
 						$type = "_address_street_2";
-					else if(strpos($field, "_address_street_3") !== false)
+					else if (strpos($field, "_address_street_3") !== false)
 						$type = "_address_street_3";
-					else if(strpos($field, "_address_street_4") !== false)
+					else if (strpos($field, "_address_street_4") !== false)
 						$type = "";
-					else if(strpos($field, "_address_street") !== false)
+					else if (strpos($field, "_address_street") !== false)
 						$type = "_address_street";
-					else if(strpos($field, "_address_city") !== false)
+					else if (strpos($field, "_address_city") !== false)
 						$type = "_address_city";
-					else if(strpos($field, "_address_state") !== false)
+					else if (strpos($field, "_address_state") !== false)
 						$type = "_address_state";
-					else if(strpos($field, "_address_postalcode") !== false)
+					else if (strpos($field, "_address_postalcode") !== false)
 						$type = "_address_postalcode";
-					else if(strpos($field, "_address_country") !== false)
+					else if (strpos($field, "_address_country") !== false)
 						$type = "_address_country";
 
 						$var = $set.$type;
@@ -969,11 +969,11 @@ 
                 	$rel_def = $dictionary[$rel_name]['relationships'][$rel_name];
                 }
                 if (!empty($rel_def)) {
-                    if ($rel_def['lhs_module'] == $from->module_dir && $rel_def['rhs_module'] == $to->module_dir )
+                    if ($rel_def['lhs_module'] == $from->module_dir && $rel_def['rhs_module'] == $to->module_dir)
                     {
                     	return $field;
                     }
-                    else if ($rel_def['rhs_module'] == $from->module_dir && $rel_def['lhs_module'] == $to->module_dir )
+                    else if ($rel_def['rhs_module'] == $from->module_dir && $rel_def['lhs_module'] == $to->module_dir)
                     {
                     	return $field;
                     }
@@ -1015,20 +1015,20 @@ 
     {
     	if ($lead->status == "Converted")
     	{
-    		echo ("<span class='error'>" . translate('LBL_CONVERTLEAD_WARNING'));
+    		echo ("<span class='error'>".translate('LBL_CONVERTLEAD_WARNING'));
     		$dupes = array();
     		$q = "SELECT id, first_name, last_name FROM contacts WHERE first_name LIKE '{$lead->first_name}' AND last_name LIKE '{$lead->last_name}' AND deleted = 0";
     		$result = $lead->db->query($q);
-    		while($row = $lead->db->fetchByAssoc($result)) {
+    		while ($row = $lead->db->fetchByAssoc($result)) {
     			$contact = new Contact();
     			$contact->retrieve($row['id']);
     			$dupes[$row['id']] = $contact->name;
     		}
     		if (!empty($dupes))
     		{
-    			foreach($dupes as $id => $name)
+    			foreach ($dupes as $id => $name)
     			{
-    				echo (translate('LBL_CONVERTLEAD_WARNING_INTO_RECORD') . "<a href='index.php?module=Contacts&action=DetailView&record=$id'>$name</a>");
+    				echo (translate('LBL_CONVERTLEAD_WARNING_INTO_RECORD')."<a href='index.php?module=Contacts&action=DetailView&record=$id'>$name</a>");
     				break;
     			}
     		}