adamjakab / SuiteCRM

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 (

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',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

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

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}',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

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

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

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

modules/Leads/views/view.convertlead.php

Indentation +284 added lines, -284 removed lines

@@ -52,7 +52,7 @@ 
         )
     {
         parent::SugarView($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')
@@ -601,8 +601,8 @@ 
         $beans
         )
     {
-    	global $beanList;
-    	echo "<div><ul>";
+        global $beanList;
+        echo "<div><ul>";
         foreach($beans as $bean)
         {
             $beanName = $bean->object_name;
@@ -629,7 +629,7 @@ 
             }
         }
 
-    	echo "</ul></div>";
+        echo "</ul></div>";
     }
 
     protected function handleActivities(
@@ -637,12 +637,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();
@@ -658,42 +658,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);
+                                    }
+                                }
+                    }
                 }
-	    	}
-    	}
+            }
+        }
     }
 
     /**
@@ -745,46 +745,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 = '';
@@ -800,13 +800,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))
             {
@@ -827,14 +827,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
@@ -842,102 +842,102 @@ 
      * @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;
-				$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;
-				}
-			}
-		} 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;
-				}
-			}
-	}
+        //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;
+                $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;
+                }
+            }
+        } 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(
@@ -945,12 +945,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]))
@@ -964,16 +964,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;
                     }
                 }
             }
@@ -994,16 +994,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;
     }
 
 
@@ -1011,27 +1011,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;
     }
 }

modules/UpgradeWizard/silentUpgrade_dce_step2.php

Indentation +377 added lines, -377 removed lines

@@ -47,128 +47,128 @@ 
 ////	UTILITIES THAT MUST BE LOCAL :(
 //local function for clearing cache
 function clearCacheSU($thedir, $extension) {
-	if ($current = @opendir($thedir)) {
-		while (false !== ($children = readdir($current))) {
-			if ($children != "." && $children != "..") {
-				if (is_dir($thedir . "/" . $children)) {
-					clearCacheSU($thedir . "/" . $children, $extension);
-				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
-					unlink($thedir . "/" . $children);
-				}
-			}
-		}
-	}
- }
- //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
- //no found then adds default_permissions to the config file.
- function checkConfigForPermissions(){
-     if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
-     global $sugar_config;
-     if(!isset($sugar_config['default_permissions'])){
-             $sugar_config['default_permissions'] = array (
-                     'dir_mode' => 02770,
-                     'file_mode' => 0660,
-                     'user' => '',
-                     'group' => '',
-             );
-         ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-     }
+    if ($current = @opendir($thedir)) {
+        while (false !== ($children = readdir($current))) {
+            if ($children != "." && $children != "..") {
+                if (is_dir($thedir . "/" . $children)) {
+                    clearCacheSU($thedir . "/" . $children, $extension);
+                }
+                elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
+                    unlink($thedir . "/" . $children);
+                }
+            }
+        }
+    }
+    }
+    //Bug 24890, 24892. default_permissions not written to config.php. Following function checks and if
+    //no found then adds default_permissions to the config file.
+    function checkConfigForPermissions(){
+        if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
+        global $sugar_config;
+        if(!isset($sugar_config['default_permissions'])){
+                $sugar_config['default_permissions'] = array (
+                        'dir_mode' => 02770,
+                        'file_mode' => 0660,
+                        'user' => '',
+                        'group' => '',
+                );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 function checkLoggerSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
-			'level'=>'fatal',
-		    'file' =>
-		     array (
-		      'ext' => '.log',
-		      'name' => 'sugarcrm',
-		      'dateFormat' => '%c',
-		      'maxSize' => '10MB',
-		      'maxLogs' => 10,
-		      'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
-		    ),
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	 }
+    if(!isset($sugar_config['logger'])){
+        $sugar_config['logger'] =array (
+            'level'=>'fatal',
+            'file' =>
+                array (
+                'ext' => '.log',
+                'name' => 'sugarcrm',
+                'dateFormat' => '%c',
+                'maxSize' => '10MB',
+                'maxLogs' => 10,
+                'suffix' => '', // bug51583, change default suffix to blank for backwards comptability
+            ),
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+        }
 }
 
 function checkResourceSettings(){
-	if(file_exists(getcwd().'/config.php')){
-         require(getcwd().'/config.php');
-     }
+    if(file_exists(getcwd().'/config.php')){
+            require(getcwd().'/config.php');
+        }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
-	  $sugar_config['resource_management'] =
-		  array (
-		    'special_query_limit' => 50000,
-		    'special_query_modules' =>
-		    array (
-		      0 => 'Reports',
-		      1 => 'Export',
-		      2 => 'Import',
-		      3 => 'Administration',
-		      4 => 'Sync',
-		    ),
-		    'default_limit' => 1000,
-		  );
-		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
-        	//writing to the file
- 		}
-	}
+    if(!isset($sugar_config['resource_management'])){
+        $sugar_config['resource_management'] =
+            array (
+            'special_query_limit' => 50000,
+            'special_query_modules' =>
+            array (
+                0 => 'Reports',
+                1 => 'Export',
+                2 => 'Import',
+                3 => 'Administration',
+                4 => 'Sync',
+            ),
+            'default_limit' => 1000,
+            );
+            ksort($sugar_config);
+            if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+            //writing to the file
+            }
+    }
 }
 
 function createMissingRels(){
-	$relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
-	foreach($relForObjects as $relObjName=>$relModName){
-		//assigned_user
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+    $relForObjects = array('leads'=>'Leads','campaigns'=>'Campaigns','prospects'=>'Prospects');
+    foreach($relForObjects as $relObjName=>$relModName){
+        //assigned_user
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_assigned_user'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_assigned_user','Users','users','id','{$relModName}','{$relObjName}','assigned_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-		}
-		//modified_user
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+        //modified_user
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_modified_user','Users','users','id','{$relModName}','{$relObjName}','modified_user_id',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-		}
-		//created_by
-		$guid = create_guid();
-		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
-		$result= $GLOBALS['db']->query($query, true);
-		$a = null;
-		$a = $GLOBALS['db']->fetchByAssoc($result);
-    	if(!isset($a['id']) && empty($a['id']) ){
-			$qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
+            $GLOBALS['db']->query($qRel);
+        }
+        //created_by
+        $guid = create_guid();
+        $query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
+        $result= $GLOBALS['db']->query($query, true);
+        $a = null;
+        $a = $GLOBALS['db']->fetchByAssoc($result);
+        if(!isset($a['id']) && empty($a['id']) ){
+            $qRel = "INSERT INTO relationships (id,relationship_name, lhs_module, lhs_table, lhs_key, rhs_module, rhs_table, rhs_key, join_table, join_key_lhs, join_key_rhs, relationship_type, relationship_role_column, relationship_role_column_value, reverse, deleted)
 						VALUES ('{$guid}', '{$relObjName}_created_by','Users','users','id','{$relModName}','{$relObjName}','created_by',NULL,NULL,NULL,'one-to-many',NULL,NULL,'0','0')";
-			$GLOBALS['db']->query($qRel);
-    	}
-	}
-	//Also add tracker perf relationship
+            $GLOBALS['db']->query($qRel);
+        }
+    }
+    //Also add tracker perf relationship
 }
 
 
@@ -212,22 +212,22 @@ 
 }
 
 function addDefaultModuleRoles($defaultRoles = array()) {
-	foreach($defaultRoles as $roleName=>$role){
+    foreach($defaultRoles as $roleName=>$role){
         foreach($role as $category=>$actions){
             foreach($actions as $name=>$access_override){
                     $query = "SELECT * FROM acl_actions WHERE name='$name' AND category = '$category' AND acltype='$roleName' AND deleted=0 ";
-					$result = $GLOBALS['db']->query($query);
-					//only add if an action with that name and category don't exist
-					$row=$GLOBALS['db']->fetchByAssoc($result);
-					if ($row == null) {
-	                	$guid = create_guid();
-	                	$currdate = gmdate('Y-m-d H:i:s');
-	                	$query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
-						$GLOBALS['db']->query($query);
-	                }
+                    $result = $GLOBALS['db']->query($query);
+                    //only add if an action with that name and category don't exist
+                    $row=$GLOBALS['db']->fetchByAssoc($result);
+                    if ($row == null) {
+                        $guid = create_guid();
+                        $currdate = gmdate('Y-m-d H:i:s');
+                        $query= "INSERT INTO acl_actions (id,date_entered,date_modified,modified_user_id,name,category,acltype,aclaccess,deleted ) VALUES ('$guid','$currdate','$currdate','1','$name','$category','$roleName','$access_override','0')";
+                        $GLOBALS['db']->query($query);
+                    }
             }
         }
-	}
+    }
 }
 
 function verifyArguments($argv,$usage_dce,$usage_regular){
@@ -300,33 +300,33 @@ 
 }
 
 function upgradeDCEFiles($argv,$instanceUpgradePath){
-	//copy and update following files from upgrade package
-	$upgradeTheseFiles = array('cron.php','download.php','index.php','install.php','soap.php','sugar_version.php','vcal_server.php');
-	foreach($upgradeTheseFiles as $file){
-		$srcFile = clean_path("{$instanceUpgradePath}/$file");
-		$destFile = clean_path("{$argv[3]}/$file");
-		if(file_exists($srcFile)){
-			if(!is_dir(dirname($destFile))) {
-				mkdir_recursive(dirname($destFile)); // make sure the directory exists
-			}
-			copy_recursive($srcFile,$destFile);
-			$_GET['TEMPLATE_PATH'] = $destFile;
-			$_GET['CONVERT_FILE_ONLY'] = true;
-			if(!class_exists('TemplateConverter')){
-				include($argv[7].'templateConverter.php');
-			}else{
-				TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
-			}
+    //copy and update following files from upgrade package
+    $upgradeTheseFiles = array('cron.php','download.php','index.php','install.php','soap.php','sugar_version.php','vcal_server.php');
+    foreach($upgradeTheseFiles as $file){
+        $srcFile = clean_path("{$instanceUpgradePath}/$file");
+        $destFile = clean_path("{$argv[3]}/$file");
+        if(file_exists($srcFile)){
+            if(!is_dir(dirname($destFile))) {
+                mkdir_recursive(dirname($destFile)); // make sure the directory exists
+            }
+            copy_recursive($srcFile,$destFile);
+            $_GET['TEMPLATE_PATH'] = $destFile;
+            $_GET['CONVERT_FILE_ONLY'] = true;
+            if(!class_exists('TemplateConverter')){
+                include($argv[7].'templateConverter.php');
+            }else{
+                TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
+            }
 
 
-		}
-	}
+        }
+    }
 }
 
 
 
 function threeWayMerge(){
-	//using threeway merge apis
+    //using threeway merge apis
 }
 ////	END UTILITIES THAT MUST BE LOCAL :(
 ///////////////////////////////////////////////////////////////////////////////
@@ -340,8 +340,8 @@ 
 
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
-	fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
-	exit(1);
+    fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
+    exit(1);
 }
 //Clean_string cleans out any file  passed in as a parameter
 $_SERVER['PHP_SELF'] = 'silentUpgrade.php';
@@ -449,18 +449,18 @@ 
 
 
 if($upgradeType == constant('DCE_INSTANCE')){
-   	//$instanceUpgradePath = "{$argv[1]}/DCEUpgrade/{$zip_from_dir}";
-   	//$instanceUpgradePath = "{$argv[1]}";
-	include ("ini_setup.php");
+        //$instanceUpgradePath = "{$argv[1]}/DCEUpgrade/{$zip_from_dir}";
+        //$instanceUpgradePath = "{$argv[1]}";
+    include ("ini_setup.php");
 
-	//get new template path for use in later processing
+    //get new template path for use in later processing
     $dceupgrade_pos = strpos($argv[1], '/DCEUpgrade');
     $newtemplate_path = substr($argv[1], 0, $dceupgrade_pos);
 
-	require("{$argv[4]}/sugar_version.php");
-	global $sugar_version;
+    require("{$argv[4]}/sugar_version.php");
+    global $sugar_version;
 
-	/*
+    /*
 	//require classes if they do not exist, as these were not in pre 550 entrypoint.php and need to be loaded first
     if(!class_exists('VardefManager')){
         require_once("{$newtemplate_path}/include/SugarObjects/VardefManager.php");
@@ -473,69 +473,69 @@ 
 	}
     */
 
