adamjakab / SuiteCRM

modules/Contacts/metadata/SearchFields.php

Indentation +33 added lines, -33 removed lines

@@ -40,47 +40,47 @@
 global $current_user;
 $module_name = "Contacts";
 $searchFields['Contacts'] = 
-	array (
-		'first_name' => array( 'query_type'=>'default'),
-		'last_name'=> array('query_type'=>'default'),
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
-		'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
-		'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
-		'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',
-			),
-		),	
+    array (
+        'first_name' => array( 'query_type'=>'default'),
+        'last_name'=> array('query_type'=>'default'),
+        'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
+        'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
+        'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+        'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
+        'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
+        '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',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
             'db_field'=>array('id')),
-		'assistant'=> array('query_type'=>'default'),
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
-		'assigned_user_id'=> array('query_type'=>'default'),
+        'assistant'=> array('query_type'=>'default'),
+        'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
+        'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
+        'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
+        'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
+        'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
+        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'assigned_user_id'=> array('query_type'=>'default'),
         'account_id'=> array('query_type'=>'default','db_field'=>array('accounts.id')),
         'campaign_name'=> array('query_type'=>'default'),
-		//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),
+        //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 			
+    );
 ?>

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,14 +40,14 @@ 
 global $current_user;
 $module_name = "Contacts";
 $searchFields['Contacts'] = 
-	array (
-		'first_name' => array( 'query_type'=>'default'),
+	array(
+		'first_name' => array('query_type'=>'default'),
 		'last_name'=> array('query_type'=>'default'),
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
-		'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+		'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('accounts.name')),
+		'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
 		'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
+		'phone'=> array('query_type'=>'default', 'db_field'=>array('phone_mobile', 'phone_work', 'phone_other', 'phone_fax', 'assistant_phone')),
 		'email'=> array(
 			'query_type' => 'default',
 			'operator' => 'subquery',
@@ -62,25 +62,25 @@ 
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 		'assistant'=> array('query_type'=>'default'),
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+		'address_street'=> array('query_type'=>'default', 'db_field'=>array('primary_address_street', 'alt_address_street')),
+		'address_city'=> array('query_type'=>'default', 'db_field'=>array('primary_address_city', 'alt_address_city')),
+		'address_state'=> array('query_type'=>'default', 'db_field'=>array('primary_address_state', 'alt_address_state')),
+		'address_postalcode'=> array('query_type'=>'default', 'db_field'=>array('primary_address_postalcode', 'alt_address_postalcode')),
+		'address_country'=> array('query_type'=>'default', 'db_field'=>array('primary_address_country', 'alt_address_country')),
+		'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
 		'assigned_user_id'=> array('query_type'=>'default'),
-        'account_id'=> array('query_type'=>'default','db_field'=>array('accounts.id')),
+        'account_id'=> array('query_type'=>'default', 'db_field'=>array('accounts.id')),
         'campaign_name'=> array('query_type'=>'default'),
 		//Range Search Support 
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	    'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    //Range Search Support 			
 	);
 ?>

modules/Opportunities/metadata/SearchFields.php

Indentation +34 added lines, -34 removed lines

@@ -40,48 +40,48 @@
 global $current_user;
 $module_name = "Opportunities";
 $searchFields['Opportunities'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
-		'amount'=> array('query_type'=>'default'),
-		'next_step'=> array('query_type'=>'default'),
-		'probability'=> array('query_type'=>'default'),
-		'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
-		'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
-		'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
-		'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'),
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('sales_stage'),
-			'operator'=>'not in',
-			'closed_values' => array('Closed Won', 'Closed Lost'),
-			'type'=>'bool',
-		),
+    array (
+        'name' => array( 'query_type'=>'default'),
+        'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
+        'amount'=> array('query_type'=>'default'),
+        'next_step'=> array('query_type'=>'default'),
+        'probability'=> array('query_type'=>'default'),
+        'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+        'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
+        'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
+        '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'),
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('sales_stage'),
+            'operator'=>'not in',
+            'closed_values' => array('Closed Won', 'Closed Lost'),
+            'type'=>'bool',
+        ),
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
             'db_field'=>array('id')),
 
-		//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_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	   
-       'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_closed' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_closed' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 
-       'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
-	   'start_range_amount' => array ('query_type' => 'default',  'enable_range_search' => true),
-       'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
-		//Range Search Support 			
-	);
+        'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
+        'start_range_amount' => array ('query_type' => 'default',  'enable_range_search' => true),
+        'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
+        //Range Search Support 			
+    );
 ?>

Spacing +18 added lines, -18 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,16 +40,16 @@ 
 global $current_user;
 $module_name = "Opportunities";
 $searchFields['Opportunities'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
+	array(
+		'name' => array('query_type'=>'default'),
+		'account_name'=> array('query_type'=>'default', 'db_field'=>array('accounts.name')),
 		'amount'=> array('query_type'=>'default'),
 		'next_step'=> array('query_type'=>'default'),
 		'probability'=> array('query_type'=>'default'),
 		'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
 		'opportunity_type'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'opportunity_type_dom', 'template_var' => 'TYPE_OPTIONS'),
 		'sales_stage'=> array('query_type'=>'default', 'operator'=>'=', 'options' => 'sales_stage_dom', 'template_var' => 'SALES_STAGE_OPTIONS', 'options_add_blank' => true),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+		'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'),
 		'open_only' => array(
 			'query_type'=>'default',
@@ -64,24 +64,24 @@ 
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 
 		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	   
-       'range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_closed' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_closed' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+       'range_date_closed' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_closed' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_closed' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 
-       'range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
-	   'start_range_amount' => array ('query_type' => 'default',  'enable_range_search' => true),
-       'end_range_amount' => array ('query_type' => 'default', 'enable_range_search' => true),
+       'range_amount' => array('query_type' => 'default', 'enable_range_search' => true),
+	   'start_range_amount' => array('query_type' => 'default', 'enable_range_search' => true),
+       'end_range_amount' => array('query_type' => 'default', 'enable_range_search' => true),
 		//Range Search Support 			
 	);
 ?>

modules/Campaigns/WizardNewsletter.php

Spacing +140 added lines, -140 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.
@@ -64,10 +64,10 @@ 
 /*************** GENERAL SETUP WORK **********/
 
 $focus = new Campaign();
-if(isset($_REQUEST['record'])) {
+if (isset($_REQUEST['record'])) {
     $focus->retrieve($_REQUEST['record']);
 }
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
+if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
     $focus->id = "";
 }
 global $theme;
@@ -78,9 +78,9 @@ 
 
 $GLOBALS['log']->info("Campaign NewsLetter Wizard");
 
-if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_NEWSLETTER WIZARD_TITLE'].$focus->name), true, false);
-}else{
+} else {
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_CAMPAIGN'].$focus->name), true, false);   
 }
 
@@ -104,26 +104,26 @@ 
 $sqs_objects = array('parent_name' => $qsd->getQSParent(), 
                     'assigned_user_name' => $qsd->getQSUser(),
                     //'prospect_list_name' => getProspectListQSObjects(),
-                    'test_name' => getProspectListQSObjects('prospect_list_type_test', 'test_name','wiz_step3_test_name_id'),
-                    'unsubscription_name' => getProspectListQSObjects('prospect_list_type_exempt', 'unsubscription_name','wiz_step3_unsubscription_name_id'),
-                    'subscription_name' => getProspectListQSObjects('prospect_list_type_default', 'subscription_name','wiz_step3_subscription_name_id'),
+                    'test_name' => getProspectListQSObjects('prospect_list_type_test', 'test_name', 'wiz_step3_test_name_id'),
+                    'unsubscription_name' => getProspectListQSObjects('prospect_list_type_exempt', 'unsubscription_name', 'wiz_step3_unsubscription_name_id'),
+                    'subscription_name' => getProspectListQSObjects('prospect_list_type_default', 'subscription_name', 'wiz_step3_subscription_name_id'),
                     );
                     
 
-$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '</script>';
+$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'</script>';
 
 $ss->assign("JAVASCRIPT", $quicksearch_js);
 
 
 //set the campaign type based on wizardtype value from request object
 $campaign_type = 'newsletter';
-if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
     $campaign_type = 'newsletter';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());    
-}elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
+}elseif ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 2) || ($focus->campaign_type == 'Email')) {
     $campaign_type = 'email';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());
-}else{
+} else {
     $campaign_type = 'general';
 }
 
@@ -143,7 +143,7 @@ 
 
 //set default values
 $ss->assign("CALENDAR_LANG", "en");
-$ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
+$ss->assign("USER_DATEFORMAT", '('.$timedate->get_user_date_format().')');
 $ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
 $ss->assign("CAMP_DATE_ENTERED", $focus->date_entered);
 $ss->assign("CAMP_DATE_MODIFIED", $focus->date_modified);
@@ -170,50 +170,50 @@ 
 
 $focus->list_view_parse_additional_sections($ss);
 
-$ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
+$ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
 
-if((!isset($focus->status)) && (!isset($focus->id)))
+if ((!isset($focus->status)) && (!isset($focus->id)))
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], 'Planning'));
 else
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], $focus->status));
 
 //hide frequency options if this is not a newsletter
-if($campaign_type == 'newsletter'){
+if ($campaign_type == 'newsletter') {
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "Select");
     $ss->assign("FREQUENCY_LABEL", $mod_strings['LBL_CAMPAIGN_FREQUENCY']);
-    if((!isset($focus->frequency)) && (!isset($focus->id))){
+    if ((!isset($focus->frequency)) && (!isset($focus->id))) {
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], 'Monthly'));
-    }else{
+    } else {
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], $focus->frequency));
     }
-}else{
+} else {
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "input type='hidden'");
     $ss->assign("FREQUENCY_LABEL", '&nbsp;');
 }
 global $current_user;
 require_once('modules/Currencies/ListCurrency.php');
 $currency = new ListCurrency();
