adamjakab / SuiteCRM

modules/Calls/views/view.edit.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -49,10 +49,10 @@ 
  	 */
  	public function preDisplay()
  	{
- 		if($_REQUEST['module'] != 'Calls' && isset($_REQUEST['status']) && empty($_REQUEST['status'])) {
+ 		if ($_REQUEST['module'] != 'Calls' && isset($_REQUEST['status']) && empty($_REQUEST['status'])) {
 	       $this->bean->status = '';
  		} //if
-        if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
+        if (!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
 	       $this->bean->status = 'Held';
  		}
  		parent::preDisplay();
@@ -81,7 +81,7 @@ 
 		$this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
 		$this->ss->assign('remindersDisabled', json_encode(false));
 
- 		if($this->ev->isDuplicate){
+ 		if ($this->ev->isDuplicate) {
 	        $this->bean->status = $this->bean->getDefaultStatus();
  		} //if
  		parent::display();

modules/Accounts/AccountsQuickCreate.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -53,7 +53,7 @@ 
         
         parent::process();
   
-        if($this->viaAJAX) { // override for ajax call
+        if ($this->viaAJAX) { // override for ajax call
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"accountsQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"accounts\"); else return false;'");
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_accounts\")';");
         }

modules/Activities/SetAcceptStatus.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +42,7 @@ 
 
 
 
-    global $json,$current_user;
+    global $json, $current_user;
     
     
     if ($_REQUEST['object_type'] == "Meeting")

modules/Leads/metadata/additionalDetails.php

Spacing +26 added lines, -26 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -41,46 +41,46 @@ 
  
 function additionalDetailsLead($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Leads');
 	}
 		
 	$overlib_string = '';
-    if(!empty($fields['ID'])) {
-        $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
+    if (!empty($fields['ID'])) {
+        $overlib_string .= '<input type="hidden" value="'.$fields['ID'];
         $overlib_string .= '">';
     }
 
-    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
+    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName='.SugarThemeRegistry::current()->name.'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
 
-    if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
+    if (!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
 		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+			$overlib_string .= '<b>'.$mod_strings['LBL_PRIMARY_ADDRESS'].'</b><br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'].', ';
+	if (!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'].'<br>';
+	if (strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
 		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+		if (!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'.$mod_strings['LBL_MOBILE_PHONE'].'</b> <span class="phone">'.$fields['PHONE_MOBILE'].'</span><br>';
+	if (!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'.$mod_strings['LBL_HOME_PHONE'].'</b> <span class="phone">'.$fields['PHONE_HOME'].'</span><br>';
+	if (!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'.$mod_strings['LBL_OTHER_PHONE'].'</b> <span class="phone">'.$fields['PHONE_OTHER'].'</span><br>';
+	if (!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'.$mod_strings['LBL_LEAD_SOURCE'].'</b> '.$fields['LEAD_SOURCE'].'<br>';
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
+	if (!empty($fields['EMAIL2'])) 
+		$overlib_string .= '<b>'.$mod_strings['LBL_OTHER_EMAIL_ADDRESS'].'</b> '. 
+								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&".
+								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names".
+								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&".
+								 "to_email_addrs=".urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>").
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
 	
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 	}	
 	
 	return array('fieldToAddTo' => 'NAME', 

modules/Leads/metadata/editviewdefs.php

Spacing +39 added lines, -39 removed lines

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

modules/Leads/metadata/quickcreatedefs.php

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -46,15 +46,15 @@ 
  ********************************************************************************/
 
 $viewdefs ['Leads'] = 
-array (
+array(
   'QuickCreate' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'hidden' => 
-        array (
+        array(
           0 => '<input type="hidden" name="prospect_id" value="{if isset($smarty.request.prospect_id)}{$smarty.request.prospect_id}{else}{$bean->prospect_id}{/if}">',
           1 => '<input type="hidden" name="contact_id" value="{if isset($smarty.request.contact_id)}{$smarty.request.contact_id}{else}{$bean->contact_id}{/if}">',
           2 => '<input type="hidden" name="opportunity_id" value="{if isset($smarty.request.opportunity_id)}{$smarty.request.opportunity_id}{else}{$bean->opportunity_id}{/if}">',
@@ -63,14 +63,14 @@ 
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
@@ -79,94 +79,94 @@ 
       'useTabs' => false,
     ),
     'panels' => 
-    array (
+    array(
       'lbl_contact_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'first_name',
           ),
           1 => 
-          array (
+          array(
             'name' => 'status',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'last_name',
             'displayParams' => 
-            array (
+            array(
               'required' => true,
             ),
           ),
           1 => 
-          array (
+          array(
             'name' => 'phone_work',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'title',
           ),
           1 => 
-          array (
+          array(
             'name' => 'phone_mobile',
           ),
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'department',
           ),
           1 => 
-          array (
+          array(
             'name' => 'phone_fax',
           ),
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'account_name',
           ),
           1 => 
-          array (
+          array(
             'name' => 'do_not_call',
           ),
         ),
         5 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'email1',
           ),
         ),
         6 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'lead_source',
           ),
           1 => 
-          array (
+          array(
             'name' => 'refered_by',
           ),
         ),
         7 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
           ),
           1 => 
-          array (
+          array(
             'name' => 'team_name',
           ),
         ),

modules/Leads/metadata/listviewdefs.php

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,45 +42,45 @@ 
 
 
 $listViewDefs ['Leads'] = 
-array (
+array(
   'NAME' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_NAME',
     'link' => true,
     'orderBy' => 'name',
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'first_name',
       1 => 'last_name',
       2 => 'salutation',
     ),
   ),
   'STATUS' => 
-  array (
+  array(
     'width' => '7%',
     'label' => 'LBL_LIST_STATUS',
     'default' => true,
   ),
   'ACCOUNT_NAME' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_ACCOUNT_NAME',
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'account_id',
     ),
   ),
   'PHONE_WORK' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_PHONE',
     'default' => true,
   ),
   'EMAIL1' => 
-  array (
+  array(
     'width' => '16%',
     'label' => 'LBL_LIST_EMAIL_ADDRESS',
     'sortable' => false,
@@ -88,7 +88,7 @@ 
     'default' => true,
   ),
   'ASSIGNED_USER_NAME' => 
-  array (
+  array(
     'width' => '5%',
     'label' => 'LBL_LIST_ASSIGNED_USER',
     'module' => 'Employees',
@@ -96,133 +96,133 @@ 
     'default' => true,
   ),
   'TITLE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_TITLE',
     'default' => false,
   ),
   'REFERED_BY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_REFERED_BY',
     'default' => false,
   ),
   'LEAD_SOURCE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LEAD_SOURCE',
     'default' => false,
   ),
   'DEPARTMENT' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DEPARTMENT',
     'default' => false,
   ),
   'DO_NOT_CALL' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DO_NOT_CALL',
     'default' => false,
   ),
   'PHONE_HOME' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_HOME_PHONE',
     'default' => false,
   ),
   'PHONE_MOBILE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_MOBILE_PHONE',
     'default' => false,
   ),
   'PHONE_OTHER' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_OTHER_PHONE',
     'default' => false,
   ),
   'PHONE_FAX' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_FAX_PHONE',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_COUNTRY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_COUNTRY',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_STREET' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_STREET',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_CITY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_CITY',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_STATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_STATE',
     'default' => false,
   ),
   'PRIMARY_ADDRESS_POSTALCODE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_PRIMARY_ADDRESS_POSTALCODE',
     'default' => false,
   ),
   'ALT_ADDRESS_COUNTRY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_COUNTRY',
     'default' => false,
   ),
   'ALT_ADDRESS_STREET' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_STREET',
     'default' => false,
   ),
   'ALT_ADDRESS_CITY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_CITY',
     'default' => false,
   ),
   'ALT_ADDRESS_STATE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_STATE',
     'default' => false,
   ),
   'ALT_ADDRESS_POSTALCODE' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_ALT_ADDRESS_POSTALCODE',
     'default' => false,
   ),
   'CREATED_BY' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_CREATED',
     'default' => false,
   ),
   'MODIFIED_BY_NAME' => 
