adamjakab / SuiteCRM

tests/tests/modules/Contacts/ContactTest.php

Spacing +32 added lines, -32 removed lines

@@ -6,9 +6,9 @@ 
 
 		//execute the contructor and check for the Object type and  attributes
 		$contact = new Contact();
-		$this->assertInstanceOf('Contact',$contact);
-		$this->assertInstanceOf('Person',$contact);
-		$this->assertInstanceOf('SugarBean',$contact);
+		$this->assertInstanceOf('Contact', $contact);
+		$this->assertInstanceOf('Person', $contact);
+		$this->assertInstanceOf('SugarBean', $contact);
 
 		$this->assertAttributeEquals('Contacts', 'module_dir', $contact);
 		$this->assertAttributeEquals('Contact', 'object_name', $contact);
@@ -29,7 +29,7 @@ 
 		//test with empty strings
 		$query = "";
 		$contact->add_list_count_joins($query, '');
-		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 		//test with valid string
@@ -37,14 +37,14 @@ 
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'accounts.name');
 		$query = preg_replace('/\s+/', '', $query);
-		$expected =preg_replace('/\s+/', '', $expected);
-		$this->assertSame($expected,$query);
+		$expected = preg_replace('/\s+/', '', $expected);
+		$this->assertSame($expected, $query);
 		
 		//test with valid string
 		$query = "";
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'contacts.name');
-		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 	}
@@ -53,9 +53,9 @@ 
 	{
 		$contact = new Contact();
 
-		$expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
+		$expected = array("MAIN"=>"a", "ACCOUNT"=>"a");
 		$actual = $contact->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -89,14 +89,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -106,14 +106,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -130,9 +130,9 @@ 
 
 		$contact->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn",$contact->full_name);
-		$this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
-		$this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
+		$this->assertEquals("firstn lastn", $contact->full_name);
+		$this->assertEquals("firstn lastn <1@test.com>", $contact->email_and_name1);
+		$this->assertEquals("firstn lastn <2@test.com>", $contact->email_and_name2);
 
 	}
 
@@ -145,14 +145,14 @@ 
 
 		$contact->fill_in_additional_detail_fields();
 
-		$this->assertEquals("",$contact->account_name);
-		$this->assertEquals("",$contact->account_id);
-		$this->assertEquals("",$contact->report_to_name);
+		$this->assertEquals("", $contact->account_name);
+		$this->assertEquals("", $contact->account_id);
+		$this->assertEquals("", $contact->report_to_name);
 
 	}
 
 
-	public function testload_contacts_users_relationship(){
+	public function testload_contacts_users_relationship() {
 
 		$contact = new Contact();
 
@@ -175,7 +175,7 @@ 
 		$contact->first_name = "first";
 		$contact->last_name = "last";
 
-		$expected = array (
+		$expected = array(
 					  'NAME' => 'first last',
 					  'DELETED' => 0,
 					  'FIRST_NAME' => 'first',
@@ -201,7 +201,7 @@ 
 	}
 
 
-	public function testbuild_generic_where_clause ()
+	public function testbuild_generic_where_clause()
 	{
 
 		$contact = new Contact();
@@ -209,13 +209,13 @@ 
 		//test with string
 		$expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
 		$actual = $contact->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with number
 		$expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
 		$actual = $contact->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -231,8 +231,8 @@ 
 
 		$result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		$this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
-		$this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
+		$this->assertEquals($contact->full_name, $result->_tpl_vars['CONTACT_NAME']);
+		$this->assertEquals($contact->description, $result->_tpl_vars['CONTACT_DESCRIPTION']);
 
 	}
 
@@ -241,7 +241,7 @@ 
 		$contact = new Contact();
 
 		$result = $contact->get_contact_id_by_email("");
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 
 
 		//$result = $contact->get_contact_id_by_email("test@test.com");
@@ -282,7 +282,7 @@ 
 		//execute the method and verify that it retunrs expected results
 		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
 		$actual = $contact->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 

tests/tests/modules/AOR_Reports/AOR_ReportTest.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             $output = $me->jsParser();
 
             return $output;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             // Exception handling is left up to the implementer.
             throw $e;
         }

modules/Tasks/metadata/SearchFields.php

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,10 +40,10 @@ 
 global $current_user;
 $module_name = "Tasks";
 $searchFields['Tasks'] = 
-	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'), 'force_unifiedsearch' => 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'),
         'status'=> array('query_type'=>'default', 'options' => 'task_status_dom', 'template_var' => 'STATUS_FILTER'),
         
@@ -60,22 +60,22 @@ 
 			'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_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_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_due' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_due' => 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_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 		//Range Search Support 				
 	);
 ?>