-	//load up entrypoint from original template
-   	require_once("{$argv[4]}/include/entryPoint.php");
+    //load up entrypoint from original template
+        require_once("{$argv[4]}/include/entryPoint.php");
 
-	require_once("{$newtemplate_path}/include/utils/zip_utils.php");
-	require_once("{$newtemplate_path}/modules/Administration/UpgradeHistory.php");
+    require_once("{$newtemplate_path}/include/utils/zip_utils.php");
+    require_once("{$newtemplate_path}/modules/Administration/UpgradeHistory.php");
 
-	// We need to run the silent upgrade as the admin user
-	require_once("{$newtemplate_path}/modules/Users/User.php");
-	global $current_user;
-	$current_user = new User();
-	$current_user->retrieve('1');
+    // We need to run the silent upgrade as the admin user
+    require_once("{$newtemplate_path}/modules/Users/User.php");
+    global $current_user;
+    $current_user = new User();
+    $current_user->retrieve('1');
 
 
-	//This is DCE instance
-      global $sugar_config;
-      global $sugar_version;
+    //This is DCE instance
+        global $sugar_config;
+        global $sugar_version;
 //    require_once("{$cwd}/sugar_version.php"); //provides instance version, flavor etc..
-     //provides instance version, flavor etc..
+        //provides instance version, flavor etc..
     $isDCEInstance = true;
     $configOptions = $sugar_config['dbconfig'];
 