-if(isset($focus->currency_id) && !empty($focus->currency_id)){
+if (isset($focus->currency_id) && !empty($focus->currency_id)) {
     $selectCurrency = $currency->getSelectOptions($focus->currency_id);
     $ss->assign("CURRENCY", $selectCurrency);
 }
-else if($current_user->getPreference('currency') && !isset($focus->id))
+else if ($current_user->getPreference('currency') && !isset($focus->id))
 {
     $selectCurrency = $currency->getSelectOptions($current_user->getPreference('currency'));
     $ss->assign("CURRENCY", $selectCurrency);
-}else{
+} else {
 
     $selectCurrency = $currency->getSelectOptions();
     $ss->assign("CURRENCY", $selectCurrency);
 
 }
 global $current_user;
-if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){  
+if (is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])) {  
     $record = '';
-    if(!empty($_REQUEST['record'])){
-        $record =   $_REQUEST['record'];
+    if (!empty($_REQUEST['record'])) {
+        $record = $_REQUEST['record'];
     }
-    $ss->assign("ADMIN_EDIT","<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action'] ."&from_module=".$_REQUEST['module'] ."&record=".$record. "'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDIT_LAYOUT'])."</a>");
+    $ss->assign("ADMIN_EDIT", "<a href='index.php?action=index&module=DynamicLayout&from_action=".$_REQUEST['action']."&from_module=".$_REQUEST['module']."&record=".$record."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDIT_LAYOUT'])."</a>");
 
 }
 
@@ -226,55 +226,55 @@ 
 
 //fill out the campaign type dropdown based on type of campaign being created
 $ss->assign("campaign_type", $campaign_type);