modules/Calls/metadata/SearchFields.php

Spacing +27 added lines, -27 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.
@@ -39,33 +39,33 @@ 
  ********************************************************************************/
 global $current_user;
 $module_name = "Calls";
-$searchFields['Calls'] = array (
+$searchFields['Calls'] = array(
   'name' =>
-  array (
+  array(
     'query_type' => 'default',
   ),
   'contact_name' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'contacts.first_name',
       1 => 'contacts.last_name',
     ),
   ),
   'date_start' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'location' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'current_user_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'assigned_user_id',
     ),
     'my_items' => true,
@@ -73,98 +73,98 @@ 
     'type' => 'bool',
   ),
   'assigned_user_id' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'status' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'call_status_dom',
     'template_var' => 'STATUS_FILTER',
   ),
   'open_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'status',
     ),
     'operator' => 'not in',
     'closed_values' => 
-    array (
+    array(
       0 => 'Held',
       1 => 'Not Held',
     ),
     'type' => 'bool',
   ),
   '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,
   ),
   'range_date_start' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_start' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_start' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_end' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_end' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_end' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
@@ -175,6 +175,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/Cases/metadata/SearchFields.php

Spacing +22 added lines, -22 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.
@@ -39,42 +39,42 @@ 
  ********************************************************************************/
 global $current_user;
 $module_name = "Cases";
-$searchFields['Cases'] = array (
+$searchFields['Cases'] = array(
   'name' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'account_name' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'accounts.name',
     ),
   ),
   'status' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'case_status_dom',
     'template_var' => 'STATUS_OPTIONS',
   ),
   'priority' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'case_priority_dom',
     'template_var' => 'PRIORITY_OPTIONS',
     'options_add_blank' => true,
   ),
   'case_number' => 
-  array (
+  array(
     'query_type' => 'default',
     'operator' => 'in',
   ),
   'current_user_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'assigned_user_id',
     ),
     'my_items' => true,
@@ -82,19 +82,19 @@ 
     'type' => 'bool',
   ),
   'assigned_user_id' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'open_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'status',
     ),
     'operator' => 'not in',
     'closed_values' => 