-	$GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$db				= &DBManagerFactory::getInstance();
-       		///////////////////////////////////////////////////////////////////////////////
-	////	MAKE SURE PATCH IS COMPATIBLE
+    $GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
+    $db				= &DBManagerFactory::getInstance();
+                ///////////////////////////////////////////////////////////////////////////////
+    ////	MAKE SURE PATCH IS COMPATIBLE
 
-	if(is_file("{$argv[1]}/manifest.php")) {
-		// provides $manifest array
-		include("{$argv[1]}/manifest.php");
-	}
-	//If Instance then the files will be accessed from Template/DCEUpgrade folder
-	$zip_from_dir = '';
+    if(is_file("{$argv[1]}/manifest.php")) {
+        // provides $manifest array
+        include("{$argv[1]}/manifest.php");
+    }
+    //If Instance then the files will be accessed from Template/DCEUpgrade folder
+    $zip_from_dir = '';
     if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
-	    $zip_from_dir   = $manifest['copy_files']['from_dir'];
-	}
+        $zip_from_dir   = $manifest['copy_files']['from_dir'];
+    }
 
-	$instanceUpgradePath = "{$argv[1]}/{$zip_from_dir}";
-	$_SESSION['sugar_version_file'] = '';
-	$srcFile = clean_path("{$instanceUpgradePath}/sugar_version.php");
-	if(file_exists($srcFile)) {
-	   $_SESSION['sugar_version_file'] = $srcFile;
-	}
+    $instanceUpgradePath = "{$argv[1]}/{$zip_from_dir}";
+    $_SESSION['sugar_version_file'] = '';
+    $srcFile = clean_path("{$instanceUpgradePath}/sugar_version.php");
+    if(file_exists($srcFile)) {
+        $_SESSION['sugar_version_file'] = $srcFile;
+    }
 
 
-	global $instancePath;
-	$instancePath = $instanceUpgradePath;
-	$_SESSION['instancePath'] = $instancePath;
-	if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
-		require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
-	} else{
-		require_once("{$newtemplate_path}/modules/UpgradeWizard/uw_utils.php");
-	}
+    global $instancePath;
+    $instancePath = $instanceUpgradePath;
+    $_SESSION['instancePath'] = $instancePath;
+    if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
+        require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
+    } else{
+        require_once("{$newtemplate_path}/modules/UpgradeWizard/uw_utils.php");
+    }
 
     $ce_to_pro_ent = isset($manifest['name']) && ($manifest['name'] == 'SugarCE to SugarPro' || $manifest['name'] == 'SugarCE to SugarEnt' || $manifest['name'] == 'SugarCE to SugarCorp' || $manifest['name'] == 'SugarCE to SugarUlt');