-if($campaign_type == 'general'){
+if ($campaign_type == 'general') {
     //get regular campaign dom object and strip out entries for email and newsletter
     $myTypeOptionsArr = array();
     $OptionsArr = $app_list_strings['campaign_type_dom'];
-    foreach($OptionsArr as $key=>$val){
-        if($val =='Newsletter' || $val =='Email' || $val =='' ){
+    foreach ($OptionsArr as $key=>$val) {
+        if ($val == 'Newsletter' || $val == 'Email' || $val == '') {
             //do not add   
-        }else{
+        } else {
             $myTypeOptionsArr[$key] = $val;
         }
     }
     
     //now create select option html without the newsletter/email, or blank ('') options
-    $type_option_html =' ';
+    $type_option_html = ' ';
     $selected = false;
-    foreach($myTypeOptionsArr as $optionKey=>$optionName){
+    foreach ($myTypeOptionsArr as $optionKey=>$optionName) {
         //if the selected flag is set to true, then just populate
-        if($selected){
-            $type_option_html .="<option value='$optionKey' >$optionName</option>";
-        }else{//if not selected yet, check to see if this option should be selected
+        if ($selected) {
+            $type_option_html .= "<option value='$optionKey' >$optionName</option>";
+        } else {//if not selected yet, check to see if this option should be selected
             //if the campaign type is not empty, then select the retrieved type
-            if(!empty($focus->campaign_type)){
+            if (!empty($focus->campaign_type)) {
                 //check to see if key matches campaign type
-                if($optionKey == $focus->campaign_type){
+                if ($optionKey == $focus->campaign_type) {
                     //mark as selected
-                    $type_option_html .="<option value='$optionKey' selected>$optionName</option>";
+                    $type_option_html .= "<option value='$optionKey' selected>$optionName</option>";
                     //mark as selected for next time
-                    $selected=true;
-                }else{
+                    $selected = true;
+                } else {
                     //key does not match, just populate
-                    $type_option_html .="<option value='$optionKey' >$optionName</option>";
+                    $type_option_html .= "<option value='$optionKey' >$optionName</option>";
                 }
-            }else{
+            } else {
             //since the campaign type is empty, then select first one                
-                $type_option_html .="<option value='$optionKey' selected>$optionName</option>";    
+                $type_option_html .= "<option value='$optionKey' selected>$optionName</option>";    
                 //mark as selected for next time
-                $selected=true;
+                $selected = true;
             }
         }    
     }
     //assign the modified dropdown for general campaign creation
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $type_option_html);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "select");    
-}elseif($campaign_type == 'email'){
+}elseif ($campaign_type == 'email') {
     //Assign Email as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_EMAIL']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='Email'");
     $ss->assign("HIDE_CAMPAIGN_TYPE", true);
-}else{
+} else {
     //Assign NewsLetter as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_NEWSLETTER']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='NewsLetter'");
@@ -291,33 +291,33 @@ 
 $focus->load_relationship('tracked_urls');
 
 $trkr_lists = $focus->tracked_urls->get();
-$trkr_html ='';    
-$ss->assign('TRACKER_COUNT',count($trkr_lists));
-if(count($trkr_lists)>0){
+$trkr_html = '';    
+$ss->assign('TRACKER_COUNT', count($trkr_lists));
+if (count($trkr_lists) > 0) {
 global $odd_bg, $even_bg, $hilite_bg;
     
     $trkr_count = 0;
 //create the html to create tracker table
-    foreach($trkr_lists as $trkr_id){
+    foreach ($trkr_lists as $trkr_id) {
         $ct_focus = new CampaignTracker();
         $ct_focus->retrieve($trkr_id);
-      if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
-            if($ct_focus->is_optout){$opt = 'checked';}else{$opt = '';}
-            $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>" ;
-            $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'] . $trkr_count ."' id='existing_is_optout". $trkr_count ."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id". $trkr_count ."'type='hidden''/></td>";
-            $trkr_html .= "<td width='40%'> <input id='existing_tracker_name". $trkr_count ."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME']. $trkr_count ."' value='".$ct_focus->tracker_name."' ></td>";
-            $trkr_html .= "<td width='40%'><input type='text' size='60' maxlength='255' name='wiz_step3_tracker_url". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_URL']. $trkr_count ."' id='existing_tracker_url". $trkr_count ."' value='".$ct_focus->tracker_url."' ></td>";
+      if (isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)) {
+            if ($ct_focus->is_optout) {$opt = 'checked'; } else {$opt = ''; }
+            $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>";
+            $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'].$trkr_count."' id='existing_is_optout".$trkr_count."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id".$trkr_count."'type='hidden''/></td>";
+            $trkr_html .= "<td width='40%'> <input id='existing_tracker_name".$trkr_count."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name".$trkr_count."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME'].$trkr_count."' value='".$ct_focus->tracker_name."' ></td>";
+            $trkr_html .= "<td width='40%'><input type='text' size='60' maxlength='255' name='wiz_step3_tracker_url".$trkr_count."' title='".$mod_strings['LBL_EDIT_TRACKER_URL'].$trkr_count."' id='existing_tracker_url".$trkr_count."' value='".$ct_focus->tracker_url."' ></td>";
             $trkr_html .= "<td><a href='#' onclick=\"javascript:remove_existing_tracker('existing_trkr".$trkr_count."','".$ct_focus->id."'); \" >  ";
             $trkr_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0'  align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
 
 
 
       }
-      $trkr_count =$trkr_count+1;
+      $trkr_count = $trkr_count + 1;
     }
     
     $trkr_html .= "<div id='no_trackers'></div>";
-    }else{
+    } else {
         $trkr_html .= "<div id='no_trackers'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
     }
     $ss->assign('EXISTING_TRACKERS', $trkr_html);
@@ -396,7 +396,7 @@ 
 $targetList = BeanFactory::getBean('ProspectLists')->get_full_list();
 
 $targetListData = array();
-foreach($targetList as $prospectLst) {
+foreach ($targetList as $prospectLst) {
     $nxt = array(
         'id' => $prospectLst->id,
         'name' => $prospectLst->name,
@@ -425,29 +425,29 @@ 
 
 $prospect_lists = $focus->prospectlists->get();
 
-if((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] ==1) || ($focus->campaign_type=='NewsLetter')){
+if ((isset($_REQUEST['wizardtype']) && $_REQUEST['wizardtype'] == 1) || ($focus->campaign_type == 'NewsLetter')) {
  //this is a newsletter type campaign, fill in subscription values   
 
 //if prospect lists are returned, then iterate through and populate form values
-if(count($prospect_lists)>0){
+if (count($prospect_lists) > 0) {
     
-    foreach($prospect_lists as $pl_id){
+    foreach ($prospect_lists as $pl_id) {
     //retrieve prospect list
      $pl = new ProspectList();   
      $pl->retrieve($pl_id);
 
-      if(isset($pl->list_type) && !empty($pl->list_type)){
+      if (isset($pl->list_type) && !empty($pl->list_type)) {
          //assign values based on type
-         if(($pl->list_type == 'default') || ($pl->list_type == 'seed')){            
+         if (($pl->list_type == 'default') || ($pl->list_type == 'seed')) {            
             $ss->assign('SUBSCRIPTION_ID', $pl->id);
             $ss->assign('SUBSCRIPTION_NAME', $pl->name);
          };
-         if($pl->list_type == 'exempt'){
+         if ($pl->list_type == 'exempt') {
             $ss->assign('UNSUBSCRIPTION_ID', $pl->id);
             $ss->assign('UNSUBSCRIPTION_NAME', $pl->name);
          
          };
-         if($pl->list_type == 'test'){
+         if ($pl->list_type == 'test') {
             $ss->assign('TEST_ID', $pl->id);
             $ss->assign('TEST_NAME', $pl->name);
          
@@ -459,73 +459,73 @@ 
 
 
 
-}else{
+} else {
     //this is not a newlsetter campaign, so fill in target list table
     //create array for javascript, this will help to display the option text, not the value
-    $dom_txt =' ';
-    foreach($app_list_strings['prospect_list_type_dom'] as $key=>$val){
-        $dom_txt .="if(trgt_type_text =='$key'){trgt_type_text='$val';}";
+    $dom_txt = ' ';
+    foreach ($app_list_strings['prospect_list_type_dom'] as $key=>$val) {
+        $dom_txt .= "if(trgt_type_text =='$key'){trgt_type_text='$val';}";
     }
     $ss->assign("PL_DOM_STMT", $dom_txt);
     $trgt_count = 0;
     $trgt_html = ' ';
-    if(count($prospect_lists)>0){
+    if (count($prospect_lists) > 0) {
 
-        foreach($prospect_lists as $pl_id){
+        foreach ($prospect_lists as $pl_id) {
             //retrieve prospect list
             $pl = new ProspectList();
             $pl_focus = $pl->retrieve($pl_id);
-            $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>" ;
-            $trgt_html .= "<td width='100' style=\"width:25%\"> <input id='existing_target_name". $trgt_count ."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name". $trgt_count ."'  value='". $pl_focus->name."' ><a href=\"index.php?module=ProspectLists&action=DetailView&record=" . $pl_focus->id . "\" target=\"_blank\" title=\"" . $mod_strings['LBL_OPEN_IN_NEW_WINDOW'] . "\">". $pl_focus->name."</a></td>";
+            $trgt_html .= "<div id='existing_trgt".$trgt_count."'> <table class='tabDetailViewDL2' width='100%'>";
+            $trgt_html .= "<td width='100' style=\"width:25%\"> <input id='existing_target_name".$trgt_count."' type='hidden' type='text' size='60' maxlength='255' name='existing_target_name".$trgt_count."'  value='".$pl_focus->name."' ><a href=\"index.php?module=ProspectLists&action=DetailView&record=".$pl_focus->id."\" target=\"_blank\" title=\"".$mod_strings['LBL_OPEN_IN_NEW_WINDOW']."\">".$pl_focus->name."</a></td>";
             $trgt_html .= "<td width='100' style=\"width:25%\">".$pl_focus->get_entry_count()."</td>";
-            $trgt_html .= "<td width='100' style=\"width:25%\"><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type". $trgt_count ."'   id='existing_tracker_list_type". $trgt_count ."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
-            $trgt_html .= "<input type='hidden' name='added_target_id". $trgt_count ."' id='added_target_id". $trgt_count ."' value='". $pl_focus->id ."' ></td>";
+            $trgt_html .= "<td width='100' style=\"width:25%\"><input type='hidden' size='60' maxlength='255' name='existing_tracker_list_type".$trgt_count."'   id='existing_tracker_list_type".$trgt_count."' value='".$pl_focus->list_type."' >".$app_list_strings['prospect_list_type_dom'][$pl_focus->list_type];
+            $trgt_html .= "<input type='hidden' name='added_target_id".$trgt_count."' id='added_target_id".$trgt_count."' value='".$pl_focus->id."' ></td>";
             $trgt_html .= "<td width='100' style=\"width:25%\"><a href='#' onclick=\"javascript:remove_existing_target('existing_trgt".$trgt_count."','".$pl_focus->id."'); \" >  ";
             $trgt_html .= SugarThemeRegistry::current()->getImage('delete_inline', "border='0' align='absmiddle'", 12, 12, ".gif", $mod_strings['LBL_DELETE'])."</a></td></tr></table></div>";
 
-            $trgt_count =$trgt_count +1;
+            $trgt_count = $trgt_count + 1;
         }
 
         $trgt_html  .= "<div id='no_targets'></div>";
-    }else{
+    } else {
         $trgt_html  .= "<div id='no_targets'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
 
     }
-    $ss->assign('EXISTING_TARGETS', $trgt_html );
+    $ss->assign('EXISTING_TARGETS', $trgt_html);
 
 }
 
     
 /**************************** WIZARD UI DIV Stuff *******************/
 $mrkt_string = $mod_strings['LBL_NAVIGATION_MENU_MARKETING'];
-if(!empty($focus->id)){
+if (!empty($focus->id)) {
     $mrkt_url = "<a  href='index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome";
     $mrkt_url .= "&return_id=".$focus->id."&campaign_id=".$focus->id;
-    $mrkt_url .= "'>". $mrkt_string."</a>";
+    $mrkt_url .= "'>".$mrkt_string."</a>";
     $mrkt_string = $mrkt_url;
 }
     $summ_url = $mod_strings['LBL_NAVIGATION_MENU_SUMMARY'];
-    if(!empty($focus->id)){
+    if (!empty($focus->id)) {
         $summ_url = "<a  href='index.php?action=WizardHome&module=Campaigns";
         $summ_url .= "&return_id=".$focus->id."&record=".$focus->id;
-        $summ_url .= "'> ". $mod_strings['LBL_NAVIGATION_MENU_SUMMARY']."</a>";
+        $summ_url .= "'> ".$mod_strings['LBL_NAVIGATION_MENU_SUMMARY']."</a>";
     } 
    
 
 
-$script_to_call ='';
-    if (!empty($focus->id)){
+$script_to_call = '';
+    if (!empty($focus->id)) {
         $maxStep = 2;
         $script_to_call = "link_navs(1, {$maxStep});";
-        if(isset($_REQUEST['direct_step']) and !empty($_REQUEST['direct_step'])){
-            $directStep = (int) $_REQUEST['direct_step'];
-            if($directStep < 1) {
+        if (isset($_REQUEST['direct_step']) and !empty($_REQUEST['direct_step'])) {
+            $directStep = (int)$_REQUEST['direct_step'];
+            if ($directStep < 1) {
                 $directStep = 1;
             }
-            if($directStep > $maxStep) {
+            if ($directStep > $maxStep) {
                 $directStep = $maxStep;
             }
-            $script_to_call .='   direct(' . $directStep . ');';
+            $script_to_call .= '   direct('.$directStep.');';
         }
     } 
     $ss->assign("HILITE_ALL", $script_to_call);
@@ -565,56 +565,56 @@ 
 
 //Create the html to fill in the wizard steps
 
-if($campaign_type == 'general'){
+if ($campaign_type == 'general') {
     $steps = create_campaign_steps();
 
-    foreach($steps as $key => $step) {
+    foreach ($steps as $key => $step) {
         $_steps[$key] = false;
     }
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'campaign',$mrkt_string,$summ_url, 'dotlist'));
-    $ss->assign('HIDE_CONTINUE','hidden');
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($_steps, 'campaign', $mrkt_string, $summ_url, 'dotlist'));
+    $ss->assign('HIDE_CONTINUE', 'hidden');
 
-}elseif($campaign_type == 'email'){
+}elseif ($campaign_type == 'email') {
     $steps = create_email_steps();
-    if($focus->id) {
-        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=" . $focus->id . "&record=" . $focus->id;
+    if ($focus->id) {
+        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=".$focus->id."&record=".$focus->id;
     }
     else {
         $summ_url = false;
     }
-    foreach($steps as $key => $step) {
+    foreach ($steps as $key => $step) {
         $_steps[$key] = false;
     }
     $campaign_id = $focus->id;
     $marketing_id = isset($_REQUEST['marketing_id']) && $_REQUEST['marketing_id'] ? $_REQUEST['marketing_id'] : null;
     $template_id = isset($_REQUEST['template_id']) && $_REQUEST['template_id'] ? $_REQUEST['template_id'] : null;
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'email',$mrkt_string,$summ_url, 'dotlist', $campaign_id, $marketing_id, $template_id));
-    $ss->assign('HIDE_CONTINUE','submit');
-}else{
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($_steps, 'email', $mrkt_string, $summ_url, 'dotlist', $campaign_id, $marketing_id, $template_id));
+    $ss->assign('HIDE_CONTINUE', 'submit');
+} else {
     $steps = create_newsletter_steps();
 
-    if($focus->id) {
-        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=" . $focus->id . "&record=" . $focus->id;
+    if ($focus->id) {
+        $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=".$focus->id."&record=".$focus->id;
     }
     else {
         $summ_url = false;
     }
-    foreach($steps as $key => $step) {
+    foreach ($steps as $key => $step) {
         $_steps[$key] = false;
     }
-    $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'newsletter',$mrkt_string,$summ_url, 'dotlist'));
-    $ss->assign('HIDE_CONTINUE','submit');
+    $ss->assign('NAV_ITEMS', create_wiz_menu_items($_steps, 'newsletter', $mrkt_string, $summ_url, 'dotlist'));
+    $ss->assign('HIDE_CONTINUE', 'submit');
 }
 
 $ss->assign('TOTAL_STEPS', count($steps));
-$sshtml = create_wiz_step_divs($steps,$ss);
-$ss->assign('STEPS',$sshtml);
+$sshtml = create_wiz_step_divs($steps, $ss);
+$ss->assign('STEPS', $sshtml);
      	   	
 
 /**************************** FINAL END OF PAGE UI Stuff *******************/
 
-if(isset($_REQUEST['wizardtype'])) {
-    switch($_REQUEST['wizardtype']) {
+if (isset($_REQUEST['wizardtype'])) {
+    switch ($_REQUEST['wizardtype']) {
         case '1':
             $ss->assign('campaign_type', 'NewsLetter');
             break;
@@ -629,12 +629,12 @@ 
 
 $ss->display(file_exists('custom/modules/Campaigns/tpls/WizardNewsletter.tpl') ? 'custom/modules/Campaigns/tpls/WizardNewsletter.tpl' : 'modules/Campaigns/tpls/WizardNewsletter.tpl');
 
-if(!$focus->id) {
+if (!$focus->id) {
     unset($_SESSION['campaignWizard'][$campaign_id]['defaultSelectedMarketingId']);
 }
 
 
-function create_newsletter_steps(){
+function create_newsletter_steps() {
     global $mod_strings;
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     //$steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
@@ -643,54 +643,54 @@ 
     return  $steps;
 }
 
-function create_campaign_steps(){
+function create_campaign_steps() {
     global $mod_strings;
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
-    $steps[$mod_strings['LBL_TARGET_LISTS']]                   = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
+    $steps[$mod_strings['LBL_TARGET_LISTS']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
     return  $steps;
 }
 
-function create_email_steps(){
+function create_email_steps() {
     global $mod_strings;
-    $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
+    $steps[$mod_strings['LBL_NAVIGATION_MENU_GEN1']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignHeader.tpl' : 'modules/Campaigns/tpls/WizardCampaignHeader.tpl';
     //$steps[$mod_strings['LBL_NAVIGATION_MENU_GEN2']]          = file_exists('custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignBudget.tpl' : 'modules/Campaigns/tpls/WizardCampaignBudget.tpl';
     //$steps[$mod_strings['LBL_NAVIGATION_MENU_TRACKERS']]      = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTracker.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTracker.tpl' : 'modules/Campaigns/tpls/WizardCampaignTracker.tpl';
-    $steps[$mod_strings['LBL_TARGET_LISTS']]                   = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
+    $steps[$mod_strings['LBL_TARGET_LISTS']] = file_exists('custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl') ? 'custom/modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' : 'modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl';
     return  $steps;
 }
 
 
-function create_wiz_step_divs($steps,$ss){
+function create_wiz_step_divs($steps, $ss) {
     $step_html = '';
-    if(isset($steps)  && !empty($steps)){
-        $i=1;
-        foreach($steps as $name=>$step){
-            $step_html .="<p><div id='step$i'>";
+    if (isset($steps) && !empty($steps)) {
+        $i = 1;
+        foreach ($steps as $name=>$step) {
+            $step_html .= "<p><div id='step$i'>";
             $step_html .= $ss->fetch($step);
-            $step_html .="</div></p>";
-            $i = $i+1;
+            $step_html .= "</div></p>";
+            $i = $i + 1;
         }    
     }
     return $step_html;
 }
 
-function create_wiz_menu_items($steps,$type,$mrkt_string,$summ_url, $view = null, $campaign_id = null, $marketing_id = null, $template_id = null){
+function create_wiz_menu_items($steps, $type, $mrkt_string, $summ_url, $view = null, $campaign_id = null, $marketing_id = null, $template_id = null) {
 
     global $mod_strings;
 
 
-    if($view == 'dotlist') {
+    if ($view == 'dotlist') {
 
         include_once 'modules/Campaigns/DotListWizardMenu.php';
 
-        if($type!='campaign') {
+        if ($type != 'campaign') {
             $templateURLForProgressBar = false;
             if ($campaign_id && $marketing_id && $template_id) {
                 $templateURLForProgressBar = "index.php?action=WizardMarketing&module=Campaigns&return_module=Campaigns&return_action=WizardHome&return_id={$campaign_id}&campaign_id={$campaign_id}&jump=2&marketing_id={$marketing_id}&record={$marketing_id}&campaign_type=Email&template_id={$template_id}";
             }
 
-            if(preg_match('/\bhref=\'([^\']*)/', $mrkt_string, $matches)) {
+            if (preg_match('/\bhref=\'([^\']*)/', $mrkt_string, $matches)) {
                 $templateURLForProgressBar = $matches[1];
             }
 
@@ -700,8 +700,8 @@ 
         if ($type == 'newsletter' || $type == 'email') {
 
             preg_match('/\bhref=\'([^\']*)/', $mrkt_string, $matches);
-            if(isset($matches[1])) {
-                $marketingLink = $matches[1] . ($matches[1] ? '&jump=2' : false);
+            if (isset($matches[1])) {
+                $marketingLink = $matches[1].($matches[1] ? '&jump=2' : false);
             }
             else {
                 $marketingLink = false;
@@ -719,19 +719,19 @@ 
     }
     else {
         $nav_html = '<table border="0" cellspacing="0" cellpadding="0" width="100%" >';
-        if(isset($steps)  && !empty($steps)){
-            $i=1;
-            foreach($steps as $name=>$step){
+        if (isset($steps) && !empty($steps)) {
+            $i = 1;
+            foreach ($steps as $name=>$step) {
                 $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step$i'>$name</div></td></tr>";
-                $i=$i+1;
+                $i = $i + 1;
             }
         }
-        if($type == 'newsletter'  ||  $type == 'email'){
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">$mrkt_string</div></td></tr>";
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+3).">".$summ_url."</div></td></tr>";
-        }else{
-            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";
+        if ($type == 'newsletter' || $type == 'email') {
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 1).">$mrkt_string</div></td></tr>";
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 3).">".$summ_url."</div></td></tr>";
+        } else {
+            $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i + 1).">".$summ_url."</div></td></tr>";
         }
 
         $nav_html .= '</table>';

modules/AOR_Reports/AOR_Report.php

Spacing +274 added lines, -274 removed lines

@@ -44,7 +44,7 @@ 
 	var $object_name = 'AOR_Report';
 	var $table_name = 'aor_reports';
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 
 	var $id;
 	var $name;
@@ -63,7 +63,7 @@ 
 	var $assigned_user_link;
 	var $report_module;
 
-	function __construct(){
+	function __construct() {
 		parent::__construct();
         $this->load_report_beans();
         require_once('modules/AOW_WorkFlow/aow_utils.php');
@@ -73,9 +73,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AOR_Report(){
+    function AOR_Report() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -85,19 +85,19 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;
 	}
 
-    function save($check_notify = FALSE){
+    function save($check_notify = FALSE) {
 
         // TODO: process of saveing the fields and conditions is too long so we will have to make some optimization on save_lines functions
         set_time_limit(3600);
 
-        if (empty($this->id)){
+        if (empty($this->id)) {
             unset($_POST['aor_conditions_id']);
             unset($_POST['aor_fields_id']);
         }
@@ -117,13 +117,13 @@ 
         $chart->save_lines($_POST, $this, 'aor_chart_');
     }
 
-    function load_report_beans(){
+    function load_report_beans() {
         global $beanList, $app_list_strings;
 
         $app_list_strings['aor_moduleList'] = $app_list_strings['moduleList'];
 
-        foreach($app_list_strings['aor_moduleList'] as $mkey => $mvalue){
-            if(!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')){
+        foreach ($app_list_strings['aor_moduleList'] as $mkey => $mvalue) {
+            if (!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')) {
                 unset($app_list_strings['aor_moduleList'][$mkey]);
             }
         }
@@ -134,12 +134,12 @@ 
     }
 
 
-    function getReportFields(){
+    function getReportFields() {
         $fields = array();
-        foreach($this->get_linked_beans('aor_fields','AOR_Fields') as $field){
+        foreach ($this->get_linked_beans('aor_fields', 'AOR_Fields') as $field) {
             $fields[] = $field;
         }
-        usort($fields,function($a,$b){
+        usort($fields, function($a, $b) {
             return $a->field_order - $b->field_order;
         });
         return $fields;
@@ -150,10 +150,10 @@ 
     const CHART_TYPE_RGRAPH = 'rgraph';
 
 
-    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART){
+    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART) {
         global $beanList;
-        $linkedCharts = $this->get_linked_beans('aor_charts','AOR_Charts');
-	if(!$linkedCharts){
+        $linkedCharts = $this->get_linked_beans('aor_charts', 'AOR_Charts');
+	if (!$linkedCharts) {
             //No charts to display
             return '';
         }
@@ -177,16 +177,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -201,10 +201,10 @@ 
 
             // get the main group
 
-            if($field->group_display) {
+            if ($field->group_display) {
 
                 // if we have a main group already thats wrong cause only one main grouping field possible
-                if(!is_null($mainGroupField)) {
+                if (!is_null($mainGroupField)) {
                     $GLOBALS['log']->fatal('main group already found');
                 }
 
@@ -219,18 +219,18 @@ 
         $query = $this->build_report_query();
         $result = $this->db->query($query);
         $data = array();
-        while($row = $this->db->fetchByAssoc($result, false))
+        while ($row = $this->db->fetchByAssoc($result, false))
         {
-            foreach($fields as $name => $att){
+            foreach ($fields as $name => $att) {
 
                 $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                switch ($att['function']){
+                switch ($att['function']) {
                     case 'COUNT':
                         break;
                     default:
-                        if(!is_numeric($row[$name])) {
-                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id,$att['params'])));
+                        if (!is_numeric($row[$name])) {
+                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params'])));
 
                         }
                         break;
@@ -240,7 +240,7 @@ 
         }
         $fields = $this->getReportFields();
 
-        switch($chartType) {
+        switch ($chartType) {
             case self::CHART_TYPE_PCHART:
                 $html = '<script src="modules/AOR_Charts/lib/pChart/imagemap.js"></script>';
                 break;
@@ -248,17 +248,17 @@ 
                 $html = '<script src="modules/AOR_Reports/js/Chart.js"></script>';
                 break;
             case self::CHART_TYPE_RGRAPH:
-                if($_REQUEST['module']!= 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
+                if ($_REQUEST['module'] != 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
                     require_once('include/SuiteGraphs/RGraphIncludes.php');
 
                 break;
         }
         $x = 0;
-        foreach($linkedCharts as $chart){
-            if($chartIds !== null && !in_array($chart->id,$chartIds)){
+        foreach ($linkedCharts as $chart) {
+            if ($chartIds !== null && !in_array($chart->id, $chartIds)) {
                 continue;
             }
-            $html .= $chart->buildChartHTML($data,$fields,$x, $chartType, $mainGroupField);
+            $html .= $chart->buildChartHTML($data, $fields, $x, $chartType, $mainGroupField);
             $x++;
         }
         return $html;
@@ -270,12 +270,12 @@ 
 
         $rows = $this->getGroupDisplayFieldByReportId($this->id, $level);
 
-        if(count($rows) > 1) {
-            $GLOBALS['log']->fatal('ambiguous group display for report ' . $this->id);
+        if (count($rows) > 1) {
+            $GLOBALS['log']->fatal('ambiguous group display for report '.$this->id);
         }
-        else if(count($rows) == 1){
+        else if (count($rows) == 1) {
             $rows[0]['module_path'] = unserialize(base64_decode($rows[0]['module_path']));
-            if(!$rows[0]['module_path'][0]) {
+            if (!$rows[0]['module_path'][0]) {
                 $module = new $beanList[$this->report_module]();
                 $rows[0]['field_id_name'] = $module->field_defs[$rows[0]['field']]['id_name'] ? $module->field_defs[$rows[0]['field']]['id_name'] : $module->field_defs[$rows[0]['field']]['name'];
                 $rows[0]['module_path'][0] = $module->table_name;
@@ -285,23 +285,23 @@ 
             }
             $path[] = $rows[0];
 
-            if($level>10) {
+            if ($level > 10) {
                 $msg = 'Too many nested groups';
                 $GLOBALS['log']->fatal($msg);
                 return null;
             }
 
-            return $this->buildMultiGroupReport($offset, $links, $level+1, $path);
+            return $this->buildMultiGroupReport($offset, $links, $level + 1, $path);
         }
-        else if(!$rows) {
-            if($path) {
+        else if (!$rows) {
+            if ($path) {
                 $html = '';
                 foreach ($path as $pth) {
                     $_fieldIdName = $this->db->quoteIdentifier($pth['field_id_name']);
-                    $query = "SELECT $_fieldIdName FROM " . $this->db->quoteIdentifier($pth['module_path'][0]) . " GROUP BY $_fieldIdName;";
+                    $query = "SELECT $_fieldIdName FROM ".$this->db->quoteIdentifier($pth['module_path'][0])." GROUP BY $_fieldIdName;";
                     $values = $this->dbSelect($query);
 
-                    foreach($values as $value) {
+                    foreach ($values as $value) {
 
                         //$where = [ $this->db->quote($pth['module_path'][0]) . '.' . $_fieldIdName . ' = \'' . $this->db->quote($value[$pth['field_id_name']]) . '\'' ];
 
@@ -337,7 +337,7 @@ 
         // escape values for query
 
         $_id = $this->db->quote($reportId);
-        $_level = (int) $level;
+        $_level = (int)$level;
 
         // get results array
 
@@ -352,7 +352,7 @@ 
         $results = $this->db->query($query);
 
         $rows = array();
-        while($row = $this->db->fetchByAssoc($results)) {
+        while ($row = $this->db->fetchByAssoc($results)) {
             $rows[] = $row;
         }
 
@@ -361,20 +361,20 @@ 
 
     private function getMultiGroupFrameHTML($header, $body) {
         $html = '<div class="multi-group-list" style="border: 1px solid black; padding: 10px;">
-                    <h3>' . $header . '</h3>
-                    <div class="multi-group-list-inner">' . $body . '</div>
+                    <h3>' . $header.'</h3>
+                    <div class="multi-group-list-inner">' . $body.'</div>
                 </div>';
         return $html;
     }
 
     private function addDataIdValueToInnertext($html) {
         preg_match('/\sdata-id-value\s*=\s*"([^"]*)"/', $html, $match);
-        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2' . $match[1] . '$3', $html);
+        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2'.$match[1].'$3', $html);
         return $html;
     }
 
 
-    function build_group_report($offset = -1, $links = true, $extra = array()){
+    function build_group_report($offset = -1, $links = true, $extra = array()) {
         global $beanList;
 
         $html = '';
@@ -385,23 +385,23 @@ 
         $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
         $field_id = $this->db->getOne($sql);
 
-        if(!$field_id) {
-            $query_array['select'][] = $module->table_name . ".id AS '" . $module->table_name . "_id'";
+        if (!$field_id) {
+            $query_array['select'][] = $module->table_name.".id AS '".$module->table_name."_id'";
         }
 
-        if($field_id != ''){
+        if ($field_id != '') {
             $field = new AOR_Field();
             $field->retrieve($field_id);
 
-            $field_label = str_replace(' ','_',$field->label);
+            $field_label = str_replace(' ', '_', $field->label);
 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $module;
             $table_alias = $field_module->table_name;
-            if(!empty($path[0]) && $path[0] != $module->module_dir){
-                foreach($path as $rel){
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+            if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                foreach ($path as $rel) {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                     $oldAlias = $table_alias;
                     $table_alias = $table_alias.":".$rel;
 
@@ -415,71 +415,71 @@ 
 
             $data = $field_module->field_defs[$field->field];
 
-            if($data['type'] == 'relate' && isset($data['id_name'])) {
+            if ($data['type'] == 'relate' && isset($data['id_name'])) {
                 $field->field = $data['id_name'];
             }
 
-            if($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
-                if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+            if ($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
+                if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                     $query['select'][$table_alias.'_currency_id'] = $table_alias.'_cstm'.".currency_id AS '".$table_alias."_currency_id'";
                 } else {
-                    $query_array['select'][$table_alias . '_currency_id'] = $table_alias . ".currency_id AS '" . $table_alias . "_currency_id'";
+                    $query_array['select'][$table_alias.'_currency_id'] = $table_alias.".currency_id AS '".$table_alias."_currency_id'";
                 }
             }
 
-            if(  (isset($data['source']) && $data['source'] == 'custom_fields')) {
+            if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                 $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
                 // Fix for #1251 - added a missing parameter to the function call
                 $query_array = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $table_alias, $field_module, 'custom', $query);
             } else {
-                $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
             }
 
-            if($field->sort_by != ''){
+            if ($field->sort_by != '') {
                 $query_array['sort_by'][] = $field_label.' '.$field->sort_by;
             }
 
-            if($field->group_by == 1){
+            if ($field->group_by == 1) {
                 $query_array['group_by'][] = $select_field;
             }
 
-            if($field->field_function != null){
+            if ($field->field_function != null) {
                 $select_field = $field->field_function.'('.$select_field.')';
             }
 
-            $query_array['select'][] = $select_field ." AS '".$field_label."'";
-            if(isset($extra['select']) && $extra['select']) {
-                foreach($extra['select'] as $selectField => $selectAlias) {
-                    if($selectAlias) {
-                        $query_array['select'][] = $selectField . " AS " . $selectAlias;
+            $query_array['select'][] = $select_field." AS '".$field_label."'";
+            if (isset($extra['select']) && $extra['select']) {
+                foreach ($extra['select'] as $selectField => $selectAlias) {
+                    if ($selectAlias) {
+                        $query_array['select'][] = $selectField." AS ".$selectAlias;
                     }
                     else {
                         $query_array['select'][] = $selectField;
                     }
                 }
             }
-            $query_array['where'][] = $select_field ." IS NOT NULL AND ";
-            if(isset($extra['where']) && $extra['where']) {
-                $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+            $query_array['where'][] = $select_field." IS NOT NULL AND ";
+            if (isset($extra['where']) && $extra['where']) {
+                $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
             }
 
             $query_array = $this->build_report_query_where($query_array);
 
-            foreach ($query_array['select'] as $select){
-                $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+            foreach ($query_array['select'] as $select) {
+                $query .= ($query == '' ? 'SELECT ' : ', ').$select;
             }
 
             $query .= ' FROM '.$module->table_name.' ';
 
-            if(isset($query_array['join'])){
-                foreach ($query_array['join'] as $join){
+            if (isset($query_array['join'])) {
+                foreach ($query_array['join'] as $join) {
                     $query .= $join;
                 }
             }
-            if(isset($query_array['where'])){
+            if (isset($query_array['where'])) {
                 $query_where = '';
-                foreach ($query_array['where'] as $where){
-                    $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+                foreach ($query_array['where'] as $where) {
+                    $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
                 }
 
                 $query_where = $this->queryWhereRepair($query_where);
@@ -487,38 +487,38 @@ 
                 $query .= ' '.$query_where;
             }
 
-            if(isset($query_array['group_by'])){
+            if (isset($query_array['group_by'])) {
                 $query_group_by = '';
-                foreach ($query_array['group_by'] as $group_by){
-                    $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+                foreach ($query_array['group_by'] as $group_by) {
+                    $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
                 }
                 $query .= ' '.$query_group_by;
             }
 
-            if(isset($query_array['sort_by'])){
+            if (isset($query_array['sort_by'])) {
                 $query_sort_by = '';
-                foreach ($query_array['sort_by'] as $sort_by){
-                    $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+                foreach ($query_array['sort_by'] as $sort_by) {
+                    $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
                 }
                 $query .= ' '.$query_sort_by;
             }
             $result = $this->db->query($query);
 
             while ($row = $this->db->fetchByAssoc($result)) {
-                if($html != '') $html .= '<br />';
+                if ($html != '') $html .= '<br />';
 
                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }
 
-        if($html == '') $html = $this->build_report_html($offset, $links);
+        if ($html == '') $html = $this->build_report_html($offset, $links);
         return $html;
 
     }
 
 
-    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()){
+    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()) {
 
         global $beanList, $sugar_config;
 
@@ -527,7 +527,7 @@ 
         $report_sql = $this->build_report_query($_group_value, $extra);
 
         // Fix for issue 1232 - items listed in a single report, should adhere to the same standard as ListView items.
-        if($sugar_config['list_max_entries_per_page']!='') {
+        if ($sugar_config['list_max_entries_per_page'] != '') {
             $max_rows = $sugar_config['list_max_entries_per_page'];
         } else {
             $max_rows = 20;
@@ -540,27 +540,27 @@ 
         // We have a count query.  Run it and get the results.
         $result = $this->db->query($count_query);
         $assoc = $this->db->fetchByAssoc($result);
-        if(!empty($assoc['c']))
+        if (!empty($assoc['c']))
         {
             $total_rows = $assoc['c'];
         }
 
         $html = "<table class='list' id='report_table".$group_value."' width='100%' cellspacing='0' cellpadding='0' border='0' repeat_header='1'>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $start = 0;
             $end = 0;
             $previous_offset = 0;
             $next_offset = 0;
             $last_offset = 0;
 
-            if($total_rows > 0){
-                $start = $offset +1;
+            if ($total_rows > 0) {
+                $start = $offset + 1;
                 $end = (($offset + $max_rows) < $total_rows) ? $offset + $max_rows : $total_rows;
                 $previous_offset = ($offset - $max_rows) < 0 ? 0 : $offset - $max_rows;
                 $next_offset = $offset + $max_rows;
-                if(is_int($total_rows / $max_rows)){
-                    $last_offset = $max_rows * ($total_rows / $max_rows -1);
+                if (is_int($total_rows / $max_rows)) {
+                    $last_offset = $max_rows * ($total_rows / $max_rows - 1);
                 } else {
                     $last_offset = $max_rows * floor($total_rows / $max_rows);
                 }
@@ -572,36 +572,36 @@ 
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
-            $html .="<td colspan='18'>
+            $html .= "<td colspan='18'>
                        <table class='paginationTable' border='0' cellpadding='0' cellspacing='0' width='100%'>
                         <td style='text-align:left' ><H3><a href=\"javascript:void(0)\" class=\"collapseLink\" onclick=\"groupedReportToggler.toggleList(this);\"><img border=\"0\" id=\"detailpanel_1_img_hide\" src=\"themes/SuiteR/images/basic_search.gif\"></a>$moduleFieldByGroupValue</H3></td>
                         <td class='paginationChangeButtons' align='right' nowrap='nowrap' width='1%'>";
 
-            if($offset == 0){
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
+            if ($offset == 0) {
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start_off.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous_off.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             } else {
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' onclick='changeReportPage(\"".$this->id."\",".$previous_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             }
-            $html .=" <span class='pageNumbers'>(".$start ." - ".$end ." of ". $total_rows .")</span>";
-            if($next_offset < $total_rows){
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
+            $html .= " <span class='pageNumbers'>(".$start." - ".$end." of ".$total_rows.")</span>";
+            if ($next_offset < $total_rows) {
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button' onclick='changeReportPage(\"".$this->id."\",".$last_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('end.gif')."' alt='End' align='absmiddle' border='0'>
                     </button>";
             } else {
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next_off.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button'  disabled='disabled'>
@@ -610,12 +610,12 @@ 
 
             }
 
-            $html .="</td>
+            $html .= "</td>
                        </table>
                       </td>";
 
-            $html .="</tr></thead>";
-        } else{
+            $html .= "</tr></thead>";
+        } else {
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
@@ -641,16 +641,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -663,7 +663,7 @@ 
             $fields[$label]['params'] = array("date_format" => $field->format);
 
 
-            if($fields[$label]['display']){
+            if ($fields[$label]['display']) {
                 $html .= "<th scope='col'>";
                 $html .= "<div style='white-space: normal;' width='100%' align='left'>";
                 $html .= $field->label;
@@ -676,7 +676,7 @@ 
         $html .= "</thead>";
         $html .= "<tbody>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $result = $this->db->limitQuery($report_sql, $offset, $max_rows);
         } else {
             $result = $this->db->query($report_sql);
@@ -689,39 +689,39 @@ 
         while ($row = $this->db->fetchByAssoc($result)) {
             $html .= "<tr class='".$row_class."' height='20'>";
 
-            foreach($fields as $name => $att){
-                if($att['display']){
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
                     $html .= "<td class='' valign='top' align='left'>";
-                    if($att['link'] && $links){
-                        $html .= "<a href='" . $sugar_config['site_url'] . "/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
+                    if ($att['link'] && $links) {
+                        $html .= "<a href='".$sugar_config['site_url']."/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
                     }
 
                     $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                    switch ($att['function']){
+                    switch ($att['function']) {
                         case 'COUNT':
                         //case 'SUM':
                             $html .= $row[$name];
                             break;
                         default:
 
-                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name],'',$currency_id, $att['params']);
+                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params']);
                             break;
                     }
-                    if($att['total']){
+                    if ($att['total']) {
                         $totals[$name][] = $row[$name];
                     }
-                    if($att['link'] && $links) $html .= "</a>";
+                    if ($att['link'] && $links) $html .= "</a>";
                     $html .= "</td>";
                 }
             }
             $html .= "</tr>";
 
-            $row_class = $row_class == 'oddListRowS1' ?  'evenListRowS1':'oddListRowS1';
+            $row_class = $row_class == 'oddListRowS1' ? 'evenListRowS1' : 'oddListRowS1';
         }
         $html .= "</tbody>";
 
-        $html .= $this->getTotalHtml($fields,$totals);
+        $html .= $this->getTotalHtml($fields, $totals);
 
         $html .= "</table>";
 
@@ -764,13 +764,13 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
 
@@ -783,7 +783,7 @@ 
         return $moduleFieldByGroupValue;
     }
 
-    function getTotalHTML($fields,$totals){
+    function getTotalHTML($fields, $totals) {
         global $app_list_strings;
 
         $currency = new Currency();
@@ -792,36 +792,36 @@ 
         $html = '';
         $html .= "<tbody>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total']){
-                $totalLabel = $field['label'] ." ".$app_list_strings['aor_total_options'][$field['total']];
+            if ($field['total']) {
+                $totalLabel = $field['label']." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
-            }else{
+            } else {
                 $html .= "<th></th>";
             }
         }
         $html .= "</tr>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total'] && isset($totals[$label])){
+            if ($field['total'] && isset($totals[$label])) {
                 $type = $field['total'];
                 $total = $this->calculateTotal($type, $totals[$label]);
                 // Customise display based on the field type
                 $moduleBean = BeanFactory::newBean($field['module']);
                 $fieldDefinition = $moduleBean->field_defs[$field['field']];
                 $fieldDefinitionType = $fieldDefinition['type'];
-                switch($fieldDefinitionType) {
+                switch ($fieldDefinitionType) {
                     case "currency":
                         // Customise based on type of function
-                        switch($type){
+                        switch ($type) {
                             case 'SUM':
-                                if($currency->id == -99) {
+                                if ($currency->id == -99) {
                                     $total = $currency->symbol.format_number($total, null, null);
                                 } else {
                                     $total = $currency->symbol.format_number($total, null, null, array('convert' => true));
@@ -829,7 +829,7 @@ 
                             case 'COUNT':
                                 break;
                             case 'AVG':
-                                if($currency->id == -99) {
+                                if ($currency->id == -99) {
                                     $total = $currency->symbol.format_number($total, null, null);
                                 } else {
                                     $total = $currency->symbol.format_number($total, null, null, array('convert' => true));
@@ -842,7 +842,7 @@ 
                         break;
                 }
                 $html .= "<td>".$total."</td>";
-            }else{
+            } else {
                 $html .= "<td></td>";
             }
         }
@@ -851,24 +851,24 @@ 
         return $html;
     }
 
-    function calculateTotal($type, $totals){
-        switch($type){
+    function calculateTotal($type, $totals) {
+        switch ($type) {
             case 'SUM':
                 return array_sum($totals);
             case 'COUNT':
                 return count($totals);
             case 'AVG':
-                return array_sum($totals)/count($totals);
+                return array_sum($totals) / count($totals);
             default:
                 return '';
         }
     }
 
-    private function encloseForCSV($field){
+    private function encloseForCSV($field) {
         return '"'.$field.'"';
     }
 
-    function build_report_csv(){
+    function build_report_csv() {
 
         ini_set('zlib.output_compression', 'Off');
 
@@ -892,20 +892,20 @@ 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $this->report_module;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    $field_module = getRelatedModule($field_module,$rel);
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    $field_module = getRelatedModule($field_module, $rel);
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['display'] = $field->display;
             $fields[$label]['function'] = $field->field_function;
             $fields[$label]['module'] = $field_module;
 
 
-            if($field->display){
-                $csv.= $this->encloseForCSV($field->label);
+            if ($field->display) {
+                $csv .= $this->encloseForCSV($field->label);
                 $csv .= $delimiter;
             }
             ++$i;
@@ -916,30 +916,30 @@ 
 
         while ($row = $this->db->fetchByAssoc($result)) {
             $csv .= "\r\n";
-            foreach($fields as $name => $att){
-                if($att['display']){
-                    if($att['function'] != '' )
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
+                    if ($att['function'] != '')
                         $csv .= $this->encloseForCSV($row[$name]);
                     else
-                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name]))));
                     $csv .= $delimiter;
                 }
             }
         }
 
-        $csv= $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
+        $csv = $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
 
         ob_clean();
         header("Pragma: cache");
         header("Content-type: text/comma-separated-values; charset=".$GLOBALS['locale']->getExportCharset());
         header("Content-Disposition: attachment; filename=\"{$this->name}.csv\"");
         header("Content-transfer-encoding: binary");
-        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-        header("Last-Modified: " . TimeDate::httpTime() );
-        header("Cache-Control: post-check=0, pre-check=0", false );
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        header("Last-Modified: ".TimeDate::httpTime());
+        header("Cache-Control: post-check=0, pre-check=0", false);
         header("Content-Length: ".mb_strlen($csv, '8bit'));
         if (!empty($sugar_config['export_excel_compatible'])) {
-            $csv==chr(255) . chr(254) . mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
+            $csv == chr(255).chr(254).mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
         }
         print $csv;
 
@@ -948,7 +948,7 @@ 
 
 
 
-    function build_report_query($group_value ='', $extra = array()){
+    function build_report_query($group_value = '', $extra = array()) {
         global $beanList;
 
         $module = new $beanList[$this->report_module]();
@@ -957,26 +957,26 @@ 
         $query_array = array();
 
         $query_array = $this->build_report_query_select($query_array, $group_value);
-        if(isset($extra['where']) && $extra['where']) {
-            $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+        if (isset($extra['where']) && $extra['where']) {
+            $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
         }
         $query_array = $this->build_report_query_where($query_array);
 
-        foreach ($query_array['select'] as $select){
-            $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+        foreach ($query_array['select'] as $select) {
+            $query .= ($query == '' ? 'SELECT ' : ', ').$select;
         }
 
         $query .= ' FROM '.$this->db->quoteIdentifier($module->table_name).' ';
 
-        if(isset($query_array['join'])){
-            foreach ($query_array['join'] as $join){
+        if (isset($query_array['join'])) {
+            foreach ($query_array['join'] as $join) {
                 $query .= $join;
             }
         }
-        if(isset($query_array['where'])){
+        if (isset($query_array['where'])) {
             $query_where = '';
-            foreach ($query_array['where'] as $where){
-                $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+            foreach ($query_array['where'] as $where) {
+                $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
             }
 
             $query_where = $this->queryWhereRepair($query_where);
@@ -984,23 +984,23 @@ 
             $query .= ' '.$query_where;
         }
 
-        if(isset($query_array['group_by'])){
+        if (isset($query_array['group_by'])) {
             $query_group_by = '';
-            foreach ($query_array['group_by'] as $group_by){
-                $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+            foreach ($query_array['group_by'] as $group_by) {
+                $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
             }
-            if($query_group_by != '') {
+            if ($query_group_by != '') {
                 foreach ($query_array['second_group_by'] as $group_by) {
-                    $query_group_by .= ', ' . $group_by;
+                    $query_group_by .= ', '.$group_by;
                 }
             }
             $query .= ' '.$query_group_by;
         }
 
-        if(isset($query_array['sort_by'])){
+        if (isset($query_array['sort_by'])) {
             $query_sort_by = '';
-            foreach ($query_array['sort_by'] as $sort_by){
-                $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+            foreach ($query_array['sort_by'] as $sort_by) {
+                $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
             }
             $query .= ' '.$query_sort_by;
         }
@@ -1014,11 +1014,11 @@ 
 
         $safe = 0;
         $query_where_clean = '';
-        while($query_where_clean != $query_where) {
+        while ($query_where_clean != $query_where) {
             $query_where_clean = $query_where;
             $query_where = preg_replace('/\b(AND|OR)\s*\(\s*\)|[^\w+\s*]\(\s*\)/i', '', $query_where_clean);
             $safe++;
-            if($safe>100){
+            if ($safe > 100) {
                 $GLOBALS['log']->fatal('Invalid report query conditions');
                 break;
             }
@@ -1027,10 +1027,10 @@ 
         return $query_where;
     }
 
-    function build_report_query_select($query = array(), $group_value =''){
+    function build_report_query_select($query = array(), $group_value = '') {
         global $beanList;
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY field_order ASC";
@@ -1042,16 +1042,16 @@ 
                 $field = new AOR_Field();
                 $field->retrieve($row['id']);
 
-                $field->label = str_replace(' ','_',$field->label).$i;
+                $field->label = str_replace(' ', '_', $field->label).$i;
 
                 $path = unserialize(base64_decode($field->module_path));
 
                 $field_module = $module;
                 $table_alias = $field_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
@@ -1062,26 +1062,26 @@ 
 
                 $data = $field_module->field_defs[$field->field];
 
-                if($data['type'] == 'relate' && isset($data['id_name'])) {
+                if ($data['type'] == 'relate' && isset($data['id_name'])) {
                     $field->field = $data['id_name'];
                     $data_new = $field_module->field_defs[$field->field];
-                    if(isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])){
+                    if (isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])) {
                         $data_new['type'] = 'link';
                         $data_new['relationship'] = $data['link'];
                     }
                     $data = $data_new;
                 }
 
-                if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$data['relationship'])];
+                if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $data['relationship'])];
                     $table_alias = $data['relationship'];
-                    $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
+                    $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
                     $field_module = $new_field_module;
                     $field->field = 'id';
                 }
 
-                if($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
-                    if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+                if ($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
+                    if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                         $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias.'_cstm').".currency_id AS '".$table_alias."_currency_id'";
                         $query['second_group_by'][] = $this->db->quoteIdentifier($table_alias.'_cstm').".currency_id";
                     } else {
@@ -1090,30 +1090,30 @@ 
                     }
                 }
 
-                if((isset($data['source']) && $data['source'] == 'custom_fields')) {
+                if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                     $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
-                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',$table_alias, $field_module, 'custom', $query);
+                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $table_alias, $field_module, 'custom', $query);
                 } else {
-                    $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                    $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
                 }
 
-                if($field->group_by == 1){
-                    $query['group_by'][] = $field->format ? str_replace('(%1)', '(' . $select_field . ')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
+                if ($field->group_by == 1) {
+                    $query['group_by'][] = $field->format ? str_replace('(%1)', '('.$select_field.')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
                 } else {
-                    $query['second_group_by'][] = $field->format ? str_replace('(%1)', '(' . $select_field . ')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
+                    $query['second_group_by'][] = $field->format ? str_replace('(%1)', '('.$select_field.')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
                 }
 
-                if($field->field_function != null){
+                if ($field->field_function != null) {
                     $select_field = $field->field_function.'('.$select_field.')';
                 }
 
-                if($field->sort_by != ''){
+                if ($field->sort_by != '') {
                     $query['sort_by'][] = $select_field." ".$field->sort_by;
                 }
 
-                $query['select'][] = $select_field ." AS '".$field->label."'";
+                $query['select'][] = $select_field." AS '".$field->label."'";
 
-                if($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
+                if ($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
                     ++$i;
             }
         }
@@ -1121,30 +1121,30 @@ 
     }
 
 
-    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(),SugarBean $rel_module = null ){
+    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(), SugarBean $rel_module = null) {
 
-        if(!isset($query['join'][$alias])){
+        if (!isset($query['join'][$alias])) {
 
-            switch ($type){
+            switch ($type) {
                 case 'custom':
-                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '. $this->db->quoteIdentifier($name).'.id_c ';
+                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '.$this->db->quoteIdentifier($name).'.id_c ';
                     break;
 
                 case 'relationship':
-                    if($module->load_relationship($name)){
+                    if ($module->load_relationship($name)) {
                         $params['join_type'] = 'LEFT JOIN';
-                        if($module->$name->relationship_type != 'one-to-many'){
-                            if($module->$name->getSide() == REL_LHS){
+                        if ($module->$name->relationship_type != 'one-to-many') {
+                            if ($module->$name->getSide() == REL_LHS) {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
-                            }else{
+                            } else {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($alias);
                             }
 
-                        }else{
+                        } else {
                             $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                             $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
@@ -1153,7 +1153,7 @@ 
                         $params['join_table_link_alias'] = $this->db->quoteIdentifier($linkAlias);
                         $join = $module->$name->getJoin($params, true);
                         $query['join'][$alias] = $join['join'];
-                        if($rel_module != null) {
+                        if ($rel_module != null) {
                             $query['join'][$alias] .= $this->build_report_access_query($rel_module, $name);
                         }
                     }
@@ -1167,11 +1167,11 @@ 
         return $query;
     }
 
-    function build_report_access_query(SugarBean $module, $alias){
+    function build_report_access_query(SugarBean $module, $alias) {
 
         $module->table_name = $alias;
         $where = '';
-        if($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list') )
+        if ($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $module->getOwnerWhere($current_user->id);
@@ -1179,18 +1179,18 @@ 
 
         }
 
-        if(file_exists('modules/SecurityGroups/SecurityGroup.php')){
+        if (file_exists('modules/SecurityGroups/SecurityGroup.php')) {
             /* BEGIN - SECURITY GROUPS */
-            if($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list') )
+            if ($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list'))
             {
                 require_once('modules/SecurityGroups/SecurityGroup.php');
                 global $current_user;
                 $owner_where = $module->getOwnerWhere($current_user->id);
-                $group_where = SecurityGroup::getGroupWhere($alias,$module->module_dir,$current_user->id);
-                if(!empty($owner_where)){
-                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                $group_where = SecurityGroup::getGroupWhere($alias, $module->module_dir, $current_user->id);
+                if (!empty($owner_where)) {
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= ' AND '.  $group_where;
+                    $where .= ' AND '.$group_where;
                 }
             }
             /* END - SECURITY GROUPS */
@@ -1203,16 +1203,16 @@ 
      * @param array $query
      * @return array
      */
-    function build_report_query_where($query = array()){
+    function build_report_query_where($query = array()) {
         global $beanList, $app_list_strings, $sugar_config;
 
         $closure = false;
-        if(!empty($query['where'])) {
+        if (!empty($query['where'])) {
             $query['where'][] = '(';
             $closure = true;
         }
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY condition_order ASC";
@@ -1229,21 +1229,21 @@ 
                 $condition_module = $module;
                 $table_alias = $condition_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        if(empty($rel)){
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        if (empty($rel)) {
                             continue;
                         }
                         // Bug: Prevents relationships from loading.
                         //$rel = strtolower($rel);
-                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir,$rel)];
+                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_condition_module);
                         $condition_module = $new_condition_module;
                     }
                 }
-                if(isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
+                if (isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
                     $where_set = false;
 
                     $data = $condition_module->field_defs[$condition->field];
@@ -1258,24 +1258,24 @@ 
                         $data = $data_new;
                     }
 
-                    if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir,$data['relationship'])];
+                    if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir, $data['relationship'])];
                         $table_alias = $data['relationship'];
-                        $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
+                        $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
                         $condition_module = $new_field_module;
 
                         // Debugging: security groups conditions - It's a hack to just get the query working
-                        if($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
+                        if ($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
 //                            $table_alias = 'opportunities:assigned_user_link:SecurityGroups' ;
-                            $table_alias = $oldAlias. ':' .$rel;
+                            $table_alias = $oldAlias.':'.$rel;
                         }
                         $condition->field = 'id';
                     }
                     if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                        $field = $this->db->quoteIdentifier($table_alias . '_cstm') . '.' . $condition->field;
-                        $query = $this->build_report_query_join($table_alias . '_cstm', $table_alias . '_cstm', $oldAlias, $condition_module, 'custom', $query);
+                        $field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$condition->field;
+                        $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $oldAlias, $condition_module, 'custom', $query);
                     } else {
-                        $field = $this->db->quoteIdentifier($table_alias) . '.' . $condition->field;
+                        $field = $this->db->quoteIdentifier($table_alias).'.'.$condition->field;
                     }
 
                     if (!empty($this->user_parameters[$condition->id]) && $condition->parameter) {
@@ -1307,10 +1307,10 @@ 
                                 $condition->field = 'id';
                             }
                             if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                $value = $condition_module->table_name . '_cstm.' . $condition->value;
-                                $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                $value = $condition_module->table_name.'_cstm.'.$condition->value;
+                                $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                             } else {
-                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name) . '.' . $condition->value;
+                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name).'.'.$condition->value;
                             }
                             break;
 
@@ -1318,7 +1318,7 @@ 
                             $params = unserialize(base64_decode($condition->value));
 
                             // Fix for issue #1272 - AOR_Report module cannot update Date type parameter.
-                            if($params == false) {
+                            if ($params == false) {
                                 $params = $condition->value;
                             }
 
@@ -1328,10 +1328,10 @@ 
                                 } else {
                                     $value = 'NOW()';
                                 }
-                            } else if($params[0] == 'today'){
-                                if($sugar_config['dbconfig']['db_type'] == 'mssql'){
+                            } else if ($params[0] == 'today') {
+                                if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
                                     //$field =
-                                    $value  = 'CAST(GETDATE() AS DATE)';
+                                    $value = 'CAST(GETDATE() AS DATE)';
                                 } else {
                                     $field = 'DATE('.$field.')';
                                     $value = 'Curdate()';
@@ -1339,10 +1339,10 @@ 
                             } else {
                                 $data = $condition_module->field_defs[$params[0]];
                                 if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                    $value = $condition_module->table_name . '_cstm.' . $params[0];
-                                    $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                    $value = $condition_module->table_name.'_cstm.'.$params[0];
+                                    $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                                 } else {
-                                    $value = $condition_module->table_name . '.' . $params[0];
+                                    $value = $condition_module->table_name.'.'.$params[0];
                                 }
                             }
 
@@ -1353,9 +1353,9 @@ 
                                         $params[3] = 'hours';
                                     default:
                                         if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
-                                            $value = "DATEADD(" . $params[3] . ",  " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2], $value)";
+                                            $value = "DATEADD(".$params[3].",  ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2], $value)";
                                         } else {
-                                            $value = "DATE_ADD($value, INTERVAL " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2] " . $params[3] . ")";
+                                            $value = "DATE_ADD($value, INTERVAL ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2] ".$params[3].")";
                                         }
                                         break;
                                 }
@@ -1370,11 +1370,11 @@ 
                                 $value = '(';
                                 foreach ($multi_values as $multi_value) {
                                     if ($value != '(') $value .= $sep;
-                                    $value .= $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . " '" . $multi_value . "'";
+                                    $value .= $field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator]." '".$multi_value."'";
                                 }
                                 $value .= ')';
                             }
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $value;
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$value;
                             $where_set = true;
                             break;
                         case "Period":
@@ -1383,20 +1383,20 @@ 
                             } else {
                                 $params = base64_decode($condition->value);
                             }
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
                             break;
                         case "CurrentUserID":
                             global $current_user;
-                            $value = '"' . $current_user->id . '"';
+                            $value = '"'.$current_user->id.'"';
                             break;
                         case 'Value':
                         default:
-                            $value = "'" . $this->db->quote($condition->value) . "'";
+                            $value = "'".$this->db->quote($condition->value)."'";
                             break;
                     }
 
                     //handle like conditions
-                    Switch($condition->operator) {
+                    Switch ($condition->operator) {
                         case 'Contains':
                             $value = "CONCAT('%', ".$value." ,'%')";
                             break;
@@ -1408,11 +1408,11 @@ 
                             break;
                     }
 
-                    if($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
+                    if ($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
                         $value = "{$value} OR {$field} IS NULL";
                     }
 
-                    if(!$where_set) {
+                    if (!$where_set) {
                         if ($condition->value_type == "Period") {
                             if (array_key_exists($condition->value, $app_list_strings['date_time_period_list'])) {
                                 $params = $condition->value;
@@ -1420,34 +1420,34 @@ 
                                 $params = base64_decode($condition->value);
                             }
                             $date = getPeriodEndDate($params)->format('Y-m-d H:i:s');
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
 
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND '));
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND '));
                             $tiltLogicOp = false;
 
                             switch ($app_list_strings['aor_sql_operator_list'][$condition->operator]) {
                                 case "=":
-                                    $query['where'][] = $field . ' BETWEEN ' . $value .  ' AND ' . '"' . $date . '"';
+                                    $query['where'][] = $field.' BETWEEN '.$value.' AND '.'"'.$date.'"';
                                     break;
                                 case "!=":
-                                    $query['where'][] = $field . ' NOT BETWEEN ' . $value .  ' AND ' . '"' . $date . '"';
+                                    $query['where'][] = $field.' NOT BETWEEN '.$value.' AND '.'"'.$date.'"';
                                     break;
                                 case ">":
                                 case "<":
                                 case ">=":
                                 case "<=":
-                                    $query['where'][] = $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                                    $query['where'][] = $field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator].' '.$value;
                                     break;
                             }
                         } else {
-                            if (!$where_set) $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                            if (!$where_set) $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator].' '.$value;
                         }
                     }
                     $tiltLogicOp = false;
                 }
-                else if($condition->parenthesis) {
-                    if($condition->parenthesis == 'START') {
-                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) .  '(';
+                else if ($condition->parenthesis) {
+                    if ($condition->parenthesis == 'START') {
+                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).'(';
                         $tiltLogicOp = true;
                     }
                     else {
@@ -1461,7 +1461,7 @@ 
 
             }
 
-            if(isset($query['where']) && $query['where']) {
+            if (isset($query['where']) && $query['where']) {
                 array_unshift($query['where'], '(');
                 $query['where'][] = ') AND ';
             }
@@ -1469,7 +1469,7 @@ 
 
         }
 
-        if($closure) {
+        if ($closure) {
             $query['where'][] = ')';
         }
 

modules/AOS_Products/metadata/SearchFields.php

Spacing +17 added lines, -17 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 // created: 2013-05-07 12:48:58
 global $current_user;
-$searchFields['AOS_Products'] = array (
+$searchFields['AOS_Products'] = array(
   'name' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'current_user_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'created_by',
     ),
     'my_items' => true,
@@ -18,67 +18,67 @@ 
     'type' => 'bool',
   ),
   'range_price' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
   ),
   'start_range_price' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
   ),
   'end_range_price' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
   ),
   'range_cost' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
   ),
   'start_range_cost' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
   ),
   'end_range_cost' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
   ),
   'range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
@@ -89,6 +89,6 @@ 
         'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
         'db_field'=>array('id')),
 );
\ No newline at end of file

modules/Documents/metadata/SearchFields.php

Spacing +16 added lines, -16 removed lines

@@ -2,79 +2,79 @@ 
 // created: 2015-02-17 15:14:28
 global $current_user;
 $module_name = "Documents";
-$searchFields['Documents'] = array (
+$searchFields['Documents'] = array(
   'document_name' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'category_id' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'document_category_dom',
     'template_var' => 'CATEGORY_OPTIONS',
   ),
   'subcategory_id' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'document_subcategory_dom',
     'template_var' => 'SUBCATEGORY_OPTIONS',
   ),
   'active_date' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'exp_date' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'assigned_user_id' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'filename' => 
-  array (
+  array(
     'query_type' => 'format',
     'operator' => 'subquery',
     'subquery' => 'SELECT document_revisions.id FROM document_revisions
 			           WHERE document_revisions.deleted=0
 				   AND document_revisions.filename LIKE \'{0}\'',
     'db_field' => 
-    array (
+    array(
       0 => 'document_revision_id',
     ),
   ),
   'range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
@@ -85,6 +85,6 @@ 
         'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
         'db_field'=>array('id')),
 );
\ No newline at end of file

modules/Meetings/metadata/SearchFields.php

Indentation +25 added lines, -25 removed lines

@@ -40,42 +40,42 @@
 global $current_user;
 $module_name = "Meetings";
 $searchFields['Meetings'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
+    array (
+        'name' => array( 'query_type'=>'default'),
         'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
         'date_start' => array( 'query_type'=>'default'),
         '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' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
         
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('status'),
-			'operator'=>'not in',
-			'closed_values' => array('Held', 'Not Held'),
-			'type'=>'bool',
-		),		
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('status'),
+            'operator'=>'not in',
+            'closed_values' => array('Held', 'Not Held'),
+            'type'=>'bool',
+        ),		
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
             'db_field'=>array('id')),
-		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 				
-	);
+        //Range Search Support
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 				
+    );
 ?>

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,11 +40,11 @@ 
 global $current_user;
 $module_name = "Meetings";
 $searchFields['Meetings'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-        'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
-        'date_start' => array( 'query_type'=>'default'),
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+	array(
+		'name' => array('query_type'=>'default'),
+        'contact_name' => array('query_type'=>'default', 'db_field'=>array('contacts.first_name', 'contacts.last_name')),        
+        'date_start' => array('query_type'=>'default'),
+        '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' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
         
@@ -61,21 +61,21 @@ 
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    //Range Search Support 				
 	);
 ?>

modules/Leads/metadata/SearchFields.php

Indentation +24 added lines, -24 removed lines

@@ -45,22 +45,22 @@ 
         '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',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
@@ -75,20 +75,20 @@ 
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options'=>'lead_status_dom', 'template_var' => 'STATUS_OPTIONS'),
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('status'),
-			'operator'=>'not in',
-			'closed_values' => array('Dead', 'Recycled', 'Converted'),
-			'type'=>'bool',
-		),
-		//Range Search Support 
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('status'),
+            'operator'=>'not in',
+            'closed_values' => array('Dead', 'Recycled', 'Converted'),
+            'type'=>'bool',
+        ),
+        //Range Search Support 
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
         'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 				
+        //Range Search Support 				
     );
 ?>
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,15 +40,15 @@ 
 global $current_user;
 $module_name = "Leads";
 $searchFields['Leads'] = 
-    array (
-        'first_name' => array( 'query_type'=>'default'),
+    array(
+        'first_name' => array('query_type'=>'default'),
         'last_name'=> array('query_type'=>'default'),
-        'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
-        'account_name'=> array('query_type'=>'default','db_field'=>array('leads.account_name')),
+        'search_name'=> array('query_type'=>'default', 'db_field'=>array('first_name', 'last_name'), 'force_unifiedsearch'=>true),
+        'account_name'=> array('query_type'=>'default', 'db_field'=>array('leads.account_name')),
 		/*'acc_name_from_accounts' => array('query_type'=>'default','related_field'=>'account_name'),*/
-        'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options'=>'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
+        'lead_source'=> array('query_type'=>'default', 'operator'=>'=', 'options'=>'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
         'do_not_call'=> array('query_type'=>'default', 'operator'=>'=', 'input_type' => 'checkbox'),
-        'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','phone_home')),
+        'phone'=> array('query_type'=>'default', 'db_field'=>array('phone_mobile', 'phone_work', 'phone_other', 'phone_fax', 'phone_home')),
 		'email'=> array(
 			'query_type' => 'default',
 			'operator' => 'subquery',
@@ -63,16 +63,16 @@ 
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
         'assistant'=> array('query_type'=>'default'),
         'website'=> array('query_type'=>'default'),
-        'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-        'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-        'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-        'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-        'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'address_street'=> array('query_type'=>'default', 'db_field'=>array('primary_address_street', 'alt_address_street')),
+        'address_city'=> array('query_type'=>'default', 'db_field'=>array('primary_address_city', 'alt_address_city')),
+        'address_state'=> array('query_type'=>'default', 'db_field'=>array('primary_address_state', 'alt_address_state')),
+        'address_postalcode'=> array('query_type'=>'default', 'db_field'=>array('primary_address_postalcode', 'alt_address_postalcode')),
+        'address_country'=> array('query_type'=>'default', 'db_field'=>array('primary_address_country', 'alt_address_country')),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options'=>'lead_status_dom', 'template_var' => 'STATUS_OPTIONS'),
 		'open_only' => array(
@@ -83,12 +83,12 @@ 
 			'type'=>'bool',
 		),
 		//Range Search Support 
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	    'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	    'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    //Range Search Support 				
     );
 ?>
\ No newline at end of file

modules/Project/metadata/SearchFields.php

Indentation +15 added lines, -15 removed lines

@@ -46,25 +46,25 @@
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
             'db_field'=>array('id')),
-		//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_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_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_estimated_start_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_estimated_end_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-		//Range Search Support 				
+        'range_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_estimated_start_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_estimated_end_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 				
     );
 ?>

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.
@@ -40,31 +40,31 @@ 
 global $current_user;
 $module_name = "Project";
 $searchFields['Project'] = 
-    array (
-        'name' => array( 'query_type'=>'default'),
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+    array(
+        'name' => array('query_type'=>'default'),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	    
-	   'range_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_estimated_start_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_estimated_start_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_estimated_end_date' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_estimated_end_date' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_estimated_start_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_estimated_start_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_estimated_start_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_estimated_end_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_estimated_end_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_estimated_end_date' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 		//Range Search Support 				
     );
 ?>