-    array (
+    array(
       0 => 'Closed',
       1 => 'Rejected',
       2 => 'Duplicate',
@@ -105,43 +105,43 @@ 
     'type' => 'bool',
   ),
   '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,
   ),
   'state' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
     'favorites_only' => array(
@@ -150,6 +150,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/EmailTemplates/EmailTemplate.php

Spacing +46 added lines, -46 removed lines

@@ -121,9 +121,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
      */
-    public function EmailTemplate(){
+    public function EmailTemplate() {
         $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 {
@@ -368,7 +368,7 @@ 
                             }
                             if (!empty($tracker_url) && !empty($template_text) && !empty($matches[0][$i][0]) && !empty($tracked_urls[$matches[0][$i][0]])) {
                                 $template_text = substr_replace($template_text, $tracker_url, $matches[0][$i][1], strlen($matches[0][$i][0]));
-                                $template_text = str_replace($sugar_config['site_url'] . '/' . $sugar_config['site_url'], $sugar_config['site_url'], $template_text);
+                                $template_text = str_replace($sugar_config['site_url'].'/'.$sugar_config['site_url'], $sugar_config['site_url'], $template_text);
                             }
                         }
                     }
@@ -420,10 +420,10 @@ 
         if ($beanList[$focus_name] == 'User') {
             $pattern_prefix = '$contact_user_';
         } else {
-            $pattern_prefix = '$' . strtolower($beanList[$focus_name]) . '_';
+            $pattern_prefix = '$'.strtolower($beanList[$focus_name]).'_';
         }
         $pattern_prefix_length = strlen($pattern_prefix);
-        $pattern = '/\\' . $pattern_prefix . '[A-Za-z_0-9]*/';
+        $pattern = '/\\'.$pattern_prefix.'[A-Za-z_0-9]*/';
 
         $return_array = array();
         foreach ($template_text_array as $key => $template_text) {
@@ -521,16 +521,16 @@ 
                 $translated = translate($field_def['options'], 'Users', $user->$fieldName);
 
                 if (isset($translated) && !is_array($translated)) {
-                    $repl_arr["contact_user_" . $fieldName] = $translated;
+                    $repl_arr["contact_user_".$fieldName] = $translated;
                 } else { // unset enum field, make sure we have a match string to replace with ""
-                    $repl_arr["contact_user_" . $fieldName] = '';
+                    $repl_arr["contact_user_".$fieldName] = '';
                 }
             } else {
                 if (isset($user->$fieldName)) {
                     // bug 47647 - allow for fields to translate before adding to template
-                    $repl_arr["contact_user_" . $fieldName] = self::_convertToType($field_def['type'], $user->$fieldName);
+                    $repl_arr["contact_user_".$fieldName] = self::_convertToType($field_def['type'], $user->$fieldName);
                 } else {
-                    $repl_arr["contact_user_" . $fieldName] = "";
+                    $repl_arr["contact_user_".$fieldName] = "";
                 }
             }
         }
@@ -556,8 +556,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($prospect->field_defs as $field_def) {
@@ -565,8 +565,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($contact->field_defs as $field_def) {
@@ -574,8 +574,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'contact_' . $field_def['name'] => '',
-                'contact_account_' . $field_def['name'] => '',
+                'contact_'.$field_def['name'] => '',
+                'contact_account_'.$field_def['name'] => '',
             ));
         }
         foreach ($acct->field_defs as $field_def) {
@@ -583,8 +583,8 @@ 
                 continue;
             }
             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                'account_' . $field_def['name'] => '',
-                'account_contact_' . $field_def['name'] => '',
+                'account_'.$field_def['name'] => '',
+                'account_contact_'.$field_def['name'] => '',
             ));
         }
         // cn: end bug 9277 fix
@@ -609,21 +609,21 @@ 
 
                         if (isset($translated) && !is_array($translated)) {
                             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                                'account_' . $fieldName => $translated,
-                                'contact_account_' . $fieldName => $translated,
+                                'account_'.$fieldName => $translated,
+                                'contact_account_'.$fieldName => $translated,
                             ));
                         } else { // unset enum field, make sure we have a match string to replace with ""
                             $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                                'account_' . $fieldName => '',
-                                'contact_account_' . $fieldName => '',
+                                'account_'.$fieldName => '',
+                                'contact_account_'.$fieldName => '',
                             ));
                         }
                     } else {
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'], $acct->$fieldName);
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'account_' . $fieldName => $translated,
-                            'contact_account_' . $fieldName => $translated,
+                            'account_'.$fieldName => $translated,
+                            'contact_account_'.$fieldName => $translated,
                         ));
                     }
                 }
@@ -654,13 +654,13 @@ 
 
                     if (isset($translated) && !is_array($translated)) {
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $fieldName => $translated,
-                            'contact_account_' . $fieldName => $translated,
+                            'contact_'.$fieldName => $translated,
+                            'contact_account_'.$fieldName => $translated,
                         ));
                     } else { // unset enum field, make sure we have a match string to replace with ""
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $fieldName => '',
-                            'contact_account_' . $fieldName => '',
+                            'contact_'.$fieldName => '',
+                            'contact_account_'.$fieldName => '',
                         ));
                     }
                 } else {
@@ -668,8 +668,8 @@ 
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'], $contact->$fieldName);
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            'contact_' . $fieldName => $translated,
-                            'contact_account_' . $fieldName => $translated,
+                            'contact_'.$fieldName => $translated,
+                            'contact_account_'.$fieldName => $translated,
                         ));
                     } // if
                 }