-	$_SESSION['upgrade_from_flavor'] = $manifest['name'];
+    $_SESSION['upgrade_from_flavor'] = $manifest['name'];
 
     //check for db upgrade
     //check exit on conflicts
     $skipDBUpgrade = 'no'; //default
     if($argv[6] != null && !empty($argv[6])){
-    	if(strtolower($argv[6]) == 'yes'){
-    	  $skipDBUpgrade = 'yes'; //override
-    	}
+        if(strtolower($argv[6]) == 'yes'){
+            $skipDBUpgrade = 'yes'; //override
+        }
     }
     global $unzip_dir;
     $unzip_dir = $argv[1];
@@ -544,16 +544,16 @@ 
     $path = $argv[2];
 
     if($skipDBUpgrade == 'no'){
-    	//upgrade the db
-	    ///////////////////////////////////////////////////////////////////////////////
-		////	HANDLE PREINSTALL SCRIPTS
-		$file = "{$argv[1]}/".constant('SUGARCRM_PRE_INSTALL_FILE');
-		if(is_file($file)) {
-			include($file);
-			logThis('Running pre_install()...', $path);
-			pre_install();
-			logThis('pre_install() done.', $path);
-		}
+        //upgrade the db
+        ///////////////////////////////////////////////////////////////////////////////
+        ////	HANDLE PREINSTALL SCRIPTS
+        $file = "{$argv[1]}/".constant('SUGARCRM_PRE_INSTALL_FILE');
+        if(is_file($file)) {
+            include($file);
+            logThis('Running pre_install()...', $path);
+            pre_install();
+            logThis('pre_install() done.', $path);
+        }
 
 
         //run the 3-way merge
@@ -565,23 +565,23 @@ 
             logThis('Finished 3 way merge()...', $path);
         }
 
