adamjakab / SuiteCRM

modules/AOR_Conditions/AOR_Condition.php

Spacing +15 added lines, -15 removed lines

@@ -77,9 +77,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_Condition(){
+    function AOR_Condition() {
         $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 {
@@ -95,38 +95,38 @@ 
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 
         $j = 0;
-        foreach ($post_data[$key . 'field'] as $i => $field) {
+        foreach ($post_data[$key.'field'] as $i => $field) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $condition = new AOR_Condition();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        if (is_array($post_data[$key . $field_name][$i])) {
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        if (is_array($post_data[$key.$field_name][$i])) {
 
                             switch ($condition->value_type) {
                                 case 'Date':
-                                    $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
+                                    $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
                                     break;
                                 default:
-                                    $post_data[$key . $field_name][$i] = encodeMultienumValue($post_data[$key . $field_name][$i]);
+                                    $post_data[$key.$field_name][$i] = encodeMultienumValue($post_data[$key.$field_name][$i]);
                             }
-                        } else if ($field_name == 'value' && $post_data[$key . 'value_type'][$i] === 'Value') {
-                            $post_data[$key . $field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key . $field_name][$i]);
+                        } else if ($field_name == 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
+                            $post_data[$key.$field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key.$field_name][$i]);
                         } else if ($field_name == 'parameter') {
-                            $post_data[$key . $field_name][$i] = isset($post_data[$key . $field_name][$i]);
+                            $post_data[$key.$field_name][$i] = isset($post_data[$key.$field_name][$i]);
                         } else if ($field_name == 'module_path') {
-                            $post_data[$key . $field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key . $field_name][$i])));
+                            $post_data[$key.$field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key.$field_name][$i])));
                         }
-                        if ($field_name == 'parenthesis' && $post_data[$key . $field_name][$i] == 'END') {
+                        if ($field_name == 'parenthesis' && $post_data[$key.$field_name][$i] == 'END') {
                             if (!isset($lastParenthesisStartConditionId)) {
                                 throw new Exception('a closure parenthesis has no starter pair');
                             }
                             $condition->parenthesis = $lastParenthesisStartConditionId;
                         } else {
-                            $condition->$field_name = $post_data[$key . $field_name][$i];
+                            $condition->$field_name = $post_data[$key.$field_name][$i];
                         }
                     } else if ($field_name == 'parameter') {
                         $condition->$field_name = 0;

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