@@ -690,27 +690,27 @@ 
 
                     if (isset($translated) && !is_array($translated)) {
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            strtolower($beanList[$bean_name]) . "_" . $fieldName => $translated,
+                            strtolower($beanList[$bean_name])."_".$fieldName => $translated,
                         ));
                     } else { // unset enum field, make sure we have a match string to replace with ""
                         $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                            strtolower($beanList[$bean_name]) . "_" . $fieldName => '',
+                            strtolower($beanList[$bean_name])."_".$fieldName => '',
                         ));
                     }
                 } else {
                     // bug 47647 - translate currencies to appropriate values
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . "_" . $fieldName => self::_convertToType($field_def['type'], $focus->$fieldName),
+                        strtolower($beanList[$bean_name])."_".$fieldName => self::_convertToType($field_def['type'], $focus->$fieldName),
                     ));
                 }
             } else {
                 if ($fieldName == 'full_name') {
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . '_full_name' => $focus->get_summary_text(),
+                        strtolower($beanList[$bean_name]).'_full_name' => $focus->get_summary_text(),
                     ));
                 } else {
                     $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
-                        strtolower($beanList[$bean_name]) . "_" . $fieldName => '',
+                        strtolower($beanList[$bean_name])."_".$fieldName => '',
                     ));
                 }
             }