-		logThis('Starting post_install()...', $path);
-		$file = "{$argv[1]}/".constant('SUGARCRM_POST_INSTALL_FILE');
-		if(is_file($file)) {
-		    include($file);
-			post_install();
-		}
-		logThis('post_install() done.', $path);
+        logThis('Starting post_install()...', $path);
+        $file = "{$argv[1]}/".constant('SUGARCRM_POST_INSTALL_FILE');
+        if(is_file($file)) {
+            include($file);
+            post_install();
+        }
+        logThis('post_install() done.', $path);
 
-    	///////////////////////////////////////////////////////////////////////////////
-		//clean vardefs
-		logThis('Performing UWrebuild()...', $path);
-			UWrebuild();
-		logThis('UWrebuild() done.', $path);
+        ///////////////////////////////////////////////////////////////////////////////
+        //clean vardefs
+        logThis('Performing UWrebuild()...', $path);
+            UWrebuild();
+        logThis('UWrebuild() done.', $path);
 
-		logThis('begin check default permissions .', $path);
-	    	checkConfigForPermissions();
-	    logThis('end check default permissions .', $path);
+        logThis('begin check default permissions .', $path);
+            checkConfigForPermissions();
+        logThis('end check default permissions .', $path);
 
         logThis('begin check logger settings .', $path);
             checkLoggerSettings();
@@ -605,63 +605,63 @@ 
         include($newtemplate_path.'/include/modules.php');
         $newModuleList = $moduleList;
 
-		///    RELOAD NEW DEFINITIONS
-		global $ACLActions, $beanList, $beanFiles;
-		include($newtemplate_path.'/modules/ACLActions/actiondefs.php');
-
-		//First repair the databse to ensure it is up to date with the new vardefs/tabledefs
-		logThis('About to repair the database.', $path);
-		//Use Repair and rebuild to update the database.
-		global $dictionary;
-		require_once($newtemplate_path.'/modules/Administration/QuickRepairAndRebuild.php');
-		$rac = new RepairAndClear();
-		$rac->clearVardefs();
-		$rac->rebuildExtensions();
-
-		$repairedTables = array();
-
-		//Force vardefs to be reloaded
-		$GLOBALS['reload_vardefs'] = true;
-
-		foreach ($beanFiles as $bean => $file) {
-			if(file_exists($newtemplate_path . '/' . $file) && $bean != 'UpgradeHistory'){
-				unset($GLOBALS['dictionary'][$bean]);
-				require_once($newtemplate_path . '/' . $file);
-
-				$focus = new $bean ();
-				if(empty($focus->table_name) || isset($repairedTables[$focus->table_name])) {
-				   continue;
-				}
-
-				if (($focus instanceOf SugarBean)) {
-					$sql = $db->repairTable($focus, true);
-					if(!empty($sql)) {
-			   		   logThis($sql, $path);
-			   		   $repairedTables[$focus->table_name] = true;
-					}
-				}
-			}
-		}
+        ///    RELOAD NEW DEFINITIONS
+        global $ACLActions, $beanList, $beanFiles;
+        include($newtemplate_path.'/modules/ACLActions/actiondefs.php');
+
+        //First repair the databse to ensure it is up to date with the new vardefs/tabledefs
+        logThis('About to repair the database.', $path);
+        //Use Repair and rebuild to update the database.
+        global $dictionary;
+        require_once($newtemplate_path.'/modules/Administration/QuickRepairAndRebuild.php');
+        $rac = new RepairAndClear();
+        $rac->clearVardefs();
+        $rac->rebuildExtensions();
+
+        $repairedTables = array();
+
+        //Force vardefs to be reloaded
+        $GLOBALS['reload_vardefs'] = true;
+
+        foreach ($beanFiles as $bean => $file) {
+            if(file_exists($newtemplate_path . '/' . $file) && $bean != 'UpgradeHistory'){
+                unset($GLOBALS['dictionary'][$bean]);
+                require_once($newtemplate_path . '/' . $file);
+
+                $focus = new $bean ();
+                if(empty($focus->table_name) || isset($repairedTables[$focus->table_name])) {
+                    continue;
+                }
+
+                if (($focus instanceOf SugarBean)) {
+                    $sql = $db->repairTable($focus, true);
+                    if(!empty($sql)) {
+                            logThis($sql, $path);
+                            $repairedTables[$focus->table_name] = true;
+                    }
+                }
+            }
+        }
 