-  array (
+  array(
     'width' => '5%',
     'label' => 'LBL_MODIFIED',
     'default' => false,
   ),
   'DATE_ENTERED' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true,

modules/Leads/views/view.showduplicates.php

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,13 +56,13 @@ 
         global $current_language;
         global $mod_strings;
 
-        if(!isset($_SESSION['SHOW_DUPLICATES']))
+        if (!isset($_SESSION['SHOW_DUPLICATES']))
         {
             $GLOBALS['log']->error("Unauthorized access to this area.");
             sugar_die("Unauthorized access to this area.");
         }
 
-        parse_str($_SESSION['SHOW_DUPLICATES'],$_POST);
+        parse_str($_SESSION['SHOW_DUPLICATES'], $_POST);
         $post = array_map("securexss", $_POST);
         foreach ($post as $k => $v) {
             $_POST[$k] = $v;
@@ -95,8 +95,8 @@ 
         $duplicateLeads = array();
         $db = DBManagerFactory::getInstance();
         $result = $db->query($query);
-        $i=0;
-        while (($row=$db->fetchByAssoc($result)) != null) {
+        $i = 0;
+        while (($row = $db->fetchByAssoc($result)) != null) {
             $duplicateLeads[$i] = $row;
             $i++;
         }
@@ -119,11 +119,11 @@ 
         }
 
         // Bug 25311 - Add special handling for when the form specifies many-to-many relationships
-        if(!empty($_POST['Leadsrelate_to'])) {
+        if (!empty($_POST['Leadsrelate_to'])) {
             $input .= "<input type='hidden' name='relate_to' value='{$_POST['Leadsrelate_to']}'>\n";
         }
 
-        if(!empty($_POST['Leadsrelate_id'])) {
+        if (!empty($_POST['Leadsrelate_id'])) {
             $input .= "<input type='hidden' name='relate_id' value='{$_POST['Leadsrelate_id']}'>\n";
         }
 
@@ -132,7 +132,7 @@ 
         $input .= $emailAddress->getEmailAddressWidgetDuplicatesView($lead);
 
         $get = '';
-        if(!empty($_POST['return_module']))
+        if (!empty($_POST['return_module']))
         {
             $this->ss->assign('RETURN_MODULE', $_POST['return_module']);
         } else {
@@ -140,7 +140,7 @@ 
         }
 
         $get .= "&return_action=";
-        if(!empty($_POST['return_action']))
+        if (!empty($_POST['return_action']))
         {
             $this->ss->assign('RETURN_ACTION', $_POST['return_action']);
         } else {
@@ -149,38 +149,38 @@ 
 
         ///////////////////////////////////////////////////////////////////////////////
         ////	INBOUND EMAIL WORKFLOW
-        if(isset($_REQUEST['inbound_email_id'])) {
+        if (isset($_REQUEST['inbound_email_id'])) {
             $this->ss->assign('INBOUND_EMAIL_ID', $_REQUEST['inbound_email_id']);
             $this->ss->assign('RETURN_MODULE', 'Emails');
             $this->ss->assign('RETURN_ACTION', 'EditView');
-            if(isset($_REQUEST['start'])) {
+            if (isset($_REQUEST['start'])) {
                $this->ss->assign('START', $_REQUEST['start']);
             }
         }
         ////	END INBOUND EMAIL WORKFLOW
         ///////////////////////////////////////////////////////////////////////////////
-        if(!empty($_POST['popup']))
+        if (!empty($_POST['popup']))
         {
             $input .= '<input type="hidden" name="popup" value="'.$_POST['popup'].'">';
         } else {
             $input .= '<input type="hidden" name="popup" value="false">';
         }
 
-        if(!empty($_POST['to_pdf']))
+        if (!empty($_POST['to_pdf']))
         {
             $input .= '<input type="hidden" name="to_pdf" value="'.$_POST['to_pdf'].'">';
         } else {
             $input .= '<input type="hidden" name="to_pdf" value="false">';
         }
 
-        if(!empty($_POST['create']))
+        if (!empty($_POST['create']))
         {
             $input .= '<input type="hidden" name="create" value="'.$_POST['create'].'">';
         } else {
             $input .= '<input type="hidden" name="create" value="false">';
         }
 
-        if(!empty($_POST['return_id']))
+        if (!empty($_POST['return_id']))
         {
             $this->ss->assign('RETURN_ID', $_POST['return_id']);
         }
@@ -189,9 +189,9 @@ 
 
         //Load the appropriate template
         $template = 'modules/Leads/tpls/ShowDuplicates.tpl';
-        if(file_exists('custom/' . $template))
+        if (file_exists('custom/'.$template))
         {
-           $template = 'custom/' . $template;
+           $template = 'custom/'.$template;
         }
 
         $saveLabel = string_format($app_strings['LBL_SAVE_OBJECT'], array($this->module));

modules/UpgradeWizard/silentUpgrade_dce_step2.php

Spacing +128 added lines, -128 removed lines

@@ -42,7 +42,7 @@ 
 //// php.exe -f silentUpgrade.php [Path to Upgrade Package zip] [Path to Log file] [Path to Instance]
 //// See below the Usage for more details.
 /////////////////////////////////////////////////////////////////////////////////////////
-ini_set('memory_limit',-1);
+ini_set('memory_limit', -1);
 ///////////////////////////////////////////////////////////////////////////////
 ////	UTILITIES THAT MUST BE LOCAL :(
 //local function for clearing cache
@@ -50,11 +50,11 @@ 
 	if ($current = @opendir($thedir)) {
 		while (false !== ($children = readdir($current))) {
 			if ($children != "." && $children != "..") {
-				if (is_dir($thedir . "/" . $children)) {
-					clearCacheSU($thedir . "/" . $children, $extension);
+				if (is_dir($thedir."/".$children)) {
+					clearCacheSU($thedir."/".$children, $extension);
 				}
-				elseif (is_file($thedir . "/" . $children) && substr_count($children, $extension)) {
-					unlink($thedir . "/" . $children);
+				elseif (is_file($thedir."/".$children) && substr_count($children, $extension)) {
+					unlink($thedir."/".$children);
 				}
 			}
 		}
@@ -62,34 +62,34 @@ 
  }
  //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')){
+ 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 (
+     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')) {
+         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')){
+function checkLoggerSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['logger'])){
-	    $sugar_config['logger'] =array (
+	if (!isset($sugar_config['logger'])) {
+	    $sugar_config['logger'] = array(
 			'level'=>'fatal',
 		    'file' =>
-		     array (
+		     array(
 		      'ext' => '.log',
 		      'name' => 'sugarcrm',
 		      'dateFormat' => '%c',
@@ -99,23 +99,23 @@ 
 		    ),
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         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')){
+function checkResourceSettings() {
+	if (file_exists(getcwd().'/config.php')) {
          require(getcwd().'/config.php');
      }
     global $sugar_config;
-	if(!isset($sugar_config['resource_management'])){
+	if (!isset($sugar_config['resource_management'])) {
 	  $sugar_config['resource_management'] =
-		  array (
+		  array(
 		    'special_query_limit' => 50000,
 		    'special_query_modules' =>
-		    array (
+		    array(
 		      0 => 'Reports',
 		      1 => 'Export',
 		      2 => 'Import',
@@ -125,22 +125,22 @@ 
 		    'default_limit' => 1000,
 		  );
 		 ksort($sugar_config);
-         if(is_writable('config.php') && write_array_to_file("sugar_config", $sugar_config,'config.php')) {
+         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){
+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);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
+		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);
@@ -148,10 +148,10 @@ 
 		//modified_user
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_modified_user'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-		if(!isset($a['id']) && empty($a['id']) ){
+		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);
@@ -159,10 +159,10 @@ 
 		//created_by
 		$guid = create_guid();
 		$query = "SELECT id FROM relationships WHERE relationship_name = '{$relObjName}_created_by'";
-		$result= $GLOBALS['db']->query($query, true);
+		$result = $GLOBALS['db']->query($query, true);
 		$a = null;
 		$a = $GLOBALS['db']->fetchByAssoc($result);
-    	if(!isset($a['id']) && empty($a['id']) ){
+    	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);
@@ -180,7 +180,7 @@ 
  */
 function merge_passwordsetting($sugar_config, $sugar_version) {
     $passwordsetting_defaults = array(
-    'passwordsetting' => array (
+    'passwordsetting' => array(
         'SystemGeneratedPasswordON' => '',
         'generatepasswordtmpl' => '',
         'lostpasswordtmpl' => '',
@@ -192,18 +192,18 @@ 
         'systexpirationtime' => '',
         'systexpirationtype' => '0',
         'systexpirationlogin' => '',
-        ) ,
+        ),
     );
 
 
-    $sugar_config = sugarArrayMerge($passwordsetting_defaults, $sugar_config );
+    $sugar_config = sugarArrayMerge($passwordsetting_defaults, $sugar_config);
 
     // need to override version with default no matter what
     $sugar_config['sugar_version'] = $sugar_version;
 
-    ksort( $sugar_config );
+    ksort($sugar_config);
 
-    if( write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+    if (write_array_to_file("sugar_config", $sugar_config, "config.php")) {
         return true;
     }
     else {
@@ -212,17 +212,17 @@ 
 }
 
 function addDefaultModuleRoles($defaultRoles = array()) {
-	foreach($defaultRoles as $roleName=>$role){
-        foreach($role as $category=>$actions){
-            foreach($actions as $name=>$access_override){
+	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);
+					$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')";
+	                	$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);
 	                }
             }
@@ -230,11 +230,11 @@ 
 	}
 }
 
-function verifyArguments($argv,$usage_dce,$usage_regular){
+function verifyArguments($argv, $usage_dce, $usage_regular) {
     $upgradeType = '';
     $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
-    if(isset($argv[3])) {
-        if(is_dir($argv[3])) {
+    if (isset($argv[3])) {
+        if (is_dir($argv[3])) {
             $cwd = $argv[3];
             chdir($cwd);
         } else {
@@ -245,12 +245,12 @@ 
     }
 
     //check if this is an instance
-    if(is_file("{$cwd}/ini_setup.php")){
+    if (is_file("{$cwd}/ini_setup.php")) {
         // this is an instance
         $upgradeType = constant('DCE_INSTANCE');
         //now that this is dce instance we want to make sure that there are
         // 7 arguments
-        if(count($argv) < 7) {
+        if (count($argv) < 7) {
             echo "*******************************************************************************\n";
             echo "*** ERROR: Missing required parameters.  Received ".count($argv)." argument(s), require 7.\n";
             echo $usage_dce;
@@ -258,7 +258,7 @@ 
             exit(1);
         }
         // this is an instance
-        if(!is_dir($argv[1])) { // valid directory . template path?
+        if (!is_dir($argv[1])) { // valid directory . template path?
             echo "*******************************************************************************\n";
             echo "*** ERROR: First argument must be a full path to the template. Got [ {$argv[1]} ].\n";
             echo $usage_dce;
@@ -266,18 +266,18 @@ 
             exit(1);
         }
     }
-    else if(is_file("{$cwd}/include/entryPoint.php")) {
+    else if (is_file("{$cwd}/include/entryPoint.php")) {
         //this should be a regular sugar install
         $upgradeType = constant('SUGARCRM_INSTALL');
         //check if this is a valid zip file
-        if(!is_file($argv[1])) { // valid zip?
+        if (!is_file($argv[1])) { // valid zip?
             echo "*******************************************************************************\n";
             echo "*** ERROR: First argument must be a full path to the patch file. Got [ {$argv[1]} ].\n";
             echo $usage_regular;
             echo "FAILURE\n";
             exit(1);
         }
-        if(count($argv) < 5) {
+        if (count($argv) < 5) {
             echo "*******************************************************************************\n";
             echo "*** ERROR: Missing required parameters.  Received ".count($argv)." argument(s), require 5.\n";
             echo $usage_regular;
@@ -292,29 +292,29 @@ 
         exit(1);
     }
 
-    if(isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')){
+    if (isset($argv[7]) && file_exists($argv[7].'SugarTemplateUtilties.php')) {
         require_once($argv[7].'SugarTemplateUtilties.php');
     }
 
     return $upgradeType;
 }
 
-function upgradeDCEFiles($argv,$instanceUpgradePath){
+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){
+	$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))) {
+		if (file_exists($srcFile)) {
+			if (!is_dir(dirname($destFile))) {
 				mkdir_recursive(dirname($destFile)); // make sure the directory exists
 			}
-			copy_recursive($srcFile,$destFile);
+			copy_recursive($srcFile, $destFile);
 			$_GET['TEMPLATE_PATH'] = $destFile;
 			$_GET['CONVERT_FILE_ONLY'] = true;
-			if(!class_exists('TemplateConverter')){
+			if (!class_exists('TemplateConverter')) {
 				include($argv[7].'templateConverter.php');
-			}else{
+			} else {
 				TemplateConverter::convertFile($_GET['TEMPLATE_PATH']);
 			}
 
@@ -325,7 +325,7 @@ 
 
 
 
-function threeWayMerge(){
+function threeWayMerge() {
 	//using threeway merge apis
 }
 ////	END UTILITIES THAT MUST BE LOCAL :(
@@ -339,8 +339,8 @@ 
 //End of #52872
 
 // 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.');
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
+	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
@@ -349,7 +349,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	USAGE
-$usage_dce =<<<eoq1
+$usage_dce = <<<eoq1
 Usage: php.exe -f silentUpgrade.php [upgradeZipFile] [logFile] [pathToSugarInstance]
 
 On Command Prompt Change directory to where silentUpgrade.php resides. Then type path to
@@ -370,7 +370,7 @@ 
 
 eoq1;
 
-$usage_regular =<<<eoq2
+$usage_regular = <<<eoq2
 Usage: php.exe -f silentUpgrade.php [upgradeZipFile] [logFile] [pathToSugarInstance] [admin-user]
 
 On Command Prompt Change directory to where silentUpgrade.php resides. Then type path to
@@ -392,7 +392,7 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	STANDARD REQUIRED SUGAR INCLUDES AND PRESETS
-if(!defined('sugarEntry')) define('sugarEntry', true);
+if (!defined('sugarEntry')) define('sugarEntry', true);
 
 $_SESSION = array();
 $_SESSION['schema_change'] = 'sugar'; // we force-run all SQL
@@ -409,7 +409,7 @@ 
 global $cwd;
 $cwd = getcwd(); // default to current, assumed to be in a valid SugarCRM root dir.
 
-$upgradeType = verifyArguments($argv,$usage_dce,$usage_regular);
+$upgradeType = verifyArguments($argv, $usage_dce, $usage_regular);
 
 ///////////////////////////////////////////////////////////////////////////////
 //////  Verify that all the arguments are appropriately placed////////////////
@@ -419,14 +419,14 @@ 
 //$GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
 //require_once('/var/www/html/eddy/sugarnode/SugarTemplateUtilities.php');
 
-$path			= $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
+$path = $argv[2]; // custom log file, if blank will use ./upgradeWizard.log
 //$db				= &DBManagerFactory::getInstance();  //<---------
 
 
 //$UWstrings		= return_module_language('en_us', 'UpgradeWizard');
 //$adminStrings	= return_module_language('en_us', 'Administration');
 //$mod_strings	= array_merge($adminStrings, $UWstrings);
-$subdirs		= array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+$subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
 
 //$_REQUEST['zip_from_dir'] = $zip_from_dir;
 
@@ -448,7 +448,7 @@ 
 $errors = array();
 
 
-if($upgradeType == constant('DCE_INSTANCE')){
+if ($upgradeType == constant('DCE_INSTANCE')) {
    	//$instanceUpgradePath = "{$argv[1]}/DCEUpgrade/{$zip_from_dir}";
    	//$instanceUpgradePath = "{$argv[1]}";
 	include ("ini_setup.php");
@@ -494,25 +494,25 @@ 
     $isDCEInstance = true;
     $configOptions = $sugar_config['dbconfig'];
 
-	$GLOBALS['log']	= LoggerManager::getLogger('SugarCRM');
-	$db				= &DBManagerFactory::getInstance();
+	$GLOBALS['log'] = LoggerManager::getLogger('SugarCRM');
+	$db = &DBManagerFactory::getInstance();
        		///////////////////////////////////////////////////////////////////////////////
 	////	MAKE SURE PATCH IS COMPATIBLE
 
-	if(is_file("{$argv[1]}/manifest.php")) {
+	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'];
+    if (isset($manifest['copy_files']['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)) {
+	if (file_exists($srcFile)) {
 	   $_SESSION['sugar_version_file'] = $srcFile;
 	}
 
@@ -520,9 +520,9 @@ 
 	global $instancePath;
 	$instancePath = $instanceUpgradePath;
 	$_SESSION['instancePath'] = $instancePath;
-	if(file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")){
+	if (file_exists("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php")) {
 		require_once("{$instanceUpgradePath}/modules/UpgradeWizard/uw_utils.php");
-	} else{
+	} else {
 		require_once("{$newtemplate_path}/modules/UpgradeWizard/uw_utils.php");
 	}
 
@@ -532,8 +532,8 @@ 
     //check for db upgrade
     //check exit on conflicts
     $skipDBUpgrade = 'no'; //default
-    if($argv[6] != null && !empty($argv[6])){
-    	if(strtolower($argv[6]) == 'yes'){
+    if ($argv[6] != null && !empty($argv[6])) {
+    	if (strtolower($argv[6]) == 'yes') {
     	  $skipDBUpgrade = 'yes'; //override
     	}
     }
@@ -543,12 +543,12 @@ 
     global $path;
     $path = $argv[2];
 
-    if($skipDBUpgrade == 'no'){
+    if ($skipDBUpgrade == 'no') {
     	//upgrade the db
 	    ///////////////////////////////////////////////////////////////////////////////
 		////	HANDLE PREINSTALL SCRIPTS
 		$file = "{$argv[1]}/".constant('SUGARCRM_PRE_INSTALL_FILE');
-		if(is_file($file)) {
+		if (is_file($file)) {
 			include($file);
 			logThis('Running pre_install()...', $path);
 			pre_install();
@@ -557,7 +557,7 @@ 
 
 
         //run the 3-way merge
-        if(file_exists($newtemplate_path.'/modules/UpgradeWizard/SugarMerge/SugarMerge.php')){
+        if (file_exists($newtemplate_path.'/modules/UpgradeWizard/SugarMerge/SugarMerge.php')) {
             logThis('Running 3 way merge()...', $path);
             require_once($newtemplate_path.'/modules/UpgradeWizard/SugarMerge/SugarMerge.php');
             $merger = new SugarMerge($instanceUpgradePath, $argv[4].'/', $argv[3].'/custom');
@@ -567,7 +567,7 @@ 
 
 		logThis('Starting post_install()...', $path);
 		$file = "{$argv[1]}/".constant('SUGARCRM_POST_INSTALL_FILE');
-		if(is_file($file)) {
+		if (is_file($file)) {
 		    include($file);
 			post_install();
 		}
@@ -590,14 +590,14 @@ 
         logThis('Set default_max_tabs to 7', $path);
         $sugar_config['default_max_tabs'] = '7';
 
-        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ) {
+        if (!write_array_to_file("sugar_config", $sugar_config, "config.php")) {
             logThis('*** ERROR: could not write config.php! - upgrade will fail!', $path);
             $errors[] = 'Could not write config.php!';
         }
 
         //check to see if there are any new files that need to be added to systems tab
         //retrieve old modules list
-        logThis('check to see if new modules exist',$path);
+        logThis('check to see if new modules exist', $path);
         $oldModuleList = array();
         $newModuleList = array();
         include($argv[4].'/include/modules.php');
@@ -624,18 +624,18 @@ 
 		$GLOBALS['reload_vardefs'] = true;
 
 		foreach ($beanFiles as $bean => $file) {
-			if(file_exists($newtemplate_path . '/' . $file) && $bean != 'UpgradeHistory'){
+			if (file_exists($newtemplate_path.'/'.$file) && $bean != 'UpgradeHistory') {
 				unset($GLOBALS['dictionary'][$bean]);
-				require_once($newtemplate_path . '/' . $file);
+				require_once($newtemplate_path.'/'.$file);
 
-				$focus = new $bean ();
-				if(empty($focus->table_name) || isset($repairedTables[$focus->table_name])) {
+				$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)) {
+					if (!empty($sql)) {
 			   		   logThis($sql, $path);
 			   		   $repairedTables[$focus->table_name] = true;
 					}
@@ -648,14 +648,14 @@ 
 		foreach ($dictionary as $meta) {
 			$tablename = $meta['table'];
 
-			if(isset($repairedTables[$tablename])) {
+			if (isset($repairedTables[$tablename])) {
 			   continue;
 			}
 
 			$fielddefs = $meta['fields'];
 			$indices = $meta['indices'];
 			$sql = $GLOBALS['db']->repairTableParams($tablename, $fielddefs, $indices, true);
-			if(!empty($sql)) {
+			if (!empty($sql)) {
 			    logThis($sql, $path);
 			    $repairedTables[$tablename] = true;
 			}
@@ -672,39 +672,39 @@ 
         $oldModuleList = $newTB->get_key_array($oldModuleList);
 
         //iterate through list and remove commonalities to get new modules
-        foreach ($newModuleList as $remove_mod){
-            if(in_array($remove_mod, $oldModuleList)){
+        foreach ($newModuleList as $remove_mod) {
+            if (in_array($remove_mod, $oldModuleList)) {
                 unset($newModuleList[$remove_mod]);
             }
         }
         //new modules list now has left over modules which are new to this install, so lets add them to the system tabs
-        logThis('new modules to add are '.var_export($newModuleList,true),$path);
+        logThis('new modules to add are '.var_export($newModuleList, true), $path);
 
         //grab the existing system tabs
         $tabs = $newTB->get_system_tabs();
 
         //add the new tabs to the array
-        foreach($newModuleList as $nm ){
+        foreach ($newModuleList as $nm) {
           $tabs[$nm] = $nm;
         }
 
         //now assign the modules to system tabs
         $newTB->set_system_tabs($tabs);
-        logThis('module tabs updated',$path);
+        logThis('module tabs updated', $path);
 
 
 
-	    if($ce_to_pro_ent){
+	    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 (isset($globalteam->name)) {
 
 			   echo 'Global '.$mod_strings['LBL_UPGRADE_TEAM_EXISTS'].'<br>';
 			   logThis(" Finish Building private teams", $path);
 
-			}else{
+			} else {
 			   $globalteam->create_team("Global", $mod_strings['LBL_GLOBAL_TEAM_DESC'], $globalteam->global_team);
 			}
 
@@ -719,20 +719,20 @@ 
 		    logThis(" Finish Building the team_set and team_sets_teams", $path);
 
 		    //upgrade teams
-			if(file_exists($newtemplate_path.'/modules/Administration/upgradeTeams.php')) {
+			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);
+				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);
+			if (function_exists('upgradeDashletsForSalesAndMarketing')) {
+	           logThis('calling upgradeDashlets script', $path);
 			   upgradeDashletsForSalesAndMarketing();
 			}
 
@@ -743,15 +743,15 @@ 
 		global $sugar_config;
 
 		require("{$instanceUpgradePath}/sugar_version.php");
-		if(!rebuildConfigFile($sugar_config, $sugar_version)) {
+		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');
+		if (!class_exists('SugarThemeRegistry')) {
+		    require_once($newtemplate_path.'/include/SugarTheme/SugarTheme.php');
 		}
 		SugarThemeRegistry::buildRegistry();
 		SugarThemeRegistry::clearAllCaches();
@@ -759,7 +759,7 @@ 
 		// re-minify the JS source files
 		$_REQUEST['root_directory'] = getcwd();
 		$_REQUEST['js_rebuild_concat'] = 'rebuild';
-		require_once($newtemplate_path . '/jssource/minify.php');
+		require_once($newtemplate_path.'/jssource/minify.php');
 
 		//as last step, rebuild the language files and rebuild relationships
 		/*
@@ -776,55 +776,55 @@ 
 
 
 //Also set the tracker settings if  flavor conversion ce->pro or ce->ent
-if(isset($_SESSION['current_db_version']) && isset($_SESSION['target_db_version'])){
+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){
+	 	$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');
+			$key = array('num_lic_oc', 'key', 'expire_date');
 			$value = '';
-			foreach($key as $k){
+			foreach ($key as $k) {
 				$admin->saveSetting($category, $k, $value);
 			}
 		}
 	}
 }
 
-set_upgrade_progress('end','done','end','done');
+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');
+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')){
+	if (class_exists('Configurator')) {
 		$Configurator->parseLoggerSettings();
 	}
-	set_upgrade_progress('configurator','done');
+	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')){
+if (file_exists($newtemplate_path.'/include/SugarLogger/LoggerManager.php')) {
+	set_upgrade_progress('logger', 'in_progress');
+	if (!class_exists('LoggerManager')) {
 
 	}
-	if(class_exists('LoggerManager')){
+	if (class_exists('LoggerManager')) {
 		unset($GLOBALS['log']);
 		$GLOBALS['log'] = LoggerManager::getLogger('SugarCRM');
 	}
-	set_upgrade_progress('logger','done');
+	set_upgrade_progress('logger', 'done');
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -832,8 +832,8 @@ 
 $phpErrors = ob_get_contents();
 ob_end_clean();
 
-if(count($errors) > 0) {
-	foreach($errors as $error) {
+if (count($errors) > 0) {
+	foreach ($errors as $error) {
 		logThis("****** SilentUpgrade ERROR: {$error}", $path);
 	}
 	echo "FAILED\n";