@@ -761,7 +761,7 @@ 
     {
         foreach ($bean_arr as $bean_name => $bean_id) {
 
-            $focus = BeanFactory::getBean($bean_name,$bean_id);
+            $focus = BeanFactory::getBean($bean_name, $bean_id);
 
             if ($bean_name == 'Leads' || $bean_name == 'Prospects') {
                 $bean_name = 'Contacts';
@@ -843,7 +843,7 @@ 
         $this->repairMozaikClears();
         $this->imageLinkReplaced = false;
         $this->repairEntryPointImages();
-        if($this->imageLinkReplaced) {
+        if ($this->imageLinkReplaced) {
             $this->save();
         }
         return $ret;
@@ -862,13 +862,13 @@ 
         // repair the images url at entry points, change to a public direct link for remote email clients..
 
         $siteUrlQuoted = str_replace(array(':', '/'), array('\:', '\/'), $sugar_config['site_url']);
-        $regex = '/<img src="(' . $siteUrlQuoted . '\/index\.php\?entryPoint=download&type=Notes&id=([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})&filename=[^&]+)"/';
+        $regex = '/<img src="('.$siteUrlQuoted.'\/index\.php\?entryPoint=download&type=Notes&id=([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})&filename=[^&]+)"/';
 
-        if(preg_match($regex, $this->body_html, $match)) {
+        if (preg_match($regex, $this->body_html, $match)) {
             $splits = explode('.', $match[1]);
             $fileExtension = end($splits);
             $this->makePublicImage($match[2]);
-            $directLink = '<img src="' . $sugar_config['site_url'] . '/public/' . $match[2] . '.' . $fileExtension . '"';
+            $directLink = '<img src="'.$sugar_config['site_url'].'/public/'.$match[2].'.'.$fileExtension.'"';
             $this->body_html = str_replace($match[0], $directLink, $this->body_html);
             $this->imageLinkReplaced = true;
             $this->repairEntryPointImages();
@@ -877,25 +877,25 @@ 
     }
 
     private function makePublicImage($id) {
-        $toFile = 'public/' . $id . '.jpg';
-        if(file_exists($toFile)) {
+        $toFile = 'public/'.$id.'.jpg';
+        if (file_exists($toFile)) {
             return;
         }
-        $fromFile = 'upload://' . $id;
-        if(!file_exists($fromFile)) {
+        $fromFile = 'upload://'.$id;
+        if (!file_exists($fromFile)) {
             throw new Exceptin('file not found');
         }
-        if(!file_exists('public')) {
+        if (!file_exists('public')) {
             sugar_mkdir('public', 777);
         }
         $fdata = file_get_contents($fromFile);
-        if(!file_put_contents($toFile, $fdata)) {
+        if (!file_put_contents($toFile, $fdata)) {
             throw new Exception('file write error');
         }
     }
 
     public function getAttachments() {
-        return BeanFactory::getBean('Notes')->get_full_list('', "parent_id = '" . $this->id . "'");
+        return BeanFactory::getBean('Notes')->get_full_list('', "parent_id = '".$this->id."'");
     }
 
 }

modules/EmailTemplates/EmailTemplateData.php

Spacing +21 added lines, -21 removed lines

@@ -2,9 +2,9 @@ 
 if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 function handleAttachmentForRemove() {
-    if(!empty($_REQUEST['attachmentsRemove'])) {
-        foreach($_REQUEST['attachmentsRemove'] as $attachmentIdForRemove) {
-            if($bean = BeanFactory::getBean('Notes', $attachmentIdForRemove)) {
+    if (!empty($_REQUEST['attachmentsRemove'])) {
+        foreach ($_REQUEST['attachmentsRemove'] as $attachmentIdForRemove) {
+            if ($bean = BeanFactory::getBean('Notes', $attachmentIdForRemove)) {
                 $bean->mark_deleted($bean->id);
             }
         }
@@ -18,7 +18,7 @@ 
 $emailTemplateId = isset($_REQUEST['emailTemplateId']) && $_REQUEST['emailTemplateId'] ? $_REQUEST['emailTemplateId'] : null;
 $_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedTemplateId'] = $emailTemplateId;
 
-if(preg_match('/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/', $emailTemplateId) || !$emailTemplateId) {
+if (preg_match('/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/', $emailTemplateId) || !$emailTemplateId) {
 
     $func = isset($_REQUEST['func']) ? $_REQUEST['func'] : null;
 
@@ -28,18 +28,18 @@ 
 
     include_once 'modules/EmailTemplates/EmailTemplateFormBase.php';
 
-    switch($func) {
+    switch ($func) {
 
         case 'update':
             $bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId);
-            foreach($bean as $key => $value) {
-                if(in_array($key, $fields)) {
+            foreach ($bean as $key => $value) {
+                if (in_array($key, $fields)) {
                     $bean->$key = $_POST[$key];
                 }
             }
             $formBase = new EmailTemplateFormBase();
             $bean = $formBase->handleAttachmentsProcessImages($bean, false, true, 'download', true);
-            if($bean->save()) {
+            if ($bean->save()) {
                 $msgs[] = 'LBL_TEMPLATE_SAVED';
             }
             //$formBase = new EmailTemplateFormBase();
@@ -49,14 +49,14 @@ 
             handleAttachmentForRemove();
 
             // update marketing->template_id if we have a selected marketing..
-            if(!empty($_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId']) && !empty($_REQUEST['campaignId'])) {
+            if (!empty($_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId']) && !empty($_REQUEST['campaignId'])) {
                 $marketingId = $_SESSION['campaignWizard'][$_REQUEST['campaignId']]['defaultSelectedMarketingId'];
 
                 $campaign = BeanFactory::getBean('Campaigns', $_REQUEST['campaignId']);
                 $campaign->load_relationship('emailmarketing');
                 $marketings = $campaign->emailmarketing->get();
                 // just a double check for campaign->marketing relation correct is for e.g the user deleted the marketing record or something may could happened..
-                if(in_array($marketingId, $marketings)) {
+                if (in_array($marketingId, $marketings)) {
                     $marketing = BeanFactory::getBean('EmailMarketing', $marketingId);
                     $marketing->template_id = $emailTemplateId;
                     $marketing->save();
@@ -72,15 +72,15 @@ 
             $bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId);
             $newBean = new EmailTemplate();
             $fieldsForCopy = array('type', 'description');
-            foreach($bean as $key => $value) {
-                if(in_array($key, $fields)) {
+            foreach ($bean as $key => $value) {
+                if (in_array($key, $fields)) {
                     $newBean->$key = $_POST[$key];
                 }
-                else if(in_array($key, $fieldsForCopy)) {
+                else if (in_array($key, $fieldsForCopy)) {
                     $newBean->$key = $bean->$key;
                 }
             }
-            if($newBean->save()) {
+            if ($newBean->save()) {
                 $msgs[] = 'LBL_TEMPLATE_SAVED';
             }
             //$formBase = new EmailTemplateFormBase();
@@ -94,13 +94,13 @@ 
             $focus = BeanFactory::getBean('EmailTemplates', $_REQUEST['attach_to_template_id']);
             //$data = $formBase->handleAttachments($focus, false, null);
             $data = $formBase->handleAttachmentsProcessImages($focus, false, true, 'download', true);
-            $redirectUrl = 'index.php?module=Campaigns&action=WizardMarketing&campaign_id=' . $_REQUEST['campaign_id'] . "&jump=2&template_id=" . $_REQUEST['attach_to_template_id']; // . '&marketing_id=' . $_REQUEST['attach_to_marketing_id'] . '&record=' . $_REQUEST['attach_to_marketing_id'];
-            header('Location: ' . $redirectUrl);
+            $redirectUrl = 'index.php?module=Campaigns&action=WizardMarketing&campaign_id='.$_REQUEST['campaign_id']."&jump=2&template_id=".$_REQUEST['attach_to_template_id']; // . '&marketing_id=' . $_REQUEST['attach_to_marketing_id'] . '&record=' . $_REQUEST['attach_to_marketing_id'];
+            header('Location: '.$redirectUrl);
             die();
             break;
 
         default: case 'get':
-            if($bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId)) {
+            if ($bean = BeanFactory::getBean('EmailTemplates', $emailTemplateId)) {
                 $fields = array('id', 'name', 'body', 'body_html', 'subject');
                 foreach ($bean as $key => $value) {
                     if (in_array($key, $fields)) {
@@ -110,9 +110,9 @@ 
 
                 $data['body_from_html'] = from_html($bean->body_html);
                 $attachmentBeans = $bean->getAttachments();
-                if($attachmentBeans) {
+                if ($attachmentBeans) {
                     $attachments = array();
-                    foreach($attachmentBeans as $attachmentBean) {
+                    foreach ($attachmentBeans as $attachmentBean) {
                         $attachments[] = array(
                             'id' => $attachmentBean->id,
                             'name' => $attachmentBean->name,
@@ -145,8 +145,8 @@ 
 );
 
 $results = json_encode($results);
-if(!$results) {
-    if(json_last_error()) {
+if (!$results) {
+    if (json_last_error()) {
         $results = array(
             'error' => 'json_encode error: '.json_last_error_msg()
         );

modules/EmailTemplates/EmailTemplateFormBase.php

Spacing +41 added lines, -41 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.
@@ -54,14 +54,14 @@ 
 
     }
 
-	function getFormBody($prefix, $mod='',$formname='', $size='30') {
+	function getFormBody($prefix, $mod = '', $formname = '', $size = '30') {
 
 
 		global $mod_strings;
 
 		$temp_strings = $mod_strings;
 
-		if(!empty($mod)) {
+		if (!empty($mod)) {
 			global $current_language;
 			$mod_strings = return_module_language($current_language, $mod);
 		}
@@ -71,7 +71,7 @@ 
 				$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
 				$lbl_subject = $mod_strings['LBL_NOTE_SUBJECT'];
 				$lbl_description = $mod_strings['LBL_NOTE'];
-				$default_parent_type= $app_list_strings['record_type_default_key'];
+				$default_parent_type = $app_list_strings['record_type_default_key'];
 
 $form = <<<EOF
 				<input type="hidden" name="${prefix}record" value="">
@@ -97,16 +97,16 @@ 
 	$javascript->setFormName($formname);
 	$javascript->setSugarBean(new EmailTemplate());
 	$javascript->addRequiredFields($prefix);
-	$form .=$javascript->getScript();
+	$form .= $javascript->getScript();
 	$mod_strings = $temp_strings;
 	return $form;
 	}
 
-	function getForm($prefix, $mod='') {
-		if(!empty($mod)) {
+	function getForm($prefix, $mod = '') {
+		if (!empty($mod)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
+	} else global $mod_strings;
 		global $app_strings;
 		global $app_list_strings;
 
@@ -137,7 +137,7 @@ 
 	}
 
 
-	function handleSave($prefix,$redirect=true, $useRequired=false, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false)
+	function handleSave($prefix, $redirect = true, $useRequired = false, $useSiteURL = false, $entryPoint = 'download', $useUploadFolder = false)
 	{
 		require_once('include/formbase.php');
 		require_once('include/upload_file.php');
@@ -199,18 +199,18 @@ 
 					if (!copy($file_location, $newFileLocation)) {
 						$GLOBALS['log']->debug("EMAIL Template could not copy attachment to $newFileLocation");
 					} else {
-						if($useUploadFolder) {
-							$secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "public/{$id}";
+						if ($useUploadFolder) {
+							$secureLink = ($useSiteURL ? $sugar_config['site_url'].'/' : '')."public/{$id}";
 							// create a copy with correct extension by mime type
-							if(!file_exists('public')) {
+							if (!file_exists('public')) {
 								sugar_mkdir('public', 777);
 							}
-							if(copy($file_location, "public/{$id}.{$mime_type}")) {
+							if (copy($file_location, "public/{$id}.{$mime_type}")) {
 								$secureLink .= ".{$mime_type}";
 							}
 						}
 						else {
-							$secureLink = ($useSiteURL ? $sugar_config['site_url'] . '/' : '') . "index.php?entryPoint=" . $entryPoint . "&type=Notes&id={$id}&filename=" . $match;
+							$secureLink = ($useSiteURL ? $sugar_config['site_url'].'/' : '')."index.php?entryPoint=".$entryPoint."&type=Notes&id={$id}&filename=".$match;
 						}
 
 						$emailTemplateBodyHtml = str_replace("cache/images/$match", $secureLink, $emailTemplateBodyHtml);
@@ -225,7 +225,7 @@ 
 		} else {
 			$check_notify = FALSE;
 		}
-		if($preProcessedImages) {
+		if ($preProcessedImages) {
 			$focus->body_html = $emailTemplateBodyHtml;
 		}
 		$return_id = $focus->save($check_notify);
@@ -243,20 +243,20 @@ 
 
 		$max_files_upload = count($_FILES);
 
-		if(!empty($focus->id)) {
+		if (!empty($focus->id)) {
 			$note = new Note();
 			$where = "notes.parent_id='{$focus->id}'";
-			if(!empty($_REQUEST['old_id'])) { // to support duplication of email templates
+			if (!empty($_REQUEST['old_id'])) { // to support duplication of email templates
 				$where .= " OR notes.parent_id='".htmlspecialchars($_REQUEST['old_id'], ENT_QUOTES)."'";
 			}
 			$notes_list = $note->get_full_list("", $where, true);
 		}
 
-		if(!isset($notes_list)) {
+		if (!isset($notes_list)) {
 			$notes_list = array();
 		}
 
-		if(!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
+		if (!is_array($focus->attachments)) { // PHP5 does not auto-create arrays(). Need to initialize it here.
 			$focus->attachments = array();
 		}
 		$focus->attachments = array_merge($focus->attachments, $notes_list);
@@ -270,7 +270,7 @@ 
 			$note = new Note();
 
 			//Images are presaved above so we need to prevent duplicate files from being created.
-			if( isset($preProcessedImages[$file['name']]) )
+			if (isset($preProcessedImages[$file['name']]))
 			{
 			    $oldId = $preProcessedImages[$file['name']];
 			    $note->id = $oldId;
@@ -278,19 +278,19 @@ 
 			    $GLOBALS['log']->debug("Image {$file['name']} has already been processed.");
             }
 
-			$i=preg_replace("/email_attachment(.+)/",'$1',$key);
+			$i = preg_replace("/email_attachment(.+)/", '$1', $key);
 			$upload_file = new UploadFile($key);
 
-			if(isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/",$key)) {
+			if (isset($_FILES[$key]) && $upload_file->confirm_upload() && preg_match("/^email_attachment/", $key)) {
 				$note->filename = $upload_file->get_stored_file_name();
 				$note->file = $upload_file;
 				$note->name = $mod_strings['LBL_EMAIL_ATTACHMENT'].': '.$note->file->original_file_name;
-				if(isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])){
-                  if($_REQUEST['embedded'.$i]=='true'){
-				  	$note->embed_flag =true;
+				if (isset($_REQUEST['embedded'.$i]) && !empty($_REQUEST['embedded'.$i])) {
+                  if ($_REQUEST['embedded'.$i] == 'true') {
+				  	$note->embed_flag = true;
                   }
-                  else{
-                  	$note->embed_flag =false;
+                  else {
+                  	$note->embed_flag = false;
                   }
 				}
 				array_push($focus->attachments, $note);
@@ -299,11 +299,11 @@ 
 		}
 
 		$focus->saved_attachments = array();
-		foreach($focus->attachments as $note)
+		foreach ($focus->attachments as $note)
 		{
-			if( !empty($note->id) && $note->new_with_id === FALSE)
+			if (!empty($note->id) && $note->new_with_id === FALSE)
 			{
-				if(empty($_REQUEST['old_id']))
+				if (empty($_REQUEST['old_id']))
 					array_push($focus->saved_attachments, $note); // to support duplication of email templates
 				else
 				{
@@ -339,7 +339,7 @@ 
 			array_push($focus->saved_attachments, $note);
 			$note->id = $note_id;
 
-			if($note->new_with_id === FALSE)
+			if ($note->new_with_id === FALSE)
     			$note->file->final_move($note->id);
     	    else
     	       $GLOBALS['log']->debug("Not performing final move for note id {$note->id} as it has already been processed");
@@ -350,18 +350,18 @@ 
 
 	///////////////////////////////////////////////////////////////////////////
 	////	ATTACHMENTS FROM DOCUMENTS
-	$count='';
+	$count = '';
 	//_pp($_REQUEST);
 	//_ppd(count($_REQUEST['document']));
-	if(!empty($_REQUEST['document'])){
+	if (!empty($_REQUEST['document'])) {
       $count = count($_REQUEST['document']);
     }
-    else{
-    	$count=10;
+    else {
+    	$count = 10;
     }
 
-	for($i=0; $i<$count; $i++) {
-		if(isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
+	for ($i = 0; $i < $count; $i++) {
+		if (isset($_REQUEST['documentId'.$i]) && !empty($_REQUEST['documentId'.$i])) {
 			$doc = new Document();
 			$docRev = new DocumentRevision();
 			$docNote = new Note();
@@ -390,8 +390,8 @@ 
 		///////////////////////////////////////////////////////////////////////////
 		////	REMOVE ATTACHMENTS
 
-		if(isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
-			foreach($_REQUEST['remove_attachment'] as $noteId) {
+		if (isset($_REQUEST['remove_attachment']) && !empty($_REQUEST['remove_attachment'])) {
+			foreach ($_REQUEST['remove_attachment'] as $noteId) {
 				$q = 'UPDATE notes SET deleted = 1 WHERE id = \''.$noteId.'\'';
 				$focus->db->query($q);
 			}
@@ -405,10 +405,10 @@ 
 
         clear_register_value('select_array', $focus->object_name);
 
-		if($redirect) {
+		if ($redirect) {
 		$GLOBALS['log']->debug("Saved record with id of ".$return_id);
 			handleRedirect($return_id, "EmailTemplates");
-		}else{
+		} else {
 			return $focus;
 		}
 	}

modules/Contacts/metadata/SearchFields.php

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