-		unset ($dictionary);
-		include ($newtemplate_path.'/modules/TableDictionary.php');
-		foreach ($dictionary as $meta) {
-			$tablename = $meta['table'];
+        unset ($dictionary);
+        include ($newtemplate_path.'/modules/TableDictionary.php');
+        foreach ($dictionary as $meta) {
+            $tablename = $meta['table'];
 
-			if(isset($repairedTables[$tablename])) {
-			   continue;
-			}
+            if(isset($repairedTables[$tablename])) {
+                continue;
+            }
 
-			$fielddefs = $meta['fields'];
-			$indices = $meta['indices'];
-			$sql = $GLOBALS['db']->repairTableParams($tablename, $fielddefs, $indices, true);
-			if(!empty($sql)) {
-			    logThis($sql, $path);
-			    $repairedTables[$tablename] = true;
-			}
+            $fielddefs = $meta['fields'];
+            $indices = $meta['indices'];
+            $sql = $GLOBALS['db']->repairTableParams($tablename, $fielddefs, $indices, true);
+            if(!empty($sql)) {
+                logThis($sql, $path);
+                $repairedTables[$tablename] = true;
+            }
 
-		}
-		logThis('database repaired', $path);
+        }
+        logThis('database repaired', $path);
 
         //include tab controller
         require_once($newtemplate_path.'/modules/MySettings/TabController.php');
@@ -685,7 +685,7 @@ 
 
         //add the new tabs to the array
         foreach($newModuleList as $nm ){
-          $tabs[$nm] = $nm;
+            $tabs[$nm] = $nm;
         }
 
         //now assign the modules to system tabs
@@ -694,75 +694,75 @@ 
 
 
 
-	    if($ce_to_pro_ent){
-	    	//add the global team if it does not exist
-			$globalteam = new Team();
-			$globalteam->retrieve('1');
-			include($newtemplate_path.'/modules/Administration/language/en_us.lang.php');
-			if(isset($globalteam->name)){
+        if($ce_to_pro_ent){
+            //add the global team if it does not exist
+            $globalteam = new Team();
+            $globalteam->retrieve('1');
+            include($newtemplate_path.'/modules/Administration/language/en_us.lang.php');
+            if(isset($globalteam->name)){
 
-			   echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
-			   logThis(" Finish Building private teams", $path);
+                echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
+                logThis(" Finish Building private teams", $path);
 
-			}else{
-			   $globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
-			}
+            }else{
+                $globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
+            }
 
-	    	//build private teams
-		    logThis(" Start Building private teams", $path);
-		    upgradeModulesForTeam();
-		    logThis(" Finish Building private teams", $path);
+            //build private teams
+            logThis(" Start Building private teams", $path);
+            upgradeModulesForTeam();
+            logThis(" Finish Building private teams", $path);
 
-			//build team sets
-		    logThis(" Start Building the team_set and team_sets_teams", $path);
-		    upgradeModulesForTeamsets();
-		    logThis(" Finish Building the team_set and team_sets_teams", $path);
+            //build team sets
+            logThis(" Start Building the team_set and team_sets_teams", $path);
+            upgradeModulesForTeamsets();
+            logThis(" Finish Building the team_set and team_sets_teams", $path);
 
-		    //upgrade teams
-			if(file_exists($newtemplate_path.'/modules/Administration/upgradeTeams.php')) {
-				logThis(" Start {$newtemplate_path}/modules/Administration/upgradeTeams.php", $path);
-				include($newtemplate_path.'/modules/Administration/upgradeTeams.php');
-				logThis(" Finish {$newtemplate_path}/modules/Administration/upgradeTeams.php", $path);
+            //upgrade teams
+            if(file_exists($newtemplate_path.'/modules/Administration/upgradeTeams.php')) {
+                logThis(" Start {$newtemplate_path}/modules/Administration/upgradeTeams.php", $path);
+                include($newtemplate_path.'/modules/Administration/upgradeTeams.php');
+                logThis(" Finish {$newtemplate_path}/modules/Administration/upgradeTeams.php", $path);
 
-				//update the users records to have default team
-				logThis('running query to populate default_team on users table',$path);
-				$GLOBALS['db']->query("update users set default_team = (select teams.id from teams where teams.name = concat('(',users.user_name, ')') or team.associated_user_id = users.id)");
+                //update the users records to have default team
+                logThis('running query to populate default_team on users table',$path);
+                $GLOBALS['db']->query("update users set default_team = (select teams.id from teams where teams.name = concat('(',users.user_name, ')') or team.associated_user_id = users.id)");
 
-			}
+            }
 
-			//run upgrade script for dashlets to include sales/marketing
-			if(function_exists('upgradeDashletsForSalesAndMarketing')){
-	           logThis('calling upgradeDashlets script',$path);
-			   upgradeDashletsForSalesAndMarketing();
-			}
+            //run upgrade script for dashlets to include sales/marketing
+            if(function_exists('upgradeDashletsForSalesAndMarketing')){
+                logThis('calling upgradeDashlets script',$path);
+                upgradeDashletsForSalesAndMarketing();
+            }
 
-	    }
+        }
 
-		require("sugar_version.php");
-		require('config.php');
-		global $sugar_config;
+        require("sugar_version.php");
+        require('config.php');
+        global $sugar_config;
 
-		require("{$instanceUpgradePath}/sugar_version.php");
-		if(!rebuildConfigFile($sugar_config, $sugar_version)) {
-			logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
-			$errors[] = 'Could not write config.php!';
-		}
-		checkConfigForPermissions();
+        require("{$instanceUpgradePath}/sugar_version.php");
+        if(!rebuildConfigFile($sugar_config, $sugar_version)) {
+            logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
+            $errors[] = 'Could not write config.php!';
+        }
+        checkConfigForPermissions();
 
-    	// clear out the theme cache
-		if(!class_exists('SugarThemeRegistry')){
-		    require_once($newtemplate_path . '/include/SugarTheme/SugarTheme.php');
-		}
-		SugarThemeRegistry::buildRegistry();
-		SugarThemeRegistry::clearAllCaches();
+        // clear out the theme cache
+        if(!class_exists('SugarThemeRegistry')){
+            require_once($newtemplate_path . '/include/SugarTheme/SugarTheme.php');
+        }
+        SugarThemeRegistry::buildRegistry();
+        SugarThemeRegistry::clearAllCaches();
 
-		// re-minify the JS source files
-		$_REQUEST['root_directory'] = getcwd();
-		$_REQUEST['js_rebuild_concat'] = 'rebuild';
-		require_once($newtemplate_path . '/jssource/minify.php');
+        // re-minify the JS source files
+        $_REQUEST['root_directory'] = getcwd();
+        $_REQUEST['js_rebuild_concat'] = 'rebuild';
+        require_once($newtemplate_path . '/jssource/minify.php');
 
-		//as last step, rebuild the language files and rebuild relationships
-		/*
+        //as last step, rebuild the language files and rebuild relationships
+        /*
 		if(file_exists($newtemplate_path.'/modules/Administration/RebuildJSLang.php')) {
 			logThis("begin rebuilding js language files. via ".$newtemplate_path.'/modules/Administration/RebuildJSLang.php', $path);
 			include($newtemplate_path.'/modules/Administration/RebuildJSLang.php');
@@ -779,52 +779,52 @@ 
 if(isset($_SESSION['current_db_version']) && isset($_SESSION['target_db_version'])){
     if (version_compare($_SESSION['current_db_version'], $_SESSION['target_db_version'], '='))
     {
-	    $_REQUEST['upgradeWizard'] = true;
-	    ob_start();
-		include('include/Smarty/internals/core.write_file.php');
-		ob_end_clean();
-	 	$db =& DBManagerFactory::getInstance();
-		if($ce_to_pro_ent){
-	        //Also set license information
-	        $admin = new Administration();
-			$category = 'license';
-			$value = 0;
-			$admin->saveSetting($category, 'users', $value);
-			$key = array('num_lic_oc','key','expire_date');
-			$value = '';
-			foreach($key as $k){
-				$admin->saveSetting($category, $k, $value);
-			}
-		}
-	}
+        $_REQUEST['upgradeWizard'] = true;
+        ob_start();
+        include('include/Smarty/internals/core.write_file.php');
+        ob_end_clean();
+            $db =& DBManagerFactory::getInstance();
+        if($ce_to_pro_ent){
+            //Also set license information
+            $admin = new Administration();
+            $category = 'license';
+            $value = 0;
+            $admin->saveSetting($category, 'users', $value);
+            $key = array('num_lic_oc','key','expire_date');
+            $value = '';
+            foreach($key as $k){
+                $admin->saveSetting($category, $k, $value);
+            }
+        }
+    }
 }
 
 set_upgrade_progress('end','done','end','done');
 
 if(file_exists($newtemplate_path . '/modules/Configurator/Configurator.php')){
-	set_upgrade_progress('configurator','in_progress');
-	require_once($newtemplate_path . '/include/utils/array_utils.php');
-	if(!class_exists('Configurator')){
-		require_once($newtemplate_path . '/modules/Configurator/Configurator.php');
-	}
-	$Configurator = new Configurator();
-	if(class_exists('Configurator')){
-		$Configurator->parseLoggerSettings();
-	}
-	set_upgrade_progress('configurator','done');
+    set_upgrade_progress('configurator','in_progress');
+    require_once($newtemplate_path . '/include/utils/array_utils.php');
+    if(!class_exists('Configurator')){
+        require_once($newtemplate_path . '/modules/Configurator/Configurator.php');
+    }
+    $Configurator = new Configurator();
+    if(class_exists('Configurator')){
+        $Configurator->parseLoggerSettings();
+    }
+    set_upgrade_progress('configurator','done');
 }
 
 //unset the logger previously instantiated
 if(file_exists($newtemplate_path . '/include/SugarLogger/LoggerManager.php')){
-	set_upgrade_progress('logger','in_progress');
-	if(!class_exists('LoggerManager')){
+    set_upgrade_progress('logger','in_progress');
+    if(!class_exists('LoggerManager')){
 
-	}
-	if(class_exists('LoggerManager')){
-		unset($GLOBALS['log']);
-		$GLOBALS['log'] = LoggerManager::getLogger('SugarCRM');
-	}
-	set_upgrade_progress('logger','done');
+    }
+    if(class_exists('LoggerManager')){
+        unset($GLOBALS['log']);
+        $GLOBALS['log'] = LoggerManager::getLogger('SugarCRM');
+    }
+    set_upgrade_progress('logger','done');
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -833,22 +833,22 @@ 
 ob_end_clean();
 
 if(count($errors) > 0) {
-	foreach($errors as $error) {
-		logThis("****** SilentUpgrade ERROR: {$error}", $path);
-	}
-	echo "FAILED\n";
+    foreach($errors as $error) {
+        logThis("****** SilentUpgrade ERROR: {$error}", $path);
+    }
+    echo "FAILED\n";
 } else {
-	logThis("***** SilentUpgrade completed successfully.", $path);
-	echo "********************************************************************\n";
-	echo "*************************** SUCCESS*********************************\n";
-	echo "********************************************************************\n";
-	echo "******** If your pre-upgrade Leads data is not showing  ************\n";
-	echo "******** Or you see errors in detailview subpanels  ****************\n";
-	echo "************* In order to resolve them  ****************************\n";
-	echo "******** Log into application as Administrator  ********************\n";
-	echo "******** Go to Admin panel  ****************************************\n";
-	echo "******** Run Repair -> Rebuild Relationships  **********************\n";
-	echo "********************************************************************\n";
+    logThis("***** SilentUpgrade completed successfully.", $path);
+    echo "********************************************************************\n";
+    echo "*************************** SUCCESS*********************************\n";
+    echo "********************************************************************\n";
+    echo "******** If your pre-upgrade Leads data is not showing  ************\n";
+    echo "******** Or you see errors in detailview subpanels  ****************\n";
+    echo "************* In order to resolve them  ****************************\n";
+    echo "******** Log into application as Administrator  ********************\n";
+    echo "******** Go to Admin panel  ****************************************\n";
+    echo "******** Run Repair -> Rebuild Relationships  **********************\n";
+    echo "********************************************************************\n